summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Hein <[email protected]>2017-05-23 06:16:36 +0900
committerEike Hein <[email protected]>2017-05-23 06:16:36 +0900
commit90db4410ad76264db748679864c1103df40bdd02 (patch)
treefa2ac4162a6b2bb04d7675779612805bb439a7fa
parent7aa09d2d5f200dc9a6510219d811d7df075683e3 (diff)
Fix race condition in spring-loading timer management.
When doing a drag move from one folder delegate to another they'd race each other on restarting/stopping the timer, sometimes stopping spring-loading cold.
-rw-r--r--containments/desktop/package/contents/ui/FolderItemDelegate.qml2
-rw-r--r--containments/desktop/package/contents/ui/FolderView.qml4
2 files changed, 4 insertions, 2 deletions
diff --git a/containments/desktop/package/contents/ui/FolderItemDelegate.qml b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
index 5be6421..6b76374 100644
--- a/containments/desktop/package/contents/ui/FolderItemDelegate.qml
+++ b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
@@ -109,8 +109,6 @@ Item {
}
}
} else if (!hovered) {
- hoverActivateTimer.stop();
-
if (popupDialog != null) {
popupDialog.requestDestroy();
popupDialog = null;
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
index 8d77577..3c24c10 100644
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -424,6 +424,10 @@ Item {
onHoveredItemChanged: {
doubleClickInProgress = false;
+
+ if (!hoveredItem) {
+ hoverActivateTimer.stop();
+ }
}
function pressCanceled() {