From a34c7e0d890059006dd4f4f2bd9f4960d46ee4f3 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 23 Jun 2017 21:39:49 +0100 Subject: [PATCH] Update toolwindowmanager to 5025511 --- .../toolwindowmanager/ToolWindowManagerTabBar.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp index e9656df41..0b80044ab 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp @@ -153,7 +153,7 @@ void ToolWindowManagerTabBar::paintEvent(QPaintEvent *event) { bool tabClosable = (props & ToolWindowManager::HideCloseButton) == 0; - if (!tabClosable) + if (!tabClosable && !m_pin.rect.isEmpty()) buttonOpt.rect = m_close.rect; QStyle::State prevState = buttonOpt.state; @@ -234,7 +234,8 @@ void ToolWindowManagerTabBar::mousePressEvent(QMouseEvent *event) { QRect closeRect = m_close.rect; if (!tabClosable) { - pinRect = closeRect; + if (!pinRect.isEmpty()) + pinRect = closeRect; closeRect = QRect(); } @@ -276,7 +277,8 @@ void ToolWindowManagerTabBar::mouseMoveEvent(QMouseEvent *event) { QRect closeRect = m_close.rect; if (!tabClosable) { - pinRect = closeRect; + if (!pinRect.isEmpty()) + pinRect = closeRect; closeRect = QRect(); } @@ -317,7 +319,8 @@ void ToolWindowManagerTabBar::mouseReleaseEvent(QMouseEvent *event) { QRect closeRect = m_close.rect; if (!tabClosable) { - pinRect = closeRect; + if (!pinRect.isEmpty()) + pinRect = closeRect; closeRect = QRect(); }