lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update from toolwindowmanager repository @ 4e4280ca78c

Browse Source
This commit is contained in:
Jake Turner
2023-11-02 20:22:23 +00:00
parent 77b2c51355
commit 063a92d930
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
Vendored
+15 -8
View File
@@ -162,7 +162,7 @@ void ToolWindowManager::addToolWindows(QList<QWidget *> toolWindows,
}
if(m_toolWindows.contains(toolWindow))
{
qWarning("this tool window has already been added");
qWarning() << "this tool window has already been added" << toolWindow->objectName();
continue;
}
toolWindow->hide();
@@ -198,7 +198,7 @@ void ToolWindowManager::moveToolWindows(QList<QWidget *> toolWindows,
{
if(!m_toolWindows.contains(toolWindow))
{
qWarning("unknown tool window");
qWarning() << "unknown tool window:" << (toolWindow ? toolWindow->objectName() : QString());
return;
}
ToolWindowManagerWrapper *oldWrapper = wrapperOf(toolWindow);
@@ -474,7 +474,7 @@ void ToolWindowManager::removeToolWindow(QWidget *toolWindow, bool allowCloseAlr
{
if(!m_toolWindows.contains(toolWindow))
{
qWarning("unknown tool window");
qWarning() << "unknown tool window:" << (toolWindow ? toolWindow->objectName() : QString());
return;
}
@@ -483,7 +483,8 @@ void ToolWindowManager::removeToolWindow(QWidget *toolWindow, bool allowCloseAlr
if(!manager)
{
qWarning("unknown tool window");
qWarning() << "window not child of any tool window"
<< (toolWindow ? toolWindow->objectName() : QString());
return;
}
@@ -493,6 +494,11 @@ void ToolWindowManager::removeToolWindow(QWidget *toolWindow, bool allowCloseAlr
return;
}
forceCloseToolWindow(toolWindow);
}
void ToolWindowManager::forceCloseToolWindow(QWidget *toolWindow)
{
moveToolWindow(toolWindow, NoArea);
m_toolWindows.removeOne(toolWindow);
m_toolWindowProperties.remove(toolWindow);
@@ -537,7 +543,7 @@ void ToolWindowManager::closeToolWindow(QWidget *toolWindow)
return;
}
qWarning("window not child of any tool window");
qWarning() << "window not child of any tool window" << toolWindow->objectName();
}
void ToolWindowManager::raiseToolWindow(QWidget *toolWindow)
@@ -559,7 +565,7 @@ void ToolWindowManager::raiseToolWindow(QWidget *toolWindow)
if(area)
area->setCurrentWidget(toolWindow);
else
qWarning("parent is not a tool window area");
qWarning() << "parent is not a tool window area" << toolWindow->objectName();
}
QWidget *ToolWindowManager::createToolWindow(const QString &objectName)
@@ -681,7 +687,8 @@ void ToolWindowManager::releaseToolWindow(QWidget *toolWindow)
ToolWindowManagerArea *previousTabWidget = findClosestParent<ToolWindowManagerArea *>(toolWindow);
if(!previousTabWidget)
{
qWarning("cannot find tab widget for tool window");
qWarning() << "cannot find tab widget for tool window:"
<< (toolWindow ? toolWindow->objectName() : QString());
return;
}
previousTabWidget->removeTab(previousTabWidget->indexOf(toolWindow));
@@ -1466,7 +1473,7 @@ bool ToolWindowManager::allowClose(QWidget *toolWindow)
{
if(!m_toolWindows.contains(toolWindow))
{
qWarning("unknown tool window");
qWarning() << "unknown tool window:" << (toolWindow ? toolWindow->objectName() : QString());
return true;
}
int methodIndex = toolWindow->metaObject()->indexOfMethod(
qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.h
Vendored
+6
View File
@@ -249,6 +249,12 @@ public:
static void closeToolWindow(QWidget *toolWindow);
static void raiseToolWindow(QWidget *toolWindow);
/*!
* Force close a window, to be used when a toolWindow has become orphaned
* (no valid parent)
*/
void forceCloseToolWindow(QWidget *toolWindow);
/*!
* \brief saveState
*/