From 2dc577a02c79a6d40fe788af74f6e356219e11cf Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 19 Jul 2017 18:23:57 +0100 Subject: [PATCH] Update toolwindowmanager to d520d7a --- .../ToolWindowManagerTabBar.cpp | 16 +++++++++++----- .../toolwindowmanager/ToolWindowManagerTabBar.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp index 0b80044ab..51bd809a7 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.cpp @@ -180,11 +180,7 @@ void ToolWindowManagerTabBar::paintEvent(QPaintEvent *event) { else if(m_close.hover) buttonOpt.state |= QStyle::State_Raised | QStyle::State_MouseOver; - if (style()->styleHint(QStyle::SH_DockWidget_ButtonsHaveFrame, 0, this)) { - style()->drawPrimitive(QStyle::PE_PanelButtonTool, &buttonOpt, &p, this); - } - - style()->drawComplexControl(QStyle::CC_ToolButton, &buttonOpt, &p, this); + style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &buttonOpt, &p, this); } return; } @@ -304,6 +300,16 @@ void ToolWindowManagerTabBar::mouseMoveEvent(QMouseEvent *event) { update(); } +void ToolWindowManagerTabBar::leaveEvent(QEvent *) { + m_pin.hover = false; + m_pin.clicked = false; + + m_close.hover = false; + m_close.clicked = false; + + update(); +} + void ToolWindowManagerTabBar::mouseReleaseEvent(QMouseEvent *event) { QTabBar::mouseReleaseEvent(event); diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.h b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.h index 0f47c8748..99f56d826 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.h +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerTabBar.h @@ -66,6 +66,7 @@ protected: void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void leaveEvent(QEvent *) Q_DECL_OVERRIDE; //! Reimplemented from QTabWidget::QTabBar to enable/disable 'real' closable tabs. virtual void tabInserted(int index) Q_DECL_OVERRIDE;