From 8a82e4cf577501622c24d1bdcc1b08f9728b4de0 Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Mon, 10 Jul 2023 12:07:44 +0200 Subject: [PATCH] Removed debug output and fixed painting of SideBar drag overlays --- src/DockOverlay.cpp | 2 ++ src/FloatingDragPreview.cpp | 11 +---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/DockOverlay.cpp b/src/DockOverlay.cpp index acf0690..800756b 100644 --- a/src/DockOverlay.cpp +++ b/src/DockOverlay.cpp @@ -583,6 +583,7 @@ bool CDockOverlay::dropPreviewEnabled() const void CDockOverlay::paintEvent(QPaintEvent* event) { Q_UNUSED(event); + // Draw rect based on location if (!d->DropPreviewEnabled) { @@ -608,6 +609,7 @@ void CDockOverlay::paintEvent(QPaintEvent* event) case BottomAutoHideArea: r.setY(r.height() - d->sideBarOverlaySize(SideBarBottom)); break; default: return; } + QPainter painter(this); QColor Color = palette().color(QPalette::Active, QPalette::Highlight); QPen Pen = painter.pen(); diff --git a/src/FloatingDragPreview.cpp b/src/FloatingDragPreview.cpp index 5e52a09..ff69e6f 100644 --- a/src/FloatingDragPreview.cpp +++ b/src/FloatingDragPreview.cpp @@ -103,7 +103,6 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos) { if (!_this->isVisible() || !DockManager) { - std::cout << "return 1" << std::endl; return; } @@ -132,13 +131,10 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos) if (!TopContainer) { - std::cout << "ContainerOverlay->hideOverlay() 1" << std::endl; ContainerOverlay->hideOverlay(); - std::cout << "DockAreaOverlay->hideOverlay() 1" << std::endl; DockAreaOverlay->hideOverlay(); if (CDockManager::testConfigFlag(CDockManager::DragPreviewIsDynamic)) { - std::cout << "return 2" << std::endl; setHidden(false); } return; @@ -155,7 +151,6 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos) { VisibleDockAreas++; } - std::cout << "VisibleDockAreas " << VisibleDockAreas << std::endl; DockWidgetAreas AllowedAreas = (VisibleDockAreas > 1) ? OuterDockAreas : AllDockAreas; //ContainerOverlay->enableDropPreview(ContainerDropArea != InvalidDockWidgetArea); @@ -168,12 +163,12 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos) AllowedAreas.setFlag(CenterDockWidgetArea, DockArea->allowedAreas().testFlag(CenterDockWidgetArea)); } ContainerOverlay->setAllowedAreas(AllowedAreas); + ContainerOverlay->enableDropPreview(ContainerDropArea != InvalidDockWidgetArea); if (DockArea && DockArea->isVisible() && VisibleDockAreas >= 0 && DockArea != ContentSourceArea) { DockAreaOverlay->enableDropPreview(true); DockAreaOverlay->setAllowedAreas( (VisibleDockAreas == 1) ? NoDockWidgetArea : DockArea->allowedAreas()); DockWidgetArea Area = DockAreaOverlay->showOverlay(DockArea); - std::cout << "DockWidgetArea " << Area << std::endl; // A CenterDockWidgetArea for the dockAreaOverlay() indicates that // the mouse is in the title bar. If the ContainerArea is valid @@ -182,20 +177,16 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos) if ((Area == CenterDockWidgetArea) && (ContainerDropArea != InvalidDockWidgetArea)) { DockAreaOverlay->enableDropPreview(false); - - std::cout << "ContainerOverlay->enableDropPreview(true) 1" << std::endl; ContainerOverlay->enableDropPreview(true); } else { - std::cout << "ContainerOverlay->enableDropPreview 2" << std::endl; ContainerOverlay->enableDropPreview(InvalidDockWidgetArea == Area); } ContainerOverlay->showOverlay(TopContainer); } else { - std::cout << "DockAreaOverlay->hideOverlay() 2" << std::endl; DockAreaOverlay->hideOverlay(); // If there is only one single visible dock area in a container, then // it does not make sense to show a dock overlay because the dock area