mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-03-16 02:59:51 +08:00
Code

Removed debug output

Browse Source
This commit is contained in:
Uwe Kindler 2020-06-09 14:40:13 +02:00
parent a9268e6bf7
commit ff3fcdcacd
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo/MainWindow.cpp
View File

@ -576,7 +576,6 @@ CMainWindow::CMainWindow(QWidget *parent) :
//CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true); //CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true); CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
CDockManager::setConfigFlag(CDockManager::AllTabsHaveCloseButton, true);
// Now create the dock manager and its content // Now create the dock manager and its content
d->DockManager = new CDockManager(this); d->DockManager = new CDockManager(this);

2
src/DockContainerWidget.cpp
View File

@ -1463,7 +1463,6 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
window()->activateWindow(); window()->activateWindow();
if (SingleDroppedDockWidget) if (SingleDroppedDockWidget)
{ {
std::cout << "SingleDockWidget dropped" << std::endl;
d->DockManager->notifyWidgetOrAreaRelocation(SingleDroppedDockWidget); d->DockManager->notifyWidgetOrAreaRelocation(SingleDroppedDockWidget);
} }
d->DockManager->notifyFloatingWidgetDrop(FloatingWidget); d->DockManager->notifyFloatingWidgetDrop(FloatingWidget);
@ -1473,7 +1472,6 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
//============================================================================ //============================================================================
void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea, CDockAreaWidget* TargetAreaWidget) void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea, CDockAreaWidget* TargetAreaWidget)
{ {
std::cout << "dropWidget" << std::endl;
CDockWidget* SingleDockWidget = topLevelDockWidget(); CDockWidget* SingleDockWidget = topLevelDockWidget();
if (TargetAreaWidget) if (TargetAreaWidget)
{ {

24
src/DockFocusController.cpp
View File

@ -110,11 +110,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
} }
CDockWidget* old = FocusedDockWidget; CDockWidget* old = FocusedDockWidget;
if (DockWidget != FocusedDockWidget)
{
std::cout << "!!!!!!!!!!!! focusedDockWidgetChanged " << (FocusedDockWidget ? FocusedDockWidget->objectName().toStdString() : "-")
<< " -> " << (DockWidget ? DockWidget->objectName().toStdString() : "-") << std::endl;
}
FocusedDockWidget = DockWidget; FocusedDockWidget = DockWidget;
updateDockWidgetFocusStyle(FocusedDockWidget, true); updateDockWidgetFocusStyle(FocusedDockWidget, true);
NewFocusedDockArea = FocusedDockWidget->dockAreaWidget(); NewFocusedDockArea = FocusedDockWidget->dockAreaWidget();
@ -122,7 +117,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
{ {
if (FocusedArea) if (FocusedArea)
{ {
std::cout << "FocusedArea" << std::endl;
QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool))); QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
updateDockAreaFocusStyle(FocusedArea, false); updateDockAreaFocusStyle(FocusedArea, false);
} }
@ -136,7 +130,6 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget(); auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget();
if (NewFloatingWidget) if (NewFloatingWidget)
{ {
std::cout << "NewFloatingWidget->setProperty(FocusedDockWidget)" << std::endl;
NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget)); NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget));
} }
@ -194,8 +187,7 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
{ {
return; return;
} }
std::cout << "CDockManager::onFocusChanged" << std::endl;
std::cout << "focusedNow " << focusedNow << std::endl;
Q_UNUSED(focusedOld) Q_UNUSED(focusedOld)
if (!focusedNow) if (!focusedNow)
{ {
@ -204,7 +196,6 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
CDockWidget* DockWidget = nullptr; CDockWidget* DockWidget = nullptr;
auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow); auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow);
std::cout << "FocuseNow " << focusedNow->metaObject()->className() << std::endl;
if (DockWidgetTab) if (DockWidgetTab)
{ {
DockWidget = DockWidgetTab->dockWidget(); DockWidget = DockWidgetTab->dockWidget();
@ -228,13 +219,10 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
#else #else
if (!DockWidget || DockWidget->tabWidget()->isHidden()) 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; return;
} }
#endif #endif
std::cout << "CDockManager::onFocusChanged " << DockWidget->tabWidget()->text().toStdString() << std::endl;
d->updateDockWidgetFocus(DockWidget); d->updateDockWidgetFocus(DockWidget);
} }
@ -277,11 +265,10 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
{ {
return; return;
} }
std::cout << "\n\nCDockManager::notifyWidgetDrop" << std::endl;
CDockWidget* DockWidget = qobject_cast<CDockWidget*>(DroppedWidget); CDockWidget* DockWidget = qobject_cast<CDockWidget*>(DroppedWidget);
if (DockWidget) if (DockWidget)
{ {
std::cout << "CDockManager::setWidgetFocus " << DockWidget->objectName().toStdString() << std::endl;
CDockManager::setWidgetFocus(DockWidget->tabWidget()); CDockManager::setWidgetFocus(DockWidget->tabWidget());
return; return;
} }
@ -294,14 +281,12 @@ void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
DockWidget = DockArea->currentDockWidget(); DockWidget = DockArea->currentDockWidget();
CDockManager::setWidgetFocus(DockWidget->tabWidget()); CDockManager::setWidgetFocus(DockWidget->tabWidget());
std::cout << "\n\n" << std::endl;
} }
//=========================================================================== //===========================================================================
void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget) void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget)
{ {
std::cout << "\n\nCDockManager::notifyFloatingWidgetDrop" << std::endl;
if (!FloatingWidget || d->DockManager->isRestoringState()) if (!FloatingWidget || d->DockManager->isRestoringState())
{ {
return; return;
@ -312,22 +297,19 @@ void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* Floa
{ {
return; return;
} }
std::cout << "vDockWidget.isValid()" << std::endl;
auto DockWidget = vDockWidget.value<CDockWidget*>(); auto DockWidget = vDockWidget.value<CDockWidget*>();
if (DockWidget) if (DockWidget)
{ {
std::cout << "Dropped focus dock widget " << DockWidget->objectName().toStdString() << std::endl;
DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget); DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget);
CDockManager::setWidgetFocus(DockWidget->tabWidget()); CDockManager::setWidgetFocus(DockWidget->tabWidget());
} }
std::cout << "\n\n" << std::endl;
} }
//========================================================================== //==========================================================================
void CDockFocusController::onStateRestored() void CDockFocusController::onStateRestored()
{ {
std::cout << "CDockFocusController::onStateRestored()" << std::endl;
if (d->FocusedDockWidget) if (d->FocusedDockWidget)
{ {
updateDockWidgetFocusStyle(d->FocusedDockWidget, false); updateDockWidgetFocusStyle(d->FocusedDockWidget, false);