Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into focused_dockwidget

Browse Source
This commit is contained in:
Uwe Kindler
2020-05-17 12:26:22 +02:00
parent 79cb889d83 eee9ebb41d
commit 0127fd89a3
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DockContainerWidget.cpp
View File

@@ -415,9 +415,10 @@ void DockContainerWidgetPrivate::dropIntoContainer(CFloatingDockContainer* Float
}
else if (FloatingSplitter->orientation() == InsertParam.orientation())
{
int InsertIndex = InsertParam.append() ? Splitter->count() : 0;
while (FloatingSplitter->count())
{
insertWidgetIntoSplitter(Splitter, FloatingSplitter->widget(0), InsertParam.append());
Splitter->insertWidget(InsertIndex++, FloatingSplitter->widget(0));
}
}
else
@@ -575,6 +576,11 @@ void DockContainerWidgetPrivate::moveIntoCenterOfSection(QWidget* Widget, CDockA
if (DroppedDockWidget)
{
CDockAreaWidget* OldDockArea = DroppedDockWidget->dockAreaWidget();
if (OldDockArea == TargetArea)
{
return;
}
if (OldDockArea)
{
OldDockArea->removeDockWidget(DroppedDockWidget);