From 6881d8fbbe2b85f3980a7fe3f63ac618c84c18ab Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 9 Apr 2018 01:03:05 +0300 Subject: [PATCH] fix #970,parabolic effect fix During dock sliding-in because the parabolic effect isnt trigerred immediately but we wait first the dock to go to its final normal place we might miss the activation of the parabolic effect. By catching that signal we are trying to solve this. --- containment/package/contents/ui/main.qml | 1 + plasmoid/package/contents/ui/main.qml | 1 + plasmoid/package/contents/ui/task/TaskDelegate.qml | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 1c083d917..5d126621d 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -116,6 +116,7 @@ DragDrop.DropArea { readonly property bool hasUserSpecifiedBackground: (dock && dock.managedLayout && dock.managedLayout.background.startsWith("/")) ? true : false + property bool dockIsShownCompletely: !(dockIsHidden || inSlidingIn || inSlidingOut) && !root.editMode property bool immutable: plasmoid.immutable property bool indicateAudioStreams: plasmoid.configuration.indicateAudioStreams property bool inFullJustify: (plasmoid.configuration.panelPosition === Latte.Dock.Justify) && (plasmoid.configuration.maxLength===100) diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index ff18434f2..0b5a85e15 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -164,6 +164,7 @@ Item { property string launcherForRemoval: "" //BEGIN Latte Dock properties + property bool dockIsShownCompletely: latteDock ? latteDock.dockIsShownCompletely : true property bool enableShadows: latteDock ? latteDock.enableShadows > 0 : plasmoid.configuration.showShadows property bool forceHidePanel: false property bool directRenderDelayerIsRunning: latteDock ? latteDock.directRenderDelayerIsRunning : directRenderDelayerForEnteringTimer.running diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml index 4de81eec9..f2ae375b0 100644 --- a/plasmoid/package/contents/ui/task/TaskDelegate.qml +++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml @@ -337,6 +337,20 @@ MouseArea{ onDragSourceChanged: separatorItem.updateForceHiddenState(); onSeparatorsUpdated: separatorItem.updateForceHiddenState(); + //! During dock sliding-in because the parabolic effect isnt trigerred + //! immediately but we wait first the dock to go to its final normal + //! place we might miss the activation of the parabolic effect. + //! By catching that signal we are trying to solve this. + onDockIsShownCompletelyChanged: { + if (dockIsShownCompletely && mainItemContainer.containsMouse) { + if (root.vertical) { + mainItemContainer.mousePosChanged(mainItemContainer.mouseY); + } else { + mainItemContainer.mousePosChanged(mainItemContainer.mouseX); + } + } + } + onGlobalDirectRenderChanged:{ if (root.globalDirectRender && restoreAnimation.running) { // console.log("Cleat Task Scale !!!!");