philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Port more tests

Browse Source
This commit is contained in:
Sergio Martins
2020-10-19 20:47:09 +01:00
parent b9eb9f10d4
commit f70722934c
5 changed files with 190 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/private/quick/QWidgetAdapter_quick.cpp
View File

@@ -210,6 +210,11 @@ void QWidgetAdapter::resize(QSize sz)
setHeight(sz.height());
}
void QWidgetAdapter::resize(int w, int h)
{
resize({w, h});
}
bool QWidgetAdapter::isMaximized() const
{
if (QWindow *w = windowHandle())

1
src/private/quick/QWidgetAdapter_quick_p.h
View File

@@ -111,6 +111,7 @@ public:
void setMinimumSize(QSize);
void updateGeometry();
void resize(QSize);
void resize(int w, int h);
bool isWindow() const { return parentItem() == nullptr; }
bool isMaximized() const;
bool isActiveWindow() const;

120
tests/tst_common.cpp
View File

@@ -28,11 +28,14 @@
#ifdef KDDOCKWIDGETS_QTQUICK
# include "quick/DockWidgetQuick.h"
# include "quick/MainWindowQuick_p.h"
# include <QQmlEngine>
# include <QQuickStyle>
# else
# include "DockWidget.h"
# include "MainWindow.h"
# include <QPushButton>
#endif
@@ -93,10 +96,13 @@ private Q_SLOTS:
void tst_propagateResize2();
void tst_28NestedWidgets();
void tst_28NestedWidgets_data();
void tst_negativeAnchorPosition();
void tst_negativeAnchorPosition2();
void tst_negativeAnchorPosition3();
void tst_negativeAnchorPosition4();
void tst_negativeAnchorPosition5();
void tst_negativeAnchorPosition6();
void tst_negativeAnchorPosition7();
void tst_startHidden();
void tst_startHidden2();
void tst_startClosed();
@@ -1018,6 +1024,52 @@ void TestCommon::tst_startHidden2()
}
}
void TestCommon::tst_negativeAnchorPosition()
{
// Tests that we don't hit:
// void KDDockWidgets::Anchor::setPosition(int, KDDockWidgets::Anchor::SetPositionOptions) Negative position
EnsureTopLevelsDeleted e;
auto m = createMainWindow(QSize(1002, 806));
auto w1 = new MyWidget2(QSize(104, 104));
w1->resize(994, 718);
auto w2 = new MyWidget2(QSize(133, 343));
w2->resize(392, 362);
auto w3 = new MyWidget2(QSize(133, 343));
w3->resize(392, 362);
MultiSplitter *layout = m->multiSplitter();
auto d1 = createDockWidget("1", w1);
auto d2 = createDockWidget("2", w2);
auto d3 = createDockWidget("3", w3);
m->addDockWidgetAsTab(d1);
m->addDockWidget(d2, Location_OnTop);
m->addDockWidget(d3, Location_OnTop);
d2->close();
Testing::waitForResize(d3);
d2->show(); // Should not result in negative anchor positions (Test will fail due to a qWarning)
Testing::waitForResize(d3);
layout->checkSanity();
d2->close();
Testing::waitForResize(d3);
layout->checkSanity();
// Now resize the Window, after removing middle one
const int availableToShrink = layout->size().height() - layout->minimumSize().height();
layout->setLayoutSize({layout->width(), layout->width() - availableToShrink});
d2->deleteLater();
Testing::waitForDeleted(d2);
layout->checkSanity();
}
void TestCommon::tst_negativeAnchorPosition2()
{
// Tests that the "Out of bounds position" warning doesn't appear. Test will abort if yes.
@@ -1128,6 +1180,74 @@ void TestCommon::tst_negativeAnchorPosition5()
QVERIFY(Testing::waitForDeleted(dock0));
}
void TestCommon::tst_negativeAnchorPosition6()
{
// Tests a case when we add a widget to left/right but the layout doesn't have enough height (or vice-versa)
EnsureTopLevelsDeleted e;
auto m = new MainWindowType("m1", MainWindowOption_None);
m->resize(QSize(100, 100));
m->show();
auto layout = m->multiSplitter();
auto w1 = new MyWidget2(QSize(400,100));
auto w2 = new MyWidget2(QSize(400,100));
auto w3 = new MyWidget2(QSize(400,100));
auto w4 = new MyWidget2(QSize(400,900));
auto d1 = createDockWidget("1", w1);
auto d2 = createDockWidget("2", w2);
auto d3 = createDockWidget("3", w3);
auto d4 = createDockWidget("4", w4);
m->addDockWidget(d1, Location_OnBottom);
m->addDockWidget(d2, Location_OnBottom);
m->addDockWidget(d3, Location_OnBottom);
QCOMPARE(layout->count(), 3);
QCOMPARE(layout->placeholderCount(), 0);
m->addDockWidget(d4, Location_OnRight, d3);
layout->checkSanity();
Item *centralItem = m->dropArea()->centralFrame();
layout->rectForDrop(nullptr, Location_OnTop, centralItem);
layout->checkSanity();
delete m->window();
}
void TestCommon::tst_negativeAnchorPosition7()
{
EnsureTopLevelsDeleted e;
auto m = new MainWindowType("m1", MainWindowOption_None);
m->show();
auto w1 = new MyWidget2(QSize(400,400));
auto w2 = new MyWidget2(QSize(400,400));
auto d1 = new DockWidgetType("1");
d1->setWidget(w1);
auto d2 = new DockWidgetType("2");
d2->setWidget(w2);
auto w3 = new MyWidget2(QSize(100,100));
auto d3 = new DockWidgetType("3");
d3->setWidget(w3);
// Stack 1, 2
m->addDockWidget(d2, Location_OnTop);
m->addDockWidget(d1, Location_OnTop);
// add a small one to the middle
// Stack: 1, 3, 2
m->addDockWidget(d3, Location_OnTop, d2);
m->multiSplitter()->checkSanity();
delete m;
}
void TestCommon::tst_invalidAnchorGroup()
{
// Tests a bug I got. Should not warn.

156
tests/tst_docks.cpp
View File

@@ -318,9 +318,6 @@ private Q_SLOTS:
void tst_invalidPlaceholderPosition_data();
void tst_invalidPlaceholderPosition();
void tst_resizeViaAnchorsAfterPlaceholderCreation();
void tst_negativeAnchorPosition();
void tst_negativeAnchorPosition6();
void tst_negativeAnchorPosition7();
void tst_negativeAnchorPositionWhenEmbedded_data();
void tst_negativeAnchorPositionWhenEmbedded();
void tst_availableSizeWithPlaceholders();
@@ -412,45 +409,6 @@ static EmbeddedWindow *createEmbeddedMainWindow(QSize sz)
return window;
}
namespace {
class MyWidget2 : public QWidget
{
public:
explicit MyWidget2(QSize minSz = QSize(1,1))
: m_minSz(minSz)
, m_sizeHint(minSz)
{
}
QSize sizeHint() const override
{
return m_sizeHint;
}
QSize minimumSizeHint() const override
{
return m_minSz;
}
void setMinSize(QSize s)
{
m_minSz = s;
updateGeometry();
}
void setSizeHint(QSize s)
{
m_sizeHint = s;
}
QSize m_minSz;
QSize m_sizeHint;
};
}
Frame* createFrameWithWidget(const QString &name, MultiSplitter *parent, int minLength = -1)
{
QWidget *w = createWidget(minLength, name);
@@ -2519,120 +2477,6 @@ void TestDocks::tst_resizeViaAnchorsAfterPlaceholderCreation()
}
}
void TestDocks::tst_negativeAnchorPosition()
{
// Tests that we don't hit:
// void KDDockWidgets::Anchor::setPosition(int, KDDockWidgets::Anchor::SetPositionOptions) Negative position
EnsureTopLevelsDeleted e;
auto m = createMainWindow(QSize(1002, 806));
auto w1 = new MyWidget2(QSize(104, 104));
w1->resize(994, 718);
auto w2 = new MyWidget2(QSize(133, 343));
w2->resize(392, 362);
auto w3 = new MyWidget2(QSize(133, 343));
w3->resize(392, 362);
MultiSplitter *layout = m->multiSplitter();
auto d1 = createDockWidget("1", w1);
auto d2 = createDockWidget("2", w2);
auto d3 = createDockWidget("3", w3);
m->addDockWidgetAsTab(d1);
m->addDockWidget(d2, Location_OnTop);
m->addDockWidget(d3, Location_OnTop);
d2->close();
Testing::waitForResize(d3);
d2->show(); // Should not result in negative anchor positions (Test will fail due to a qWarning)
Testing::waitForResize(d3);
layout->checkSanity();
d2->close();
Testing::waitForResize(d3);
layout->checkSanity();
// Now resize the Window, after removing middle one
const int availableToShrink = layout->size().height() - layout->minimumSize().height();
layout->setLayoutSize({layout->width(), layout->width() - availableToShrink});
d2->deleteLater();
Testing::waitForDeleted(d2);
layout->checkSanity();
}
void TestDocks::tst_negativeAnchorPosition6()
{
// Tests a case when we add a widget to left/right but the layout doesn't have enough height (or vice-versa)
EnsureTopLevelsDeleted e;
auto m = new MainWindow("m1", MainWindowOption_None);
m->resize(QSize(100, 100));
m->show();
auto layout = m->multiSplitter();
auto w1 = new MyWidget2(QSize(400,100));
auto w2 = new MyWidget2(QSize(400,100));
auto w3 = new MyWidget2(QSize(400,100));
auto w4 = new MyWidget2(QSize(400,900));
auto d1 = createDockWidget("1", w1);
auto d2 = createDockWidget("2", w2);
auto d3 = createDockWidget("3", w3);
auto d4 = createDockWidget("4", w4);
m->addDockWidget(d1, Location_OnBottom);
m->addDockWidget(d2, Location_OnBottom);
m->addDockWidget(d3, Location_OnBottom);
QCOMPARE(layout->count(), 3);
QCOMPARE(layout->placeholderCount(), 0);
m->addDockWidget(d4, Location_OnRight, d3);
layout->checkSanity();
Item *centralItem = m->dropArea()->centralFrame();
layout->rectForDrop(nullptr, Location_OnTop, centralItem);
layout->checkSanity();
delete m->window();
}
void TestDocks::tst_negativeAnchorPosition7()
{
EnsureTopLevelsDeleted e;
auto m = new MainWindow("m1", MainWindowOption_None);
m->show();
auto w1 = new MyWidget2(QSize(400,400));
auto w2 = new MyWidget2(QSize(400,400));
auto d1 = new DockWidgetType("1");
d1->setWidget(w1);
auto d2 = new DockWidgetType("2");
d2->setWidget(w2);
auto w3 = new MyWidget2(QSize(100,100));
auto d3 = new DockWidgetType("3");
d3->setWidget(w3);
// Stack 1, 2
m->addDockWidget(d2, Location_OnTop);
m->addDockWidget(d1, Location_OnTop);
// add a small one to the middle
// Stack: 1, 3, 2
m->addDockWidget(d3, Location_OnTop, d2);
m->multiSplitter()->checkSanity();
delete m;
}
void TestDocks::tst_negativeAnchorPositionWhenEmbedded_data()
{
QTest::addColumn<bool>("embedded");

64
tests/utils.h
View File

@@ -171,6 +171,70 @@ public:
}
};
class MyWidget2 : public QWidgetAdapter
{
public:
explicit MyWidget2(QSize minSz = QSize(1, 1))
{
setMinimumSize(minSz);
setSizeHint(minSz);
}
QSize sizeHint() const
{
return m_sizeHint;
}
void setSizeHint(QSize s)
{
m_sizeHint = s;
}
QSize m_sizeHint;
};
#else
namespace {
class MyWidget2 : public QWidget
{
public:
explicit MyWidget2(QSize minSz = QSize(1,1))
: m_minSz(minSz)
, m_sizeHint(minSz)
{
}
QSize sizeHint() const override
{
return m_sizeHint;
}
QSize minimumSizeHint() const override
{
return m_minSz;
}
void setMinSize(QSize s)
{
m_minSz = s;
updateGeometry();
}
void setSizeHint(QSize s)
{
m_sizeHint = s;
}
QSize m_minSz;
QSize m_sizeHint;
};
}
#endif
void doubleClickOn(QPoint globalPos, QWidget *receiver);