summaryrefslogtreecommitdiff
path: root/modules/drawers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/drawers')
-rw-r--r--modules/drawers/Drawers.qml1
-rw-r--r--modules/drawers/Interactions.qml10
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index 4ade8c4..2ba79a4 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -96,6 +96,7 @@ Variants {
visibilities.sidebar = false;
visibilities.dashboard = false;
panels.popouts.hasCurrent = false;
+ bar.closeTray();
}
}
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 56e2d6b..9579b15 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -68,8 +68,10 @@ CustomMouseArea {
if (!utilitiesShortcutActive)
visibilities.utilities = false;
- if (!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1)
+ if (!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) {
popouts.hasCurrent = false;
+ bar.closeTray();
+ }
if (Config.bar.showOnHover)
bar.isHovered = false;
@@ -197,10 +199,12 @@ CustomMouseArea {
}
// Show popouts on hover
- if (x < bar.implicitWidth)
+ if (x < bar.implicitWidth) {
bar.checkPopout(y);
- else if ((!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) && !inLeftPanel(panels.popouts, x, y))
+ } else if ((!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) && !inLeftPanel(panels.popouts, x, y)) {
popouts.hasCurrent = false;
+ bar.closeTray();
+ }
}
// Monitor individual visibility changes