From 97cda2a2411b33a4c0f04a2498e50ad3c981b821 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 24 Apr 2026 14:19:59 +0100 Subject: [PATCH] Update from toolwindowmanager repository @ 755b795 --- qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp | 2 ++ .../3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp | 1 - .../3rdparty/toolwindowmanager/ToolWindowManagerArea.h | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp index 363770e6d..0e496b8df 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp @@ -1524,6 +1524,8 @@ void ToolWindowManager::tabCloseRequested(int index) if(!allowClose(toolWindow)) return; + tabWidget->tabClosing(index); + if(toolWindowProperties(toolWindow) & ToolWindowManager::HideOnClose) hideToolWindow(toolWindow); else diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp index 3fdaf92e9..4219ea73d 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp @@ -61,7 +61,6 @@ ToolWindowManagerArea::ToolWindowManagerArea(ToolWindowManager *manager, QWidget m_manager->m_areas << this; QObject::connect(tabBar(), &QTabBar::tabMoved, this, &ToolWindowManagerArea::tabMoved); - QObject::connect(tabBar(), &QTabBar::tabCloseRequested, this, &ToolWindowManagerArea::tabClosing); QObject::connect(tabBar(), &QTabBar::tabCloseRequested, this, &QTabWidget::tabCloseRequested); QObject::connect(this, &QTabWidget::currentChanged, this, &ToolWindowManagerArea::tabSelected); } diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.h b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.h index 9b26958c6..fa4f09882 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.h +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.h @@ -68,6 +68,11 @@ public: */ void updateToolWindow(QWidget *toolWindow); + /*! + * Callback when a tab is closing, after manager has checked that it is allowed. + */ + void tabClosing(int index); + protected: //! Reimplemented from QTabWidget::mouseMoveEvent. virtual void mouseMoveEvent(QMouseEvent *); @@ -116,7 +121,6 @@ private: private slots: void tabMoved(int from, int to); void tabSelected(int index); - void tabClosing(int index); }; #endif // TOOLWINDOWMANAGERAREA_H