ShellClients: Use GestureController and GestureTarget

Author: leolost2605

src/ShellClients/PanelWindow.vala

@@ -35,7 +35,7 @@ public class Gala.PanelWindow : ShellWindow {
         }
     }
 
-    private GestureTracker default_gesture_tracker;
+    private GestureController gesture_controller;
     private HideTracker? hide_tracker;
 
     private int width = -1;
@@ -50,6 +50,8 @@ public class Gala.PanelWindow : ShellWindow {
             if (window_struts.remove (window)) {
                 update_struts ();
             }
+
+            gesture_controller = null; // make it release its reference on us
         });
 
         notify["anchor"].connect (() => position = Position.from_anchor (anchor));
@@ -61,7 +63,7 @@ public class Gala.PanelWindow : ShellWindow {
         window.size_changed.connect (update_strut);
         window.position_changed.connect (update_strut);
 
-        default_gesture_tracker = new GestureTracker (ANIMATION_DURATION, ANIMATION_DURATION);
+        gesture_controller = new GestureController (GESTURE_ID, NONE, this);
 
         window.display.in_fullscreen_changed.connect (() => {
             if (wm.get_display ().get_monitor_in_fullscreen (window.get_monitor ())) {
@@ -105,15 +107,15 @@ public class Gala.PanelWindow : ShellWindow {
     }
 
     private void hide () {
-        add_state (CUSTOM_HIDDEN, default_gesture_tracker, false);
+        gesture_controller.goto (1);
     }
 
     private void show () {
         if (window.display.get_monitor_in_fullscreen (window.get_monitor ())) {
             return;
         }
 
-        remove_state (CUSTOM_HIDDEN, default_gesture_tracker, false);
+        gesture_controller.goto (0);
     }
 
     private void make_exclusive () {

src/ShellClients/ShellClientsManager.vala

@@ -5,7 +5,7 @@
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public class Gala.ShellClientsManager : Object {
+public class Gala.ShellClientsManager : Object, GestureTarget {
     private static ShellClientsManager instance;
 
     public static void init (WindowManager wm) {
@@ -20,6 +20,8 @@ public class Gala.ShellClientsManager : Object {
         return instance;
     }
 
+    public Clutter.Actor? actor { get { return wm.stage; } }
+
     public WindowManager wm { get; construct; }
 
     private NotificationsClient notifications_client;
@@ -190,23 +192,33 @@ public class Gala.ShellClientsManager : Object {
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
     }
 
-    public void add_state (ShellWindow.State state, GestureTracker gesture_tracker, bool with_gesture) {
+    public override void start (string id) {
+        foreach (var window in positioned_windows.get_values ()) {
+            window.start (id);
+        }
+
+        foreach (var window in panel_windows.get_values ()) {
+            window.start (id);
+        }
+    }
+
+    public override void update (string id, double progress) {
         foreach (var window in positioned_windows.get_values ()) {
-            window.add_state (state, gesture_tracker, with_gesture);
+            window.update (id, progress);
         }
 
         foreach (var window in panel_windows.get_values ()) {
-            window.add_state (state, gesture_tracker, with_gesture);
+            window.update (id, progress);
         }
     }
 
-    public void remove_state (ShellWindow.State state, GestureTracker gesture_tracker, bool with_gesture) {
+    public override void end (string id) {
         foreach (var window in positioned_windows.get_values ()) {
-            window.remove_state (state, gesture_tracker, with_gesture);
+            window.end (id);
         }
 
         foreach (var window in panel_windows.get_values ()) {
-            window.remove_state (state, gesture_tracker, with_gesture);
+            window.end (id);
         }
     }
 

src/ShellClients/ShellWindow.vala

@@ -5,90 +5,96 @@
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public class Gala.ShellWindow : PositionedWindow {
-    [Flags]
-    public enum State {
-        CUSTOM_HIDDEN,
-        MULTITASKING_VIEW,
-        DESKTOP
-    }
+public class Gala.ShellWindow : PositionedWindow, GestureTarget {
+    public const string GESTURE_ID = "shell-window";
+
+    public Clutter.Actor? actor { get { return window_actor; } }
 
-    private const State HIDING_STATES = CUSTOM_HIDDEN | MULTITASKING_VIEW;
+    private Meta.WindowActor window_actor;
+    private double custom_progress = 0;
+    private double multitasking_view_progress = 0;
 
-    private Meta.WindowActor actor;
-    private State pending_state = DESKTOP;
-    private State current_state = DESKTOP;
+    private int animations_ongoing = 0;
 
-    private bool gesture_ongoing = false;
+    private PropertyTarget property_target;
 
     public ShellWindow (Meta.Window window, Position position, Variant? position_data = null) {
         base (window, position, position_data);
     }
 
     construct {
-        actor = (Meta.WindowActor) window.get_compositor_private ();
+        window_actor = (Meta.WindowActor) window.get_compositor_private ();
+
+        window_actor.notify["height"].connect (update_target);
+        notify["position"].connect (update_target);
+        update_target ();
     }
 
-    public void add_state (State state, GestureTracker gesture_tracker, bool with_gesture) {
-        pending_state |= state;
-        animate (pending_state, gesture_tracker, with_gesture);
+    private void update_target () {
+        property_target = new PropertyTarget (
+            GESTURE_ID, window_actor,
+            get_animation_property (),
+            get_property_type (),
+            calculate_value (false),
+            calculate_value (true)
+        );
     }
 
-    public void remove_state (State state, GestureTracker gesture_tracker, bool with_gesture) {
-        pending_state &= ~state;
-        animate (pending_state, gesture_tracker, with_gesture);
+    private void update_property () {
+        var hidden_progress = double.max (custom_progress, multitasking_view_progress);
+        property_target.update (GESTURE_ID, hidden_progress);
     }
 
-    private void animate (State new_state, GestureTracker gesture_tracker, bool with_gesture) {
-        if (new_state == current_state || gesture_ongoing) {
-            return;
-        }
+    public override void start (string id) {
+        animations_ongoing++;
+        update_visibility ();
+    }
 
-        gesture_ongoing = true;
+    public override void update (string id, double progress) {
+        switch (id) {
+            case MultitaskingView.GESTURE_ID:
+                multitasking_view_progress = progress;
+                break;
 
-        update_visibility (true);
+            case GESTURE_ID:
+                custom_progress = progress;
+                break;
 
-        new GesturePropertyTransition (
-            actor, gesture_tracker, get_animation_property (), null, calculate_value ((new_state & HIDING_STATES) != 0)
-        ).start (with_gesture, () => update_visibility (false));
+            default:
+                break;
+        }
 
-        gesture_tracker.add_end_callback (with_gesture, (percentage, completions) => {
-            gesture_ongoing = false;
+        update_property ();
+    }
 
-            if (completions != 0) {
-                current_state = new_state;
-            }
+    public override void end (string id) {
+        animations_ongoing--;
+        update_visibility ();
+    }
 
-            if (!Meta.Util.is_wayland_compositor ()) {
-                if ((current_state & HIDING_STATES) != 0) {
-                    Utils.x11_set_window_pass_through (window);
-                } else {
-                    Utils.x11_unset_window_pass_through (window);
-                }
-            }
+    private void update_visibility () {
+        var visible = double.max (multitasking_view_progress, custom_progress) < 0.1;
+        var animating = animations_ongoing > 0;
 
-            if (pending_state != new_state) { // We have received new state while animating
-                animate (pending_state, gesture_tracker, false);
+        if (!Meta.Util.is_wayland_compositor ()) {
+            if (!visible) {
+                Utils.x11_set_window_pass_through (window);
             } else {
-                pending_state = current_state;
+                Utils.x11_unset_window_pass_through (window);
             }
-        });
-    }
-
-    private void update_visibility (bool animating) {
-        var visible = (current_state & HIDING_STATES) == 0;
+        }
 
-        actor.visible = animating || visible;
+        window_actor.visible = animating || visible;
 
         unowned var manager = ShellClientsManager.get_instance ();
         window.foreach_transient ((transient) => {
             if (manager.is_itself_positioned (transient)) {
                 return true;
             }
 
-            unowned var actor = (Meta.WindowActor) transient.get_compositor_private ();
+            unowned var window_actor = (Meta.WindowActor) transient.get_compositor_private ();
 
-            actor.visible = visible && !animating;
+            window_actor.visible = visible && !animating;
 
             return true;
         });
@@ -104,12 +110,22 @@ public class Gala.ShellWindow : PositionedWindow {
         }
     }
 
+    private Type get_property_type () {
+        switch (position) {
+            case TOP:
+            case BOTTOM:
+                return typeof (float);
+            default:
+                return typeof (uint);
+        }
+    }
+
     private Value calculate_value (bool hidden) {
         switch (position) {
             case TOP:
-                return hidden ? -actor.height : 0f;
+                return hidden ? -window_actor.height : 0f;
             case BOTTOM:
-                return hidden ? actor.height : 0f;
+                return hidden ? window_actor.height : 0f;
             default:
                 return hidden ? 0u : 255u;
         }