From 9958b470077ab7c7f227e4b21077fe7a2a517724 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 10 Nov 2017 17:01:02 +0000 Subject: [PATCH] Update toolwindowmanager to b822d2e0d92063a9ceba112b7d4b89716da5da88 --- qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp | 2 +- .../3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp index 7b52d1786..fc00f2536 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp @@ -280,7 +280,7 @@ void ToolWindowManager::moveToolWindows(QList toolWindows, int availSize = parentSplitterSizes[indexInParentSplitter]; parentSplitterSizes[indexInParentSplitter] = int(availSize * (1.0f - area.percentage())); - parentSplitterSizes.insert(indexInParentSplitter, int(availSize * area.percentage())); + parentSplitterSizes.insert(insertIndex, int(availSize * area.percentage())); parentSplitter->setSizes(parentSplitterSizes); } diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp index 2eb8fbd77..a1865a5b0 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp @@ -314,6 +314,12 @@ bool ToolWindowManagerWrapper::eventFilter(QObject *object, QEvent *event) { } else { showMaximized(); } + } else if (event->type() == QEvent::NonClientAreaMouseButtonDblClick) { + if (isMaximized()) { + showNormal(); + } else { + showMaximized(); + } } } return QWidget::eventFilter(object, event);