From 4bc7a45474c446ed2a5f0ea58de3b50b1308cf1e Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 30 Dec 2016 20:49:48 +0200 Subject: [PATCH] restore previous functionality for QEvent:Leave --- app/visibilitymanager.cpp | 7 +++---- containment/contents/ui/main.qml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/visibilitymanager.cpp b/app/visibilitymanager.cpp index 9a7065037..ab3726655 100644 --- a/app/visibilitymanager.cpp +++ b/app/visibilitymanager.cpp @@ -63,7 +63,7 @@ inline void VisibilityManagerPrivate::setMode(Dock::Visibility mode) raiseDock(true); } break; - + case Dock::AutoHide: { raiseDock(true); } @@ -268,14 +268,13 @@ bool VisibilityManagerPrivate::event(QEvent *ev) containsMouse = true; emit q->containsMouseChanged(); - emit q->mustBeShown(); + raiseDock(true); } else if (ev->type() == QEvent::Leave && containsMouse) { containsMouse = false; emit q->containsMouseChanged(); - + if (mode == Dock::AutoHide) raiseDock(false); - } else if (ev->type() == QEvent::Show) { wm->setDockDefaultFlags(); } diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index 635b80e9a..443e179ab 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -398,7 +398,7 @@ DragDrop.DropArea { dock.onWidthChanged.connect(visibilityManager.updateMaskArea); dock.onHeightChanged.connect(visibilityManager.updateMaskArea); - dock.visibility.timerShow = 1000; + dock.visibility.timerShow = 300; dock.visibility.timerHide = 1000; //dock.visibility.onDisableHidingChanged.connect(visibilityManager.slotDisableHidingChanged);