attempt to make repeated actions more robust

Author: fdev31

modules/bar.py

@@ -195,7 +195,7 @@ def __init__(self, monitor_id: int = 0, **kwargs):
         self.ws_container.attach(self.ws_rail, 0, 0, 1, 1)
         self.ws_container.attach(workspaces_widget, 0, 0, 1, 1)
         self.ws_container.set_name("workspaces-container")
-
+        self._animation_source_ids = []
 
         self.button_tools = Button(
             name="button-bar",
@@ -536,7 +536,9 @@ def setup_workspaces(self):
             logger.error(f"Error initializing workspace rail: {e}")
 
     def _on_workspace_changed(self, _, event):
-        """Handle workspace change events directly"""
+        """Handle workspace change events directly. 
+        
+        This will cancel any ongoing animation and start a new one when workspace changes."""
         if event is not None and isinstance(event, HyprlandEvent) and event.data:
             try:
                 workspace_id = int(event.data[0])
@@ -547,12 +549,14 @@ def _on_workspace_changed(self, _, event):
         else:
             logger.warning(f"Invalid workspace event received: {event}")
 
-    def update_rail(self, workspace_id, initial_setup=False):
-        """Update the workspace rail position based on the workspace button"""
-        if self.is_animating_rail and not initial_setup:
-            return
+    def _cancel_animations(self):
+        # Cancel any pending animation timeouts
+        for source_id in self._animation_source_ids:
+            GLib.source_remove(source_id)
+        self._animation_source_ids.clear()
 
         logger.info(f"Updating rail for workspace {workspace_id}")
+        self._cancel_animations()
         workspaces = self.children_workspaces
         active_button = next(
             (
@@ -662,13 +666,14 @@ def _update_rail_with_animation(self, active_button):
         """
         self.ws_rail_provider.load_from_data(stretch_css.encode())
 
-        GLib.timeout_add(
+        source_id = GLib.timeout_add(
             int(stretch_duration * 1000),
             self._shrink_rail,
             target_pos,
             diameter,
             shrink_duration,
         )
+        self._animation_source_ids.append(source_id)
         return False
 
     def _shrink_rail(self, target_pos, target_size, duration):
@@ -692,19 +697,20 @@ def _shrink_rail(self, target_pos, target_size, duration):
         """
         self.ws_rail_provider.load_from_data(shrink_css.encode())
 
-        GLib.timeout_add(
+        source_id = GLib.timeout_add(
             int(duration * 1000),
             self._finalize_rail_animation,
             target_pos,
             target_size,
         )
-        return False
+        self._animation_source_ids.append(source_id)
 
     def _finalize_rail_animation(self, final_pos, final_size):
         """Finalize animation and update state."""
         self.current_rail_pos = final_pos
         self.current_rail_size = final_size
         self.is_animating_rail = False
+        self._animation_source_ids.clear()
         logger.info(
             f"Rail animation finished at pos={self.current_rail_pos}, size={self.current_rail_size}"
         )