Initial support for keeping shellclients in the multitasking view

Author: leolost2605

protocol/pantheon-desktop-shell-v1.xml

@@ -98,6 +98,12 @@
 
       <arg name="hide_mode" type="uint" enum="hide_mode" summary="hide mode"/>
     </request>
+
+    <request name="request_visible_in_multitasking_view">
+      <description summary="request visible in multitasking view">
+        Tell the shell that the panel would like to be visible in the multitasking view.
+      </description>
+    </request>
   </interface>
 
   <interface name="io_elementary_pantheon_widget_v1" version="1">

protocol/pantheon-desktop-shell.vapi

@@ -41,6 +41,7 @@ namespace Pantheon.Desktop {
         public Focus focus;
         public SetSize set_size;
         public SetHideMode set_hide_mode;
+        public RequestVisibleInMultitaskingView request_visible_in_multitasking_view;
     }
 
     [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "struct io_elementary_pantheon_widget_v1_interface")]
@@ -75,6 +76,8 @@ namespace Pantheon.Desktop {
     [CCode (has_target = false, has_typedef = false)]
     public delegate void SetHideMode (Wl.Client client, Wl.Resource resource, [CCode (type = "uint32_t")] HideMode hide_mode);
     [CCode (has_target = false, has_typedef = false)]
+    public delegate void RequestVisibleInMultitaskingView (Wl.Client client, Wl.Resource resource);
+    [CCode (has_target = false, has_typedef = false)]
     public delegate void SetKeepAbove (Wl.Client client, Wl.Resource resource);
     [CCode (has_target = false, has_typedef = false)]
     public delegate void MakeCentered (Wl.Client client, Wl.Resource resource);

src/PantheonShell.vala

@@ -58,6 +58,7 @@ namespace Gala {
             focus_panel,
             set_size,
             set_hide_mode,
+            request_visible_in_multitasking_view,
         };
 
         wayland_pantheon_widget_interface = {
@@ -311,6 +312,23 @@ namespace Gala {
         ShellClientsManager.get_instance ().set_hide_mode (window, hide_mode);
     }
 
+    internal static void request_visible_in_multitasking_view (Wl.Client client, Wl.Resource resource) {
+        unowned PanelSurface? panel_surface = resource.get_user_data<PanelSurface> ();
+        if (panel_surface.wayland_surface == null) {
+            warning ("Window tried to set visible in mutltiasking view but wayland surface is null.");
+            return;
+        }
+
+        Meta.Window? window;
+        panel_surface.wayland_surface.get ("window", out window, null);
+        if (window == null) {
+            warning ("Window tried to set hide mode but wayland surface had no associated window.");
+            return;
+        }
+
+        ShellClientsManager.get_instance ().request_visible_in_multitasking_view (window);
+    }
+
     internal static void set_keep_above (Wl.Client client, Wl.Resource resource) {
         unowned ExtendedBehaviorSurface? eb_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
         if (eb_surface.wayland_surface == null) {

src/ShellClients/ShellClientsManager.vala

@@ -185,6 +185,15 @@ public class Gala.ShellClientsManager : Object, GestureTarget {
         panel_windows[window].hide_mode = hide_mode;
     }
 
+    public void request_visible_in_multitasking_view (Meta.Window window) {
+        if (!(window in panel_windows)) {
+            warning ("Set anchor for window before visible in mutltiasking view.");
+            return;
+        }
+
+        panel_windows[window].visible_in_multitasking_view = true;
+    }
+
     public void make_centered (Meta.Window window) requires (!is_itself_positioned (window)) {
         positioned_windows[window] = new ShellWindow (window, CENTER);
 

src/ShellClients/ShellWindow.vala

@@ -8,6 +8,8 @@
 public class Gala.ShellWindow : PositionedWindow, GestureTarget {
     public Clutter.Actor? actor { get { return window_actor; } }
 
+    public bool visible_in_multitasking_view { get; set; default = false; }
+
     private Meta.WindowActor window_actor;
     private double custom_progress = 0;
     private double multitasking_view_progress = 0;
@@ -38,9 +40,16 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
         );
     }
 
+    private double get_hidden_progress () {
+        if (visible_in_multitasking_view) {
+            return double.min (custom_progress, 1 - multitasking_view_progress);
+        } else {
+            return double.max (custom_progress, multitasking_view_progress);
+        }
+    }
+
     private void update_property () {
-        var hidden_progress = double.max (custom_progress, multitasking_view_progress);
-        property_target.propagate (UPDATE, DOCK, hidden_progress);
+        property_target.propagate (UPDATE, DOCK, get_hidden_progress ());
     }
 
     public override void propagate (UpdateType update_type, GestureAction action, double progress) {
@@ -82,7 +91,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
     }
 
     private void update_visibility () {
-        var visible = double.max (multitasking_view_progress, custom_progress) < 0.1;
+        var visible = get_hidden_progress () < 0.1;
         var animating = animations_ongoing > 0;
 
         if (!Meta.Util.is_wayland_compositor ()) {

src/Widgets/IconGroupContainer.vala

@@ -36,7 +36,6 @@ namespace Gala {
 
         private List<MonitorClone> window_containers_monitors;
 
-        private IconGroupContainer icon_groups;
         private ActorTarget workspaces;
         private Clutter.Actor primary_monitor_container;
         private Clutter.BrightnessContrastEffect brightness_effect;
@@ -73,8 +72,6 @@ namespace Gala {
             workspaces_gesture_controller.enable_touchpad ();
             workspaces_gesture_controller.enable_scroll (this, HORIZONTAL);
 
-            icon_groups = new IconGroupContainer (display.get_monitor_scale (display.get_primary_monitor ()));
-
             brightness_effect = new Clutter.BrightnessContrastEffect ();
             update_brightness_effect ();
 
@@ -88,7 +85,6 @@ namespace Gala {
             // multitasking view UI. The Clutter.Actor of this class has to be allowed to grow to the size of the
             // stage as it contains MonitorClones for each monitor.
             primary_monitor_container = new ActorTarget ();
-            primary_monitor_container.add_child (icon_groups);
             primary_monitor_container.add_child (workspaces);
             add_child (primary_monitor_container);
 
@@ -152,7 +148,6 @@ namespace Gala {
 
             var primary_geometry = display.get_monitor_geometry (primary);
             var scale = display.get_monitor_scale (primary);
-            icon_groups.scale_factor = scale;
 
             primary_monitor_container.set_position (primary_geometry.x, primary_geometry.y);
             primary_monitor_container.set_size (primary_geometry.width, primary_geometry.height);
@@ -167,7 +162,6 @@ namespace Gala {
         private void update_workspaces () {
             foreach (unowned var child in workspaces.get_children ()) {
                 unowned var workspace_clone = (WorkspaceClone) child;
-                icon_groups.remove_group (workspace_clone.icon_group);
                 workspace_clone.destroy ();
             }
 
@@ -257,12 +251,8 @@ namespace Gala {
             }
 
             if (!opened) {
-                modal_proxy = wm.push_modal (this);
-                modal_proxy.set_keybinding_filter (keybinding_filter);
-
-                var scale = display.get_monitor_scale (display.get_primary_monitor ());
-                icon_groups.force_reposition ();
-                icon_groups.y = primary_monitor_container.height - InternalUtils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET - 20, scale);
+                //  modal_proxy = wm.push_modal (this);
+                //  modal_proxy.set_keybinding_filter (keybinding_filter);
             } else {
                 DragDropAction.cancel_all_by_id ("multitaskingview-window");
             }
@@ -308,7 +298,7 @@ namespace Gala {
                 wm.top_window_group.show ();
                 hide ();
 
-                wm.pop_modal (modal_proxy);
+                //  wm.pop_modal (modal_proxy);
             }
         }
 
@@ -328,32 +318,6 @@ namespace Gala {
             } else {
                 workspaces_gesture_controller.progress = -manager.get_active_workspace_index ();
             }
-
-            reposition_icon_groups (animate);
-        }
-
-        private void reposition_icon_groups (bool animate) {
-            unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
-            var active_index = manager.get_active_workspace ().index ();
-
-            if (animate) {
-                icon_groups.save_easing_state ();
-                icon_groups.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
-                icon_groups.set_easing_duration (200);
-            }
-
-            var scale = display.get_monitor_scale (display.get_primary_monitor ());
-            // make sure the active workspace's icongroup is always visible
-            var icon_groups_width = icon_groups.calculate_total_width ();
-            if (icon_groups_width > primary_monitor_container.width) {
-                icon_groups.x = (-active_index * InternalUtils.scale_to_int (IconGroupContainer.SPACING + IconGroup.SIZE, scale) + primary_monitor_container.width / 2)
-                    .clamp (primary_monitor_container.width - icon_groups_width - InternalUtils.scale_to_int (64, scale), InternalUtils.scale_to_int (64, scale));
-            } else
-                icon_groups.x = primary_monitor_container.width / 2 - icon_groups_width / 2;
-
-            if (animate) {
-                icon_groups.restore_easing_state ();
-            }
         }
 
         private void add_workspace (int num) {
@@ -362,7 +326,6 @@ namespace Gala {
 
             var workspace = new WorkspaceClone (manager.get_workspace_by_index (num), scale);
             workspaces.insert_child_at_index (workspace, num);
-            icon_groups.add_group (workspace.icon_group);
 
             workspace.window_selected.connect (window_selected);
             workspace.selected.connect (activate_workspace);
@@ -395,10 +358,6 @@ namespace Gala {
             workspace.window_selected.disconnect (window_selected);
             workspace.selected.disconnect (activate_workspace);
 
-            if (icon_groups.contains (workspace.icon_group)) {
-                icon_groups.remove_group (workspace.icon_group);
-            }
-
             workspace.destroy ();
 
             update_positions (opened);