From ef7f34de78c13c3efd42f988048fafb12b970721 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 16 Jan 2015 17:09:55 +0100 Subject: [PATCH] FancyMainWindow: Delay auto-collapsing of headers Instead of leaving the header, use leaving of the dockwidget itself as trigger. Change-Id: I7df46e5ef1c01e55c8c3dee837a55b473451153f Reviewed-by: Eike Ziller --- src/libs/utils/fancymainwindow.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 7711353c04b..dc4eed032e2 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -199,13 +199,6 @@ public: QWidget::enterEvent(event); } - void leaveEvent(QEvent *event) - { - if (!q->isFloating()) - setActive(false); - QWidget::leaveEvent(event); - } - void setActive(bool on) { m_active = on; @@ -311,6 +304,10 @@ void DockWidget::enterEvent(QEvent *event) void DockWidget::leaveEvent(QEvent *event) { + if (!isFloating()) { + m_timer.stop(); + m_titleBar->setActive(false); + } QApplication::instance()->removeEventFilter(this); QDockWidget::leaveEvent(event); }