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

DockWidget::setFloating(true): restore to previous floating position

Browse Source 
When floating a dock widget we restore it to the last known floating
position now
This commit is contained in:
Sergio Martins
2020-05-22 11:12:12 +01:00
parent b3b25ba047
commit 6d44362991
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/DockWidgetBase.cpp
View File

@@ -264,6 +264,11 @@ void DockWidgetBase::setFloating(bool floats)
} else {
frame()->titleBar()->makeWindow();
}
auto lastGeo = lastPositions().lastFloatingGeometry();
if (lastGeo.isValid())
window()->setGeometry(lastGeo);
} else {
d->restoreToPreviousPosition();
}

22
tests/tst_docks.cpp
View File

@@ -5168,20 +5168,36 @@ void TestDocks::tst_lastFloatingPositionIsRestored()
auto oldFw = dock1->window();
LayoutSaver saver;
const QByteArray saved = saver.serializeLayout();
QByteArray saved = saver.serializeLayout();
dock1->window()->move(0, 0);
dock1->close();
qDebug() << "FOO " << dock1->lastPositions();
delete oldFw;
saver.restoreLayout(saved);
QCOMPARE(dock1->window()->pos(), targetPos);
// No dock it:
// Now dock it:
m1->addDockWidget(dock1, Location_OnTop);
saver.restoreLayout(saved);
QCOMPARE(dock1->lastPositions().lastFloatingGeometry().topLeft(), targetPos);
dock1->setFloating(true);
QCOMPARE(dock1->window()->pos(), targetPos);
saver.restoreLayout(saved);
QCOMPARE(dock1->window()->pos(), targetPos);
// Dock again and save:
m1->addDockWidget(dock1, Location_OnTop);
saved = saver.serializeLayout();
dock1->setFloating(true);
qDebug() << dock1->window()->geometry() << "bar";
dock1->window()->move(0, 0);
saver.restoreLayout(saved);
QVERIFY(!dock1->isFloating());
dock1->setFloating(true);
QCOMPARE(dock1->window()->pos(), targetPos);
delete dock1->window();
}