summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Hein <hein@kde.org>2017-01-03 07:30:54 (GMT)
committerEike Hein <hein@kde.org>2017-01-03 07:30:54 (GMT)
commite80a4b87cfa98708724942794ca6f051974bb5c0 (patch)
treef8f18591a6f19cd4b6d690f1e3b1851312217b32
parent2cfd11cd47a56ff01fc6e8b70174907befceb568 (diff)
Don't clear hover state while a child dialog is open.
Otherwise it won't stay open. Fixes regression from 7585f295363532eff51f7e11ef6b62925117aba4. The bug number referenced in the original change is invalid, but I don't think this should invalidate the intent of that fix. Kai please let me know the correct bug number so I can double-check. BUG:374291 CCMAIL:kde@privat.broulik.de
-rw-r--r--containments/desktop/package/contents/ui/FolderView.qml5
1 files changed, 4 insertions, 1 deletions
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
index 1fd8dbb..8936532 100644
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -343,7 +343,10 @@ Item {
onContainsMouseChanged: {
if (!containsMouse && !main.rubberBand) {
clearPressState();
- gridView.hoveredItem = null;
+
+ if (gridView.hoveredItem && !gridView.hoveredItem.popupDialog) {
+ gridView.hoveredItem = null;
+ }
}
}