PiP: Use WorkspaceHideTracker for hiding

Author: lenemter

lib/WindowManager.vala

@@ -173,5 +173,13 @@ namespace Gala {
          * @return true if the action should be prohibited, false otherwise
          */
         public abstract bool filter_action (GestureAction action);
+
+        /**
+         * Adds target to the multitasking view and window overview so the target responds to the multitasking view
+         * close/open gesture and shortcuts.
+         *
+         * @param target Target to add to multitasking view and window overview
+         */
+        public abstract void add_multitasking_view_target (GestureTarget target);
     }
 }

plugins/pip/Main.vala

@@ -97,33 +97,31 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
             return;
         }
 
-        var popup_window = new PopupWindow (wm.get_display (), active);
+        var popup_window = new PopupWindow (wm, active);
         popup_window.set_container_clip (rect);
-        popup_window.show.connect (on_popup_window_show);
-        popup_window.hide.connect (on_popup_window_hide);
         add_window (popup_window);
     }
 
-    private void on_popup_window_show (Clutter.Actor popup_window) {
-        track_actor (popup_window);
-        update_region ();
-    }
-
-    private void on_popup_window_hide (Clutter.Actor popup_window) {
-        untrack_actor (popup_window);
-        update_region ();
-    }
-
     private void select_window_at (int x, int y) {
         var selected = get_window_actor_at (x, y);
         if (selected != null) {
-            var popup_window = new PopupWindow (wm.get_display (), selected);
-            popup_window.show.connect (on_popup_window_show);
-            popup_window.hide.connect (on_popup_window_hide);
+            var popup_window = new PopupWindow (wm, selected);
             add_window (popup_window);
         }
     }
 
+    private void popup_window_reactive_changed (GLib.Object obj, GLib.ParamSpec pspec) requires (obj is PopupWindow) {
+        var popup_window = (PopupWindow) obj;
+
+        if (popup_window.reactive) {
+            track_actor (popup_window);
+        } else {
+            untrack_actor (popup_window);
+        }
+
+        update_region ();
+    }
+
     private void clear_selection_area () {
         if (selection_area != null) {
             untrack_actor (selection_area);
@@ -189,6 +187,8 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     }
 
     private void add_window (PopupWindow popup_window) {
+        track_actor (popup_window);
+        popup_window.notify["reactive"].connect (popup_window_reactive_changed);
         popup_window.closed.connect (() => remove_window (popup_window));
         windows.add (popup_window);
         wm.ui_group.add_child (popup_window);

plugins/pip/PopupWindow.vala

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
+public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor, GestureTarget, RootTarget {
     private int button_size;
     private int container_margin;
     private const uint FADE_OUT_TIMEOUT = 200;
@@ -15,7 +15,9 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
     public signal void closed ();
 
-    public Meta.Display display { get; construct; }
+    public Clutter.Actor? actor { get { return this; } }
+
+    public WindowManager wm { get; construct; }
     public Meta.WindowActor window_actor { get; construct; }
 
     private Clutter.Clone clone; // clone itself
@@ -34,8 +36,10 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private bool resizing = false;
     private bool off_screen = false;
     private Clutter.Grab? grab = null;
-
-    private static unowned Meta.Window? previous_focus = null;
+    
+    private GestureController gesture_controller;
+    private WorkspaceHideTracker workspace_hide_tracker;
+    private PropertyTarget property_target;
 
     // From https://opensourcehacker.com/2011/12/01/calculate-aspect-ratio-conserving-resize-for-images-in-javascript/
     private static void calculate_aspect_ratio_size_fit (float src_width, float src_height, float max_width, float max_height,
@@ -45,11 +49,12 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         height = src_height * ratio;
     }
 
-    public PopupWindow (Meta.Display display, Meta.WindowActor window_actor) {
-        Object (display: display, window_actor: window_actor);
+    public PopupWindow (WindowManager wm, Meta.WindowActor window_actor) {
+        Object (wm: wm, window_actor: window_actor);
     }
 
     construct {
+        unowned var display = wm.get_display ();
         var scale = display.get_monitor_scale (display.get_current_monitor ());
 
         button_size = Gala.Utils.scale_to_int (36, scale);
@@ -122,41 +127,35 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         unowned var window = window_actor.get_meta_window ();
         window.unmanaged.connect (on_close_click_clicked);
-        window.notify["appears-focused"].connect (update_window_focus);
 
-        unowned var workspace_manager = display.get_workspace_manager ();
-        workspace_manager.active_workspace_changed.connect (update_window_focus);
-    }
+        wm.add_multitasking_view_target (this);
 
-    public override void show () {
-        base.show ();
+        gesture_controller = new GestureController (CUSTOM, wm) {
+            progress = 0.0
+        };
+        add_gesture_controller (gesture_controller);
 
-        opacity = 0;
+        workspace_hide_tracker = new WorkspaceHideTracker (display, this);
+        workspace_hide_tracker.compute_progress.connect (calculate_progress);
+        workspace_hide_tracker.switching_workspace_progress_updated.connect ((value) => gesture_controller.progress = value);
+        workspace_hide_tracker.window_state_changed_progress_updated.connect (gesture_controller.goto);
 
-        save_easing_state ();
-        set_easing_duration (Utils.get_animation_duration (200));
-        opacity = 255;
-        restore_easing_state ();
+        property_target = new PropertyTarget (CUSTOM, this, "opacity", typeof (uint), 255u, 0u);
     }
 
-    public override void hide () {
-        opacity = 255;
+    public override void propagate (UpdateType update_type, GestureAction action, double progress) {
+        warning ("%s %s %f", update_type.to_string (), action.to_string (), progress);
 
-        var duration = Utils.get_animation_duration (200);
-        save_easing_state ();
-        set_easing_duration (duration);
-        opacity = 0;
-        restore_easing_state ();
+        workspace_hide_tracker.propagate (update_type, action, progress);
 
-        if (duration == 0) {
-            base.hide ();
-        } else {
-            ulong completed_id = 0;
-            completed_id = transitions_completed.connect (() => {
-                disconnect (completed_id);
-                base.hide ();
-            });
+        if (action != CUSTOM || update_type == COMMIT) {
+            return;
         }
+
+        //  warning ("Setting progress to %f", progress);
+        property_target.propagate (UPDATE, CUSTOM, progress);
+
+        reactive = update_type == END;
     }
 
     public override bool enter_event (Clutter.Event event) {
@@ -199,9 +198,9 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
     private Clutter.Actor on_move_begin () {
 #if HAS_MUTTER48
-        display.set_cursor (Meta.Cursor.MOVE);
+        wm.get_display ().set_cursor (Meta.Cursor.MOVE);
 #else
-        display.set_cursor (Meta.Cursor.DND_IN_DRAG);
+        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
 #endif
 
         return this;
@@ -210,7 +209,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
-        display.set_cursor (Meta.Cursor.DEFAULT);
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private bool on_resize_button_press (Clutter.Event event) {
@@ -228,7 +227,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         grab = resize_button.get_stage ().grab (resize_button);
         resize_button.event.connect (on_resize_event);
 
-        display.set_cursor (Meta.Cursor.SE_RESIZE);
+        wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
 
         return Clutter.EVENT_PROPAGATE;
     }
@@ -289,7 +288,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         update_screen_position ();
 
-        display.set_cursor (Meta.Cursor.DEFAULT);
+        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {
@@ -315,25 +314,14 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         });
     }
 
-    private void update_window_focus () {
-        unowned Meta.Window focus_window = display.get_focus_window ();
-        if ((focus_window != null && !Utils.get_window_is_normal (focus_window))
-            || (previous_focus != null && !Utils.get_window_is_normal (previous_focus))) {
-            previous_focus = focus_window;
-            return;
-        }
-
-        unowned var workspace_manager = display.get_workspace_manager ();
-        unowned var active_workspace = workspace_manager.get_active_workspace ();
+    private double calculate_progress (Meta.Workspace workspace) {
         unowned var window = window_actor.get_meta_window ();
 
-        if (window.appears_focused && window.located_on_workspace (active_workspace)) {
-            hide ();
-        } else if (!window_actor.is_destroyed ()) {
-            show ();
+        if (window.has_focus () && window.get_workspace () == workspace) {
+            return 1.0;
+        } else {
+            return 0.0;
         }
-
-        previous_focus = focus_window;
     }
 
     private void update_size () {
@@ -422,7 +410,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private void place_window_in_screen () {
         off_screen = false;
 
-        var workarea_rect = display.get_workspace_manager ().get_active_workspace ().get_work_area_all_monitors ();
+        var workarea_rect = wm.get_display ().get_workspace_manager ().get_active_workspace ().get_work_area_all_monitors ();
 
         var screen_limit_start_x = workarea_rect.x;
         var screen_limit_end_x = workarea_rect.x + workarea_rect.width - width;
@@ -448,6 +436,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
         set_easing_duration (duration);
 
+        unowned var display = wm.get_display ();
         var monitor_rect = display.get_monitor_geometry (display.get_current_monitor ());
 
         int monitor_x = monitor_rect.x;
@@ -495,6 +484,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private bool coord_is_in_other_monitor (float coord, Clutter.Orientation axis) {
+        unowned var display = wm.get_display ();
         int n_monitors = display.get_n_monitors ();
 
         if (n_monitors == 1) {

src/WindowManager.vala

@@ -1727,6 +1727,14 @@ namespace Gala {
             return modal_stack.peek_head ().filter_action (action);
         }
 
+        public void add_multitasking_view_target (GestureTarget target) {
+            multitasking_view.add_target (target);
+
+            if (window_overview is WindowOverview) {
+                ((WindowOverview) window_overview).add_target (target);
+            }
+        }
+
         public override void confirm_display_change () {
             unowned var monitor_manager = get_display ().get_context ().get_backend ().get_monitor_manager ();
             var timeout = monitor_manager.get_display_configuration_timeout ();