Use ListModels for apps and workspaces

Author: leolost2605

src/AppSystem/App.vala

@@ -103,7 +103,6 @@ public class Dock.App : Object {
 
         notify["pinned"].connect (() => {
             check_remove ();
-            ItemManager.get_default ().sync_pinned ();
         });
 
         WindowSystem.get_default ().notify["active-workspace"].connect (() => {

src/AppSystem/AppSystem.vala

@@ -15,13 +15,17 @@ public class Dock.AppSystem : Object, UnityClient {
         return instance.once (() => { return new AppSystem (); });
     }
 
-    public signal void app_added (App app);
+    private ListStore apps_store;
+    public ListModel apps { get { return apps_store; } }
 
     private GLib.HashTable<unowned string, App> id_to_app;
 
     private AppSystem () { }
 
     construct {
+        apps_store = new ListStore (typeof (App));
+        apps_store.items_changed.connect (save_pinned);
+
         id_to_app = new HashTable<unowned string, App> (str_hash, str_equal);
     }
 
@@ -41,12 +45,46 @@ public class Dock.AppSystem : Object, UnityClient {
 
     private App add_app (DesktopAppInfo app_info, bool pinned) {
         var app = new App (app_info, pinned);
+        app.removed.connect (remove_app);
+        app.notify["pinned"].connect (save_pinned);
         id_to_app[app_info.get_id ()] = app;
-        app.removed.connect ((_app) => id_to_app.remove (_app.app_info.get_id ()));
-        app_added (app);
+        apps_store.append (app);
         return app;
     }
 
+    private void remove_app (App app) {
+        id_to_app.remove (app.app_info.get_id ());
+
+        uint pos;
+        if (apps_store.find (app, out pos)) {
+            apps_store.remove (pos);
+        }
+    }
+
+    public void reorder_app (App app, uint new_index) {
+        uint pos;
+        if (!apps_store.find (app, out pos)) {
+            warning ("Tried to reorder an app that is not in the store");
+            return;
+        }
+
+        apps_store.remove (pos);
+        apps_store.insert (new_index, app);
+    }
+
+    private void save_pinned () {
+        string[] new_pinned_ids = {};
+
+        for (uint i = 0; i < apps_store.get_n_items (); i++) {
+            var app = (App) apps_store.get_item (i);
+            if (app.pinned) {
+                new_pinned_ids += app.app_info.get_id ();
+            }
+        }
+
+        settings.set_strv ("launchers", new_pinned_ids);
+    }
+
     public async void sync_windows () {
         var windows = WindowSystem.get_default ().windows;
 
@@ -79,20 +117,20 @@ public class Dock.AppSystem : Object, UnityClient {
         }
     }
 
-    public void add_app_for_id (string app_id) {
+    public App? add_app_for_id (string app_id) {
         if (app_id in id_to_app) {
             id_to_app[app_id].pinned = true;
-            return;
+            return id_to_app[app_id];
         }
 
         var app_info = new DesktopAppInfo (app_id);
 
         if (app_info == null) {
             warning ("App not found: %s", app_id);
-            return;
+            return null;
         }
 
-        add_app (app_info, true);
+        return add_app (app_info, true);
     }
 
     public void remove_app_by_id (string app_id) {

src/AppSystem/Background/BackgroundItem.vala

@@ -6,10 +6,10 @@
  */
 
 public class Dock.BackgroundItem : BaseIconGroup {
-    public signal void apps_appeared ();
+    private ListStore group_store;
+    public ListModel group_model { get { return group_store; } }
 
     public BackgroundMonitor monitor { private get; construct; }
-    public bool has_apps { get { return monitor.background_apps.get_n_items () > 0; } }
 
     private Gtk.Popover popover;
 
@@ -25,6 +25,8 @@ public class Dock.BackgroundItem : BaseIconGroup {
     }
 
     construct {
+        group_store = new ListStore (typeof (BackgroundItem));
+
         var list_box = new Gtk.ListBox () {
             selection_mode = BROWSE
         };
@@ -53,9 +55,9 @@ public class Dock.BackgroundItem : BaseIconGroup {
         monitor.background_apps.items_changed.connect ((pos, n_removed, n_added) => {
             if (monitor.background_apps.get_n_items () == 0) {
                 popover.popdown ();
-                removed ();
+                group_store.remove (0);
             } else if (n_removed == 0 && n_added != 0 && n_added == monitor.background_apps.get_n_items ()) {
-                apps_appeared ();
+                group_store.append (this);
             }
         });
 

src/AppSystem/Launcher.vala

@@ -148,7 +148,6 @@ public class Dock.Launcher : BaseItem {
         });
 
         app.launched.connect (animate_launch);
-        app.removed.connect (() => removed ());
 
         var bounce_animation_target = new Adw.CallbackAnimationTarget ((val) => {
             var height = overlay.get_height ();

src/BaseItem.vala

@@ -22,7 +22,6 @@ public class Dock.BaseItem : Gtk.Box {
         dock_settings = new GLib.Settings ("io.elementary.dock");
     }
 
-    public signal void removed ();
     public signal void revealed_done ();
 
     /**
@@ -307,7 +306,7 @@ public class Dock.BaseItem : Gtk.Box {
 
     private bool is_allowed_drop (Value val) {
         var obj = val.get_object ();
-        return obj != null && obj is BaseItem && ((BaseItem) obj).group == group;
+        return obj != null && obj is BaseItem && ((BaseItem) obj).group == group && obj != this;
     }
 
     private class PopoverTooltip : Gtk.Popover {

src/ItemGroup.vala

@@ -6,9 +6,15 @@
  */
 
  public class Dock.ItemGroup : Gtk.Fixed {
+    private const string OBJECT_DATA_KEY = "item-group-obj";
+
+    [CCode (has_target = false)]
+    public delegate BaseItem CreateBaseItemFunc (Object obj);
+
     private static Settings settings;
 
     public ListModel items { get; construct; }
+    public CreateBaseItemFunc create_item_func { get; construct; }
 
     private Sequence<BaseItem> item_store;
     private ListStore current_children;
@@ -17,8 +23,11 @@
 
     private bool relayout_queued = false;
 
-    public ItemGroup (ListModel items) {
-        Object (items: items);
+    private HashTable<Object, BaseItem> cached_items;
+    private uint clear_cache_id = 0;
+
+    public ItemGroup (ListModel items, CreateBaseItemFunc create_item_func) {
+        Object (items: items, create_item_func: create_item_func);
     }
 
     static construct {
@@ -42,6 +51,8 @@
         on_items_changed (0, 0, items.get_n_items ());
 
         overflow = VISIBLE;
+
+        cached_items = new HashTable<Object, BaseItem> (null, null);
     }
 
     private void queue_relayout () {
@@ -87,18 +98,44 @@
     private void on_items_changed (uint position, uint removed, uint added) {
         var start_iter = item_store.get_iter_at_pos ((int) position);
         var end_iter = start_iter.move ((int) removed);
+        start_iter.foreach_range (end_iter, cache_item);
         start_iter.foreach_range (end_iter, remove_item);
         start_iter.remove_range (end_iter);
 
         var insert_iter = item_store.get_iter_at_pos ((int) position);
         for (int i = (int) position; i < position + added; i++) {
-            var item = (BaseItem) items.get_item (i);
+            var item = get_or_create_item (items.get_item (i));
             insert_iter.insert_before (item);
 
             add_item (i, item);
         }
     }
 
+    // Make sure that if an item is removed and added again in the same
+    // mainloop iteration it gets mapped to the same BaseItem
+    private void cache_item (BaseItem item) {
+        cached_items[item.get_data<Object> (OBJECT_DATA_KEY)] = item;
+
+        if (clear_cache_id == 0) {
+            clear_cache_id = Idle.add_once (clear_cache);
+        }
+    }
+
+    private void clear_cache () {
+        cached_items.remove_all ();
+        clear_cache_id = 0;
+    }
+
+    private BaseItem get_or_create_item (Object obj) {
+        if (obj in cached_items) {
+            return cached_items[obj];
+        }
+
+        var base_item = create_item_func (obj);
+        base_item.set_data<Object> (OBJECT_DATA_KEY, obj);
+        return base_item;
+    }
+
     private void add_item (int pos, BaseItem item) {
         if (item.parent == this) {
             // The item was already in this group and is currently being removed
@@ -119,6 +156,8 @@
     private void remove_item (BaseItem item) {
         item.revealed_done.connect (finish_remove);
         item.set_revealed (false);
+
+        cached_items[item.get_data<Object> ("dock-obj")] = item;
     }
 
     private void finish_remove (BaseItem item) {