From ff3fcdcacd94664c4355ecb8bffd3d763c9ab9ca Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Tue, 9 Jun 2020 14:40:13 +0200 Subject: [PATCH] Removed debug output --- demo/MainWindow.cpp | 1 - src/DockContainerWidget.cpp | 2 -- src/DockFocusController.cpp | 24 +++--------------------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index 115277b..c9016a4 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -576,7 +576,6 @@ CMainWindow::CMainWindow(QWidget *parent) : //CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true); CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true); - CDockManager::setConfigFlag(CDockManager::AllTabsHaveCloseButton, true); // Now create the dock manager and its content d->DockManager = new CDockManager(this); diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp index e249906..b91ab53 100644 --- a/src/DockContainerWidget.cpp +++ b/src/DockContainerWidget.cpp @@ -1463,7 +1463,6 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi window()->activateWindow(); if (SingleDroppedDockWidget) { - std::cout << "SingleDockWidget dropped" << std::endl; d->DockManager->notifyWidgetOrAreaRelocation(SingleDroppedDockWidget); } d->DockManager->notifyFloatingWidgetDrop(FloatingWidget); @@ -1473,7 +1472,6 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi //============================================================================ void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea, CDockAreaWidget* TargetAreaWidget) { - std::cout << "dropWidget" << std::endl; CDockWidget* SingleDockWidget = topLevelDockWidget(); if (TargetAreaWidget) { diff --git a/src/DockFocusController.cpp b/src/DockFocusController.cpp index 82fdb95..43acc96 100644 --- a/src/DockFocusController.cpp +++ b/src/DockFocusController.cpp @@ -110,11 +110,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget) } CDockWidget* old = FocusedDockWidget; - if (DockWidget != FocusedDockWidget) - { - std::cout << "!!!!!!!!!!!! focusedDockWidgetChanged " << (FocusedDockWidget ? FocusedDockWidget->objectName().toStdString() : "-") - << " -> " << (DockWidget ? DockWidget->objectName().toStdString() : "-") << std::endl; - } FocusedDockWidget = DockWidget; updateDockWidgetFocusStyle(FocusedDockWidget, true); NewFocusedDockArea = FocusedDockWidget->dockAreaWidget(); @@ -122,7 +117,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget) { if (FocusedArea) { - std::cout << "FocusedArea" << std::endl; QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool))); updateDockAreaFocusStyle(FocusedArea, false); } @@ -136,7 +130,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget) auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget(); if (NewFloatingWidget) { - std::cout << "NewFloatingWidget->setProperty(FocusedDockWidget)" << std::endl; NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget)); } @@ -194,8 +187,7 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge { return; } - std::cout << "CDockManager::onFocusChanged" << std::endl; - std::cout << "focusedNow " << focusedNow << std::endl; + Q_UNUSED(focusedOld) if (!focusedNow) { @@ -204,7 +196,6 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge CDockWidget* DockWidget = nullptr; auto DockWidgetTab = qobject_cast(focusedNow); - std::cout << "FocuseNow " << focusedNow->metaObject()->className() << std::endl; if (DockWidgetTab) { DockWidget = DockWidgetTab->dockWidget(); @@ -228,13 +219,10 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge #else if (!DockWidget || DockWidget->tabWidget()->isHidden()) { - std::cout << "!DockWidget || !DockWidget->tabWidget()->isVisible() " << (DockWidget ? DockWidget->objectName().toStdString() : "0") << std::endl; - std::cout << "DockWidget->tabWidget()->isHidden() " << (DockWidget ? DockWidget->tabWidget()->isHidden() : false) << std::endl; return; } #endif - std::cout << "CDockManager::onFocusChanged " << DockWidget->tabWidget()->text().toStdString() << std::endl; d->updateDockWidgetFocus(DockWidget); } @@ -277,11 +265,10 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget) { return; } - std::cout << "\n\nCDockManager::notifyWidgetDrop" << std::endl; + CDockWidget* DockWidget = qobject_cast(DroppedWidget); if (DockWidget) { - std::cout << "CDockManager::setWidgetFocus " << DockWidget->objectName().toStdString() << std::endl; CDockManager::setWidgetFocus(DockWidget->tabWidget()); return; } @@ -294,14 +281,12 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget) DockWidget = DockArea->currentDockWidget(); CDockManager::setWidgetFocus(DockWidget->tabWidget()); - std::cout << "\n\n" << std::endl; } //=========================================================================== void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget) { - std::cout << "\n\nCDockManager::notifyFloatingWidgetDrop" << std::endl; if (!FloatingWidget || d->DockManager->isRestoringState()) { return; @@ -312,22 +297,19 @@ void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* Floa { return; } - std::cout << "vDockWidget.isValid()" << std::endl; + auto DockWidget = vDockWidget.value(); if (DockWidget) { - std::cout << "Dropped focus dock widget " << DockWidget->objectName().toStdString() << std::endl; DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget); CDockManager::setWidgetFocus(DockWidget->tabWidget()); } - std::cout << "\n\n" << std::endl; } //========================================================================== void CDockFocusController::onStateRestored() { - std::cout << "CDockFocusController::onStateRestored()" << std::endl; if (d->FocusedDockWidget) { updateDockWidgetFocusStyle(d->FocusedDockWidget, false);