Skip to content

Commit 051c379

Browse files
author
Uwe Kindler
committed
Fixed startFloating() for FloatingDockContainer if only one DockArea is visble
1 parent 844c853 commit 051c379

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/DockAreaWidget.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ class CTabsScrollArea : public QScrollArea
145145
// If this is the last dock area in a dock container it does not make
146146
// sense to move it to a new floating widget and leave this one
147147
// empty
148-
if (m_DockArea->dockContainer()->isFloating() && m_DockArea->dockContainer()->dockAreaCount() == 1)
148+
if (m_DockArea->dockContainer()->isFloating()
149+
&& m_DockArea->dockContainer()->visibleDockAreaCount() == 1)
149150
{
150151
return;
151152
}

src/DockOverlay.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ static QPixmap createDropIndicatorPixmap(const QPalette& pal, const QSizeF& size
9393
if (CDockOverlay::ModeContainerOverlay == Mode && DockWidgetArea != CenterDockWidgetArea)
9494
{
9595
baseRect = areaRect;
96-
areaRect = QRectF();
9796
}
9897

9998
p.fillRect(baseRect, backgroundColor);

src/DockWidgetTitleBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ bool DockWidgetTitleBarPrivate::startFloating()
167167
// then it does not make any sense, to make if floating because
168168
// it is already floating
169169
if (DockWidget->dockContainer()->isFloating()
170-
&& (DockWidget->dockContainer()->dockAreaCount() == 1)
170+
&& (DockWidget->dockContainer()->visibleDockAreaCount() == 1)
171171
&& (DockWidget->dockAreaWidget()->count() == 1))
172172
{
173173
return false;

0 commit comments

Comments
 (0)