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

When floating via titlebar, restore to correct floating position

Browse Source 
If the title bar has a single dock widget and you press the float
button, then use the DockWidget's "last floating position" to
position the new floating window
This commit is contained in:
Sergio Martins
2020-05-22 11:37:52 +01:00
parent 4917da9e7c
commit 8e39ce2dea
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/private/TitleBar.cpp
View File

@@ -231,8 +231,10 @@ DockWidgetBase::List TitleBar::dockWidgets() const
void TitleBar::onFloatClicked()
{
const DockWidgetBase::List dockWidgets = this->dockWidgets();
if (isFloating()) {
DockWidgetBase::List dockWidgets = this->dockWidgets();
// Let's dock it
if (dockWidgets.isEmpty()) {
qWarning() << "TitleBar::onFloatClicked: empty list. Shouldn't happen";
return;
@@ -242,7 +244,7 @@ void TitleBar::onFloatClicked()
// Case 1: Single dockwidget floating
dockWidgets[0]->setFloating(false);
} else {
// Case 2: Multiple dockwidgets are tabbed toghether and floating
// Case 2: Multiple dockwidgets are tabbed together and floating
// TODO: Just reuse the whole frame and put it back. The frame currently doesn't remember the position in the main window
// so use an hack for now
for (auto dock : qAsConst(dockWidgets)) {
@@ -251,7 +253,14 @@ void TitleBar::onFloatClicked()
}
}
} else {
makeWindow();
// Let's float it
if (dockWidgets.size() == 1) {
// If there's a single dock widget, just call DockWidget::setFloating(true). The only difference
// is that it has logic for using the last used geometry for the floating window
dockWidgets[0]->setFloating(true);
} else {
makeWindow();
}
}
}