Improve dock reveal animation when switching workspaces

Author: lenemter

lib/Gestures/Gesture.vala

@@ -41,6 +41,7 @@ namespace Gala {
         MULTITASKING_VIEW,
         ZOOM,
         CUSTOM,
+        CUSTOM_2,
         N_ACTIONS
     }
 

src/ShellClients/HideTracker.vala

@@ -1,41 +1,31 @@
 /*
- * Copyright 2024 elementary, Inc. (https://elementary.io)
+ * Copyright 2024-2025 elementary, Inc. (https://elementary.io)
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
 public class Gala.HideTracker : Object {
     private const int BARRIER_OFFSET = 50; // Allow hot corner trigger
-    private const int UPDATE_TIMEOUT = 200;
     private const int HIDE_DELAY = 500;
 
     public signal void hide ();
     public signal void show ();
 
     public Meta.Display display { get; construct; }
-    public unowned PanelWindow panel { get; construct; }
-    public Pantheon.Desktop.HideMode hide_mode { get; set; }
+    public unowned ShellWindow panel { get; construct; }
 
     private static GLib.Settings behavior_settings;
 
     private Clutter.PanAction pan_action;
 
     private bool hovered = false;
 
-    private bool overlap = false;
-    private bool focus_overlap = false;
-    private bool focus_maximized_overlap = false;
-    private bool fullscreen_overlap = false;
-
-    private Meta.Window current_focus_window;
-
     private Barrier? barrier;
 
     private uint hide_timeout_id = 0;
-    private uint update_timeout_id = 0;
 
-    public HideTracker (Meta.Display display, PanelWindow panel) {
+    public HideTracker (Meta.Display display, ShellWindow panel) {
         Object (display: display, panel: panel);
     }
 
@@ -49,22 +39,6 @@ public class Gala.HideTracker : Object {
             // access the panel which was already freed. To prevent that make sure we reset
             // the timeouts so that we get freed immediately
             reset_hide_timeout ();
-            reset_update_timeout ();
-        });
-
-        // Can't be local otherwise we get a memory leak :(
-        // See https://gitlab.gnome.org/GNOME/vala/-/issues/1548
-        current_focus_window = display.focus_window;
-        track_focus_window (current_focus_window);
-        display.notify["focus-window"].connect (() => {
-            untrack_focus_window (current_focus_window);
-            current_focus_window = display.focus_window;
-            track_focus_window (current_focus_window);
-        });
-
-        display.window_created.connect ((window) => {
-            schedule_update ();
-            window.unmanaged.connect (schedule_update);
         });
 
 #if HAS_MUTTER48
@@ -77,12 +51,15 @@ public class Gala.HideTracker : Object {
 
             if (hovered != has_pointer) {
                 hovered = has_pointer;
-                schedule_update ();
+
+                if (hovered) {
+                    trigger_show ();
+                } else {
+                    trigger_hide ();
+                }
             }
         });
 
-        display.get_workspace_manager ().active_workspace_changed.connect (schedule_update);
-
         pan_action = new Clutter.PanAction () {
             n_touch_points = 1,
             pan_axis = X_AXIS
@@ -101,144 +78,27 @@ public class Gala.HideTracker : Object {
         var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
         monitor_manager.monitors_changed.connect (() => {
             setup_barrier (); //Make sure barriers are still on the primary monitor
-            schedule_update ();
         });
 
         setup_barrier ();
     }
 
-
-    private void track_focus_window (Meta.Window? window) {
-        if (window == null) {
-            return;
-        }
-
-        window.position_changed.connect (schedule_update);
-        window.size_changed.connect (schedule_update);
-        schedule_update ();
-    }
-
-    private void untrack_focus_window (Meta.Window? window) {
-        if (window == null) {
-            return;
-        }
-
-        window.position_changed.disconnect (schedule_update);
-        window.size_changed.disconnect (schedule_update);
-        schedule_update ();
-    }
-
-    public void schedule_update () {
-        if (update_timeout_id != 0) {
-            return;
-        }
-
-        update_timeout_id = Timeout.add (UPDATE_TIMEOUT, () => {
-            update_overlap ();
-            update_timeout_id = 0;
-            return Source.REMOVE;
-        });
-    }
-
-    private void reset_update_timeout () {
-        if (update_timeout_id != 0) {
-            Source.remove (update_timeout_id);
-            update_timeout_id = 0;
-        }
-    }
-
-    public void update_overlap () {
-        overlap = false;
-        focus_overlap = false;
-        focus_maximized_overlap = false;
-        fullscreen_overlap = display.get_monitor_in_fullscreen (panel.window.get_monitor ());
-
-        unowned var active_workspace = display.get_workspace_manager ().get_active_workspace ();
-
-        Meta.Window? normal_mru_window, any_mru_window;
-        normal_mru_window = InternalUtils.get_mru_window (active_workspace, out any_mru_window);
-
-        foreach (var window in active_workspace.list_windows ()) {
-            if (window == panel.window) {
-                continue;
-            }
-
-            if (window.minimized) {
-                continue;
-            }
-
-            var type = window.get_window_type ();
-            if (type == DESKTOP || type == DOCK || type == MENU || type == SPLASHSCREEN) {
-                continue;
-            }
-
-            if (!panel.get_custom_window_rect ().overlap (window.get_frame_rect ())) {
-                continue;
-            }
-
-            overlap = true;
-
-            if (window != normal_mru_window && window != any_mru_window) {
-                continue;
-            }
-
-            focus_overlap = true;
-            focus_maximized_overlap = window.maximized_vertically;
-        }
-
-        update_hidden ();
-    }
-
-    private void update_hidden () {
-        switch (hide_mode) {
-            case MAXIMIZED_FOCUS_WINDOW:
-                toggle_display (focus_maximized_overlap);
-                break;
-
-            case OVERLAPPING_FOCUS_WINDOW:
-                toggle_display (focus_overlap);
-                break;
-
-            case OVERLAPPING_WINDOW:
-                toggle_display (overlap);
-                break;
-
-            case ALWAYS:
-                toggle_display (true);
-                break;
-
-            case NEVER:
-                toggle_display (fullscreen_overlap);
-                break;
-        }
-    }
-
-    private void toggle_display (bool should_hide) {
-        hovered = panel.window.has_pointer ();
-
-        // Showing panels in fullscreen is broken in X11
-        if (should_hide && !hovered && !panel.window.has_focus () || InternalUtils.get_x11_in_fullscreen (display)) {
-            trigger_hide ();
-        } else {
-            trigger_show ();
-        }
-    }
-
     private void trigger_hide () {
-        if (hide_timeout_id != 0) {
-            return;
-        }
+        reset_hide_timeout ();
 
         // Don't hide if we have transients, e.g. an open popover, dialog, etc.
+        // TODO: this is broken, we should monitor transients for has_pointer and use it instead.
         var has_transients = false;
-        panel.window.foreach_transient (() => {
+        panel.window.foreach_transient ((transient) => {
+            if (transient.window_type == DROPDOWN_MENU) {
+                return true;
+            }
+
             has_transients = true;
             return false;
         });
 
         if (has_transients) {
-            reset_hide_timeout ();
-
             return;
         }
 
@@ -349,9 +209,10 @@ public class Gala.HideTracker : Object {
             return;
         }
 
-        if (hide_mode != NEVER || behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")) {
+        if (!display.get_monitor_in_fullscreen (panel.window.get_monitor ()) ||
+            behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
+        ) {
             trigger_show ();
-            schedule_update ();
         }
     }
 }

src/ShellClients/PanelWindow.vala

@@ -1,45 +1,16 @@
 /*
- * Copyright 2024 elementary, Inc. (https://elementary.io)
+ * Copyright 2024-2025 elementary, Inc. (https://elementary.io)
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public class Gala.PanelWindow : ShellWindow, RootTarget {
-    private static HashTable<Meta.Window, Meta.Strut?> window_struts = new HashTable<Meta.Window, Meta.Strut?> (null, null);
-
-    public WindowManager wm { get; construct; }
-    public Pantheon.Desktop.Anchor anchor { get; construct set; }
-
-    public Pantheon.Desktop.HideMode hide_mode {
-        get {
-            return hide_tracker.hide_mode;
-        }
-        set {
-            hide_tracker.hide_mode = value;
-
-            if (value == NEVER) {
-                make_exclusive ();
-            } else {
-                unmake_exclusive ();
-            }
-        }
-    }
-
-    private GestureController gesture_controller;
-    private HideTracker hide_tracker;
-
+public class Gala.PanelWindow : ShellWindow {
     public PanelWindow (WindowManager wm, Meta.Window window, Pantheon.Desktop.Anchor anchor) {
         Object (wm: wm, anchor: anchor, window: window, position: Position.from_anchor (anchor));
     }
 
     construct {
-        window.unmanaging.connect (() => {
-            if (window_struts.remove (window)) {
-                update_struts ();
-            }
-        });
-
         notify["anchor"].connect (() => position = Position.from_anchor (anchor));
 
         unowned var workspace_manager = window.display.get_workspace_manager ();
@@ -50,81 +21,10 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
         window.position_changed.connect (update_strut);
         notify["width"].connect (update_strut);
         notify["height"].connect (update_strut);
-
-        gesture_controller = new GestureController (CUSTOM, wm);
-        add_gesture_controller (gesture_controller);
-
-        hide_tracker = new HideTracker (wm.get_display (), this);
-        hide_tracker.hide.connect (hide);
-        hide_tracker.show.connect (show);
     }
 
     public void request_visible_in_multitasking_view () {
         visible_in_multitasking_view = true;
         actor.add_action (new DragDropAction (DESTINATION, "multitaskingview-window"));
     }
-
-    private void hide () {
-        gesture_controller.goto (1);
-    }
-
-    private void show () {
-        gesture_controller.goto (0);
-    }
-
-    private void make_exclusive () {
-        update_strut ();
-    }
-
-    private void update_strut () {
-        if (hide_mode != NEVER) {
-            return;
-        }
-
-        var rect = get_custom_window_rect ();
-
-        Meta.Strut strut = {
-            rect,
-            side_from_anchor (anchor)
-        };
-
-        window_struts[window] = strut;
-
-        update_struts ();
-    }
-
-    private void update_struts () {
-        var list = new SList<Meta.Strut?> ();
-
-        foreach (var window_strut in window_struts.get_values ()) {
-            list.append (window_strut);
-        }
-
-        foreach (var workspace in wm.get_display ().get_workspace_manager ().get_workspaces ()) {
-            workspace.set_builtin_struts (list);
-        }
-    }
-
-    private void unmake_exclusive () {
-        if (window in window_struts) {
-            window_struts.remove (window);
-            update_struts ();
-        }
-    }
-
-    private Meta.Side side_from_anchor (Pantheon.Desktop.Anchor anchor) {
-        switch (anchor) {
-            case BOTTOM:
-                return BOTTOM;
-
-            case LEFT:
-                return LEFT;
-
-            case RIGHT:
-                return RIGHT;
-
-            default:
-                return TOP;
-        }
-    }
 }