toggle beta

Author: Axenide

modules/dock.py

@@ -640,7 +640,19 @@ def check_occlusion_state(self):
         if self.integrated_mode:
             return False
 
-        if self.is_mouse_over_dock_area or self._drag_in_progress or self._prevent_occlusion or self._forced_occlusion:
+        # When forced occlusion is active, only show on hover
+        if self._forced_occlusion:
+            if self.is_mouse_over_dock_area:
+                if not self.dock_revealer.get_reveal_child():
+                    self.dock_revealer.set_reveal_child(True)
+                self.dock_full.remove_style_class("occluded")
+            else:
+                if self.dock_revealer.get_reveal_child():
+                    self.dock_revealer.set_reveal_child(False)
+                self.dock_full.add_style_class("occluded")
+            return True
+
+        if self.is_mouse_over_dock_area or self._drag_in_progress or self._prevent_occlusion:
             if not self.dock_revealer.get_reveal_child():
                 self.dock_revealer.set_reveal_child(True)
             if not self.always_show:
@@ -821,16 +833,24 @@ def update_visibility(visible):
                     dock.dock_revealer.set_reveal_child(False)
 
     def force_occlusion(self):
-        """Force dock to occlusion mode (hidden but responds to hover)."""
+        """Force dock to hide and act as if always_show is False."""
         if self.integrated_mode:
             return
+        # Save current always_show state
+        self._saved_always_show = self.always_show
+        # Set to False to enable hover behavior
+        self.always_show = False
         self._forced_occlusion = True
         if not self.is_mouse_over_dock_area:
             self.dock_revealer.set_reveal_child(False)
 
     def restore_from_occlusion(self):
-        """Restore dock from forced occlusion mode."""
+        """Restore dock to its previous always_show state."""
         if self.integrated_mode:
             return
         self._forced_occlusion = False
+        # Restore saved always_show state
+        if hasattr(self, '_saved_always_show'):
+            self.always_show = self._saved_always_show
+            delattr(self, '_saved_always_show')
         self.check_occlusion_state()

modules/notch.py

@@ -455,8 +455,6 @@ def on_notch_hover_area_enter(self, widget, event):
         self.is_hovered = True
         if data.PANEL_THEME == "Notch" and data.BAR_POSITION != "Top":
             self.notch_revealer.set_reveal_child(True)
-        elif self._forced_occlusion:
-            self.notch_revealer.set_reveal_child(True)
         return False
 
     def on_notch_hover_area_leave(self, widget, event):
@@ -466,9 +464,6 @@ def on_notch_hover_area_leave(self, widget, event):
             return False
 
         self.is_hovered = False
-        
-        if self._forced_occlusion:
-            self.notch_revealer.set_reveal_child(False)
 
         return False
 
@@ -879,7 +874,10 @@ def _check_occlusion(self):
         occlusion_edge = "top"
         occlusion_size = 40
 
-        if not (self.is_hovered or self._is_notch_open or self._prevent_occlusion or self._forced_occlusion):
+        if self._forced_occlusion:
+            # When forced occlusion is active, show only on hover
+            self.notch_revealer.set_reveal_child(self.is_hovered)
+        elif not (self.is_hovered or self._is_notch_open or self._prevent_occlusion):
             is_occluded = check_occlusion((occlusion_edge, occlusion_size))
             self.notch_revealer.set_reveal_child(not is_occluded)
 
@@ -890,6 +888,9 @@ def force_occlusion(self):
         self._forced_occlusion = True
         self._prevent_occlusion = False
         self.notch_revealer.set_reveal_child(False)
+        # Start occlusion check timer if in vertical mode (left/right)
+        if data.BAR_POSITION in ["Left", "Right"]:
+            GLib.timeout_add(100, self._check_occlusion)
 
     def restore_from_occlusion(self):
         """Restore notch from occlusion mode."""