From 1bd92b47406b352c72a54ca56e3b29ea5dfb5402 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:46:05 +1000
Subject: bar: some internal fixes

---
 modules/bar/BarWrapper.qml       | 6 +++---
 modules/drawers/Interactions.qml | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml
index 698761d..7e5415c 100644
--- a/modules/bar/BarWrapper.qml
+++ b/modules/bar/BarWrapper.qml
@@ -13,7 +13,7 @@ Item {
     required property PersistentProperties visibilities
     required property BarPopouts.Wrapper popouts
 
-    readonly property int exclusiveZone: Config.bar.persistent || (visibilities.bar && !isHovered) ? content.implicitWidth : Config.border.thickness
+    readonly property int exclusiveZone: Config.bar.persistent || visibilities.bar ? content.implicitWidth : Config.border.thickness
     property bool isHovered
 
     function checkPopout(y: real): void {
@@ -26,7 +26,7 @@ Item {
 
     states: State {
         name: "visible"
-        when: Config.bar.persistent || root.visibilities.bar
+        when: Config.bar.persistent || root.visibilities.bar || root.isHovered
 
         PropertyChanges {
             root.implicitWidth: content.implicitWidth
@@ -63,7 +63,7 @@ Item {
     Loader {
         id: content
 
-        Component.onCompleted: active = Qt.binding(() => root.visibilities.bar || root.visible)
+        Component.onCompleted: active = Qt.binding(() => Config.bar.persistent || root.visibilities.bar || root.isHovered || root.visible)
 
         anchors.top: parent.top
         anchors.bottom: parent.bottom
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 9c9aeb3..95cfef7 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -61,8 +61,8 @@ MouseArea {
             }
             popouts.hasCurrent = false;
 
-            if (bar.isHovered && Config.bar.showOnHover)
-                visibilities.bar = false;
+            if (Config.bar.showOnHover)
+                bar.isHovered = false;
         }
     }
 
@@ -72,7 +72,6 @@ MouseArea {
 
         // Show bar in non-exclusive mode on hover
         if (!visibilities.bar && Config.bar.showOnHover && x < bar.implicitWidth) {
-            visibilities.bar = true;
             bar.isHovered = true;
         }
 
@@ -81,8 +80,7 @@ MouseArea {
             const dragX = x - dragStart.x;
             if (dragX > Config.bar.dragThreshold) {
                 visibilities.bar = true;
-                bar.isHovered = false;
-            } else if (!bar.isHovered && dragX < -Config.bar.dragThreshold) {
+            } else if (dragX < -Config.bar.dragThreshold) {
                 visibilities.bar = false;
             }
         }
-- 
cgit v1.2.3-freya