Skip to content

Commit 8a82e4c

Browse files
Removed debug output and fixed painting of SideBar drag overlays
1 parent 0627b31 commit 8a82e4c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/DockOverlay.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ bool CDockOverlay::dropPreviewEnabled() const
583583
void CDockOverlay::paintEvent(QPaintEvent* event)
584584
{
585585
Q_UNUSED(event);
586+
586587
// Draw rect based on location
587588
if (!d->DropPreviewEnabled)
588589
{
@@ -608,6 +609,7 @@ void CDockOverlay::paintEvent(QPaintEvent* event)
608609
case BottomAutoHideArea: r.setY(r.height() - d->sideBarOverlaySize(SideBarBottom)); break;
609610
default: return;
610611
}
612+
611613
QPainter painter(this);
612614
QColor Color = palette().color(QPalette::Active, QPalette::Highlight);
613615
QPen Pen = painter.pen();

src/FloatingDragPreview.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
103103
{
104104
if (!_this->isVisible() || !DockManager)
105105
{
106-
std::cout << "return 1" << std::endl;
107106
return;
108107
}
109108

@@ -132,13 +131,10 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
132131

133132
if (!TopContainer)
134133
{
135-
std::cout << "ContainerOverlay->hideOverlay() 1" << std::endl;
136134
ContainerOverlay->hideOverlay();
137-
std::cout << "DockAreaOverlay->hideOverlay() 1" << std::endl;
138135
DockAreaOverlay->hideOverlay();
139136
if (CDockManager::testConfigFlag(CDockManager::DragPreviewIsDynamic))
140137
{
141-
std::cout << "return 2" << std::endl;
142138
setHidden(false);
143139
}
144140
return;
@@ -155,7 +151,6 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
155151
{
156152
VisibleDockAreas++;
157153
}
158-
std::cout << "VisibleDockAreas " << VisibleDockAreas << std::endl;
159154

160155
DockWidgetAreas AllowedAreas = (VisibleDockAreas > 1) ? OuterDockAreas : AllDockAreas;
161156
//ContainerOverlay->enableDropPreview(ContainerDropArea != InvalidDockWidgetArea);
@@ -168,12 +163,12 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
168163
AllowedAreas.setFlag(CenterDockWidgetArea, DockArea->allowedAreas().testFlag(CenterDockWidgetArea));
169164
}
170165
ContainerOverlay->setAllowedAreas(AllowedAreas);
166+
ContainerOverlay->enableDropPreview(ContainerDropArea != InvalidDockWidgetArea);
171167
if (DockArea && DockArea->isVisible() && VisibleDockAreas >= 0 && DockArea != ContentSourceArea)
172168
{
173169
DockAreaOverlay->enableDropPreview(true);
174170
DockAreaOverlay->setAllowedAreas( (VisibleDockAreas == 1) ? NoDockWidgetArea : DockArea->allowedAreas());
175171
DockWidgetArea Area = DockAreaOverlay->showOverlay(DockArea);
176-
std::cout << "DockWidgetArea " << Area << std::endl;
177172

178173
// A CenterDockWidgetArea for the dockAreaOverlay() indicates that
179174
// the mouse is in the title bar. If the ContainerArea is valid
@@ -182,20 +177,16 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
182177
if ((Area == CenterDockWidgetArea) && (ContainerDropArea != InvalidDockWidgetArea))
183178
{
184179
DockAreaOverlay->enableDropPreview(false);
185-
186-
std::cout << "ContainerOverlay->enableDropPreview(true) 1" << std::endl;
187180
ContainerOverlay->enableDropPreview(true);
188181
}
189182
else
190183
{
191-
std::cout << "ContainerOverlay->enableDropPreview 2" << std::endl;
192184
ContainerOverlay->enableDropPreview(InvalidDockWidgetArea == Area);
193185
}
194186
ContainerOverlay->showOverlay(TopContainer);
195187
}
196188
else
197189
{
198-
std::cout << "DockAreaOverlay->hideOverlay() 2" << std::endl;
199190
DockAreaOverlay->hideOverlay();
200191
// If there is only one single visible dock area in a container, then
201192
// it does not make sense to show a dock overlay because the dock area

0 commit comments

Comments
 (0)