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

tests: Enable tst_sizeAfterRedock for QtQuick too

Browse Source
This commit is contained in:
Sergio Martins
2020-10-10 11:18:27 +01:00
parent b0ad939db8
commit 2a2fb0a4f2
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/tst_common.cpp
View File

@@ -73,6 +73,7 @@ private Q_SLOTS:
void tst_detachFromMainWindow();
void tst_detachPos();
void tst_floatingWindowSize();
void tst_sizeAfterRedock();
void tst_tabbingWithAffinities();
};
@@ -295,6 +296,36 @@ void TestCommon::tst_tabbingWithAffinities()
delete fw2;
}
void TestCommon::tst_sizeAfterRedock()
{
EnsureTopLevelsDeleted e;
auto dw1 = new DockWidgetType(QStringLiteral("1"));
auto dw2 = new DockWidgetType(QStringLiteral("2"));
dw2->setWidget(new MyWidget("2", Qt::red));
dw1->addDockWidgetToContainingWindow(dw2, Location_OnBottom);
const int height2 = dw2->frame()->height();
dw2->setFloating(true);
QCOMPARE(height2, dw2->window()->height());
auto oldFw2 = dw2->floatingWindow();
// Redock
FloatingWindow *fw1 = dw1->floatingWindow();
DropArea *dropArea = fw1->dropArea();
MultiSplitter *ms1 = fw1->multiSplitter();
const QRect suggestedDropRect = ms1->rectForDrop(oldFw2, Location_OnBottom, nullptr);
QCOMPARE(suggestedDropRect.height(), height2);
dropArea->drop(dw2->floatingWindow(), Location_OnBottom, nullptr);
QCOMPARE(dw2->frame()->height(), height2);
delete dw1->window();
delete oldFw2;
}
int main(int argc, char *argv[])
{
if (!qpaPassedAsArgument(argc, argv)) {

31
tests/tst_docks.cpp
View File

@@ -422,7 +422,6 @@ private Q_SLOTS:
void tst_closeRemovesFromSideBar();
void tst_tabTitleChanges();
void tst_dockWidgetGetsFocusWhenDocked();
void tst_sizeAfterRedock();
private:
std::unique_ptr<MultiSplitter> createMultiSplitterFromSetup(MultiSplitterSetup setup, QHash<QWidget *, Frame *> &frameMap) const;
};
@@ -6130,36 +6129,6 @@ void TestDocks::tst_dockWidgetGetsFocusWhenDocked()
delete fw2;
}
void TestDocks::tst_sizeAfterRedock()
{
EnsureTopLevelsDeleted e;
auto dw1 = new DockWidget(QStringLiteral("1"));
auto dw2 = new DockWidget(QStringLiteral("2"));
dw2->setWidget(new QWidget());
dw1->addDockWidgetToContainingWindow(dw2, Location_OnBottom);
const int height2 = dw2->frame()->height();
dw2->setFloating(true);
QCOMPARE(height2, dw2->window()->height());
auto oldFw2 = dw2->floatingWindow();
// Redock
FloatingWindow *fw1 = dw1->floatingWindow();
DropArea *dropArea = fw1->dropArea();
MultiSplitter *ms1 = fw1->multiSplitter();
const QRect suggestedDropRect = ms1->rectForDrop(oldFw2, Location_OnBottom, nullptr);
QCOMPARE(suggestedDropRect.height(), height2);
dropArea->drop(dw2->floatingWindow(), Location_OnBottom, nullptr);
QCOMPARE(dw2->frame()->height(), height2);
delete dw1->window();
delete oldFw2;
}
int main(int argc, char *argv[])
{
if (!qpaPassedAsArgument(argc, argv)) {