Workspace switcher

data/Application.css

@@ -60,6 +60,22 @@ launcher progressbar progress {
     min-width: 0;
 }
 
+icongroup {
+    padding: 6px;
+    padding-bottom: 0px;
+}
+
+icongroup grid {
+    background-color: #23232380;
+    border-radius: 6px;
+    border: 1px solid #232323c8;
+}
+
+icongroup.dynamic grid {
+    background-color: #17171780;
+    border: 1px solid #171717c8;
+}
+
 .running-indicator {
     color: @selected_fg_color;
     -gtk-icon-size: 9px;

src/App.vala → src/AppSystem/App.vala

@@ -32,23 +32,13 @@ public class Dock.App : Object {
     public double progress { get; set; default = 0; }
     public bool prefers_nondefault_gpu { get; private set; default = false; }
     public bool running { get { return windows.size > 0; } }
-    public bool running_on_active_workspace {
-        get {
-            foreach (var win in windows) {
-                if (win.on_active_workspace) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
+    public bool running_on_active_workspace { get; private set; }
     public bool launching { get; private set; default = false; }
 
     public SimpleActionGroup action_group { get; construct; }
     public Menu menu_model { get; construct; }
 
-    public Gee.List<AppWindow> windows { get; private owned set; } //Ordered by stacking order with topmost at 0
+    public Gee.List<Window> windows { get; private owned set; } //Ordered by stacking order with topmost at 0
 
     private static Dock.SwitcherooControl switcheroo_control;
 
@@ -63,7 +53,7 @@ public class Dock.App : Object {
     }
 
     construct {
-        windows = new Gee.LinkedList<AppWindow> ();
+        windows = new Gee.LinkedList<Window> ();
 
         action_group = new SimpleActionGroup ();
 
@@ -119,7 +109,7 @@ public class Dock.App : Object {
         notify["pinned"].connect (() => {
             pinned_action.set_state (pinned);
             check_remove ();
-            LauncherManager.get_default ().sync_pinned ();
+            ItemManager.get_default ().sync_pinned ();
         });
     }
 
@@ -138,9 +128,9 @@ public class Dock.App : Object {
             } else if (windows.size == 0) {
                 app_info.launch (null, context);
             } else if (windows.size == 1) {
-                AppSystem.get_default ().desktop_integration.focus_window.begin (windows.first ().uid);
-            } else if (AppSystem.get_default ().desktop_integration != null) {
-                AppSystem.get_default ().desktop_integration.show_windows_for.begin (app_info.get_id ());
+                WindowSystem.get_default ().desktop_integration.focus_window.begin (windows.first ().uid);
+            } else if (WindowSystem.get_default ().desktop_integration != null) {
+                WindowSystem.get_default ().desktop_integration.show_windows_for.begin (app_info.get_id ());
             }
         } catch (Error e) {
             critical (e.message);
@@ -184,15 +174,15 @@ public class Dock.App : Object {
         }
     }
 
-    public void update_windows (Gee.List<AppWindow>? new_windows) {
+    public void update_windows (Gee.List<Window>? new_windows) {
         if (new_windows == null) {
-            windows = new Gee.LinkedList<AppWindow> ();
+            windows = new Gee.LinkedList<Window> ();
         } else {
             windows = new_windows;
         }
 
-        notify_property ("running-on-active-workspace");
         notify_property ("running");
+        update_active_workspace ();
 
         if (launching && running) {
             launching = false;
@@ -201,16 +191,15 @@ public class Dock.App : Object {
         check_remove ();
     }
 
-    public AppWindow? find_window (uint64 window_uid) {
-        var found_win = windows.first_match ((win) => {
-            return win.uid == window_uid;
-        });
-
-        if (found_win != null) {
-            return found_win;
-        } else {
-            return null;
+    public void update_active_workspace () {
+        var new_running_on_active_workspace = false;
+        foreach (var window in windows) {
+            if (window.workspace_index == WindowSystem.get_default ().active_workspace) {
+                new_running_on_active_workspace = true;
+                break;
+            }
         }
+        running_on_active_workspace = new_running_on_active_workspace;
     }
 
     public void perform_unity_update (VariantIter prop_iter) {
@@ -241,7 +230,7 @@ public class Dock.App : Object {
         progress = 0;
     }
 
-    private AppWindow[] current_windows;
+    private Window[] current_windows;
     private uint current_index;
     private uint timer_id = 0;
     private bool should_wait = false;
@@ -264,7 +253,7 @@ public class Dock.App : Object {
             return;
         }
 
-        AppSystem.get_default ().desktop_integration.focus_window.begin (current_windows[current_index].uid);
+        WindowSystem.get_default ().desktop_integration.focus_window.begin (current_windows[current_index].uid);
 
         // Throttle the scroll for performance and better visibility of the windows
         Timeout.add (250, () => {
@@ -282,7 +271,7 @@ public class Dock.App : Object {
             yield AppSystem.get_default ().sync_windows (); // Get the current stacking order
             current_index = windows.size > 1 && windows.first ().has_focus ? 1 : 0;
             current_windows = {};
-            foreach (AppWindow window in windows) {
+            foreach (var window in windows) {
                 current_windows += window;
             }
         }

src/AppSystem.vala → src/AppSystem/AppSystem.vala

@@ -17,8 +17,6 @@ public class Dock.AppSystem : Object, UnityClient {
 
     public signal void app_added (App app);
 
-    public DesktopIntegration? desktop_integration { get; private set; }
-
     private GLib.HashTable<unowned string, App> id_to_app;
 
     private AppSystem () { }
@@ -37,19 +35,10 @@ public class Dock.AppSystem : Object, UnityClient {
             add_app (app_info, true);
         }
 
-        try {
-            desktop_integration = yield GLib.Bus.get_proxy<Dock.DesktopIntegration> (
-                SESSION,
-                "org.pantheon.gala",
-                "/org/pantheon/gala/DesktopInterface"
-            );
-
-            yield sync_windows ();
+        yield sync_windows ();
 
-            desktop_integration.windows_changed.connect (sync_windows);
-        } catch (Error e) {
-            critical ("Failed to get desktop integration: %s", e.message);
-        }
+        WindowSystem.get_default ().notify["windows"].connect (sync_windows);
+        WindowSystem.get_default ().notify["active-workspace"].connect (sync_active_workspace);
     }
 
     private App add_app (DesktopAppInfo app_info, bool pinned) {
@@ -60,52 +49,44 @@ public class Dock.AppSystem : Object, UnityClient {
         return app;
     }
 
-    public async void sync_windows () requires (desktop_integration != null) {
-        DesktopIntegration.Window[] windows;
-        try {
-            windows = yield desktop_integration.get_windows ();
-        } catch (Error e) {
-            critical (e.message);
-            return;
-        }
+    public async void sync_windows () {
+        var windows = WindowSystem.get_default ().windows;
 
-        var app_window_list = new Gee.HashMap<App, Gee.List<AppWindow>> ();
-        foreach (unowned var window in windows) {
-            unowned var app_id = window.properties["app-id"].get_string ();
-            App? app = id_to_app[app_id];
+        var app_window_list = new Gee.HashMap<App, Gee.List<Window>> ();
+        foreach (var window in windows) {
+            App? app = id_to_app[window.app_id];
             if (app == null) {
-                var app_info = new GLib.DesktopAppInfo (app_id);
+                var app_info = new GLib.DesktopAppInfo (window.app_id);
                 if (app_info == null) {
                     continue;
                 }
 
                 app = add_app (app_info, false);
             }
 
-            AppWindow? app_window = app.find_window (window.uid);
-            if (app_window == null) {
-                app_window = new AppWindow (window.uid);
-            }
-
-            app_window.update_properties (window.properties);
-
             var window_list = app_window_list.get (app);
             if (window_list == null) {
-                var new_window_list = new Gee.LinkedList<AppWindow> ();
-                new_window_list.add (app_window);
+                var new_window_list = new Gee.LinkedList<Window> ();
+                new_window_list.add (window);
                 app_window_list.set (app, new_window_list);
             } else {
-                window_list.add (app_window);
+                window_list.add (window);
             }
         }
 
         foreach (var app in id_to_app.get_values ()) {
-            Gee.List<AppWindow>? window_list = null;
+            Gee.List<Window>? window_list = null;
             app_window_list.unset (app, out window_list);
             app.update_windows (window_list);
         }
     }
 
+    public async void sync_active_workspace () {
+        foreach (var app in id_to_app.get_values ()) {
+            app.update_active_workspace ();
+        }
+    }
+
     public void add_app_for_id (string app_id) {
         if (app_id in id_to_app) {
             id_to_app[app_id].pinned = true;

src/Launcher.vala → src/AppSystem/Launcher.vala

@@ -139,7 +139,7 @@ public class Dock.Launcher : Gtk.Box {
         orientation = VERTICAL;
         tooltip_text = app.app_info.get_display_name ();
 
-        var launcher_manager = LauncherManager.get_default ();
+        var launcher_manager = ItemManager.get_default ();
 
         insert_action_group (ACTION_GROUP_PREFIX, app.action_group);
 
@@ -271,15 +271,15 @@ public class Dock.Launcher : Gtk.Box {
         add_controller (drop_target_file);
 
         drop_target_file.enter.connect ((x, y) => {
-            var _launcher_manager = LauncherManager.get_default ();
+            var _launcher_manager = ItemManager.get_default ();
             if (_launcher_manager.added_launcher != null) {
                 calculate_dnd_move (_launcher_manager.added_launcher, x, y);
             }
             return COPY;
         });
 
         drop_target_file.drop.connect (() => {
-            var _launcher_manager = LauncherManager.get_default ();
+            var _launcher_manager = ItemManager.get_default ();
             if (_launcher_manager.added_launcher != null) {
                 _launcher_manager.added_launcher.moving = false;
                 _launcher_manager.added_launcher = null;
@@ -476,7 +476,7 @@ public class Dock.Launcher : Gtk.Box {
      * @param y pointer y position
      */
     private void calculate_dnd_move (Launcher source, double x, double y) {
-        var launcher_manager = LauncherManager.get_default ();
+        var launcher_manager = ItemManager.get_default ();
 
         int target_index = launcher_manager.get_index_for_launcher (this);
         int source_index = launcher_manager.get_index_for_launcher (source);

src/DBus/ShellKeyGrabber.vala

@@ -109,7 +109,7 @@ public interface ShellKeyGrabber : GLib.Object {
             return;
         }
 
-        Dock.LauncherManager.get_default ().launch (saved_action_ids[action]);
+        Dock.ItemManager.get_default ().launch (saved_action_ids[action]);
     }
 
     private static void ungrab_keybindings () requires (instance != null) {