Merge pull request #773 from mjakeman/fix-focus-loss

installed-page: Save extension's toggle focus on state changes

Author: oscfdezdz

src/exm-extension-row.c

@@ -323,6 +323,12 @@ on_state_changed (GtkSwitch        *toggle,
     return TRUE;
 }
 
+void
+exm_search_row_focus_toggle (ExmExtensionRow *self)
+{
+    gtk_widget_grab_focus (GTK_WIDGET (self->ext_toggle));
+}
+
 static void
 exm_extension_row_class_init (ExmExtensionRowClass *klass)
 {

src/exm-extension-row.h

@@ -11,8 +11,9 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (ExmExtensionRow, exm_extension_row, EXM, EXTENSION_ROW, AdwExpanderRow)
 
-ExmExtensionRow *
-exm_extension_row_new (ExmExtension *extension,
-                       ExmManager   *manager);
+ExmExtensionRow *exm_extension_row_new       (ExmExtension *extension,
+                                              ExmManager   *manager);
+
+void             exm_search_row_focus_toggle (ExmExtensionRow *self);
 
 G_END_DECLS

src/exm-installed-page.blp

@@ -38,7 +38,7 @@ template $ExmInstalledPage: Gtk.Widget {
             Gtk.ListBox user_list_box {
               styles [
                 "boxed-list",
-                "boxed-list-placeholder"
+                "boxed-list-placeholder",
               ]
 
               selection-mode: none;
@@ -73,7 +73,7 @@ template $ExmInstalledPage: Gtk.Widget {
             Gtk.ListBox system_list_box {
               styles [
                 "boxed-list",
-                "boxed-list-placeholder"
+                "boxed-list-placeholder",
               ]
 
               selection-mode: none;
@@ -104,7 +104,7 @@ template $ExmInstalledPage: Gtk.Widget {
         Adw.PreferencesGroup {
           Gtk.ListBox search_list_box {
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
             selection-mode: none;
@@ -128,7 +128,7 @@ template $ExmInstalledPage: Gtk.Widget {
 
         child: Gtk.Button {
           styles [
-            "pill"
+            "pill",
           ]
 
           label: _("_Search Online");

src/exm-installed-page.c

@@ -46,6 +46,7 @@ struct _ExmInstalledPage
     GtkFilterListModel *search_list_model;
 
     gboolean sort_enabled_first;
+    guint signal_id;
 };
 
 G_DEFINE_FINAL_TYPE (ExmInstalledPage, exm_installed_page, GTK_TYPE_WIDGET)
@@ -305,6 +306,72 @@ on_updates_available (ExmManager       *manager G_GNUC_UNUSED,
     g_timeout_add (500, G_SOURCE_FUNC (show_updates_banner), self);
 }
 
+static gboolean
+focus_matching_extension (GtkListBox   *list_box,
+                          ExmExtension *extension)
+{
+    int index = 0;
+    ExmExtensionRow *row;
+
+    while ((row = EXM_EXTENSION_ROW (gtk_list_box_get_row_at_index (list_box, index))))
+    {
+        ExmExtension *row_extension;
+
+        g_object_get (row, "extension", &row_extension, NULL);
+
+        if (is_extension_equal (extension, row_extension))
+        {
+            exm_search_row_focus_toggle (row);
+            g_object_unref (row_extension);
+
+            return TRUE;
+        }
+
+        g_object_unref (row_extension);
+        index++;
+    }
+
+    return FALSE;
+}
+
+static void
+on_extensions_changed (GListModel       *model,
+                       guint             position,
+                       guint             removed,
+                       guint             added,
+                       ExmInstalledPage *self)
+{
+    if (!self->sort_enabled_first || (removed > 0 && added > 0))
+        return;
+
+    ExmExtension *extension = EXM_EXTENSION (g_list_model_get_object (model, position));
+
+    if (!extension)
+        return;
+
+    GtkRoot *toplevel = gtk_widget_get_root (GTK_WIDGET (self));
+    GtkWidget *focused_widget = gtk_window_get_focus (GTK_WINDOW (toplevel));
+
+    if (g_list_store_find_with_equal_func (G_LIST_STORE (model), extension, (GEqualFunc)is_extension_equal, &position))
+        g_list_model_items_changed (model, position, 1, 1);
+
+    if (focused_widget && gtk_widget_has_focus (focused_widget)
+        && gtk_widget_get_child_visible (GTK_WIDGET (self)))
+    {
+        if (g_strcmp0 (gtk_stack_get_visible_child_name (self->stack), "page_results") == 0)
+        {
+            focus_matching_extension (self->search_list_box, extension);
+        }
+        else
+        {
+            if (!focus_matching_extension (self->user_list_box, extension))
+                focus_matching_extension (self->system_list_box, extension);
+        }
+    }
+
+    g_object_unref (extension);
+}
+
 static void
 invalidate_model_bindings (ExmInstalledPage *self)
 {
@@ -318,7 +385,17 @@ invalidate_model_bindings (ExmInstalledPage *self)
                   NULL);
 
     if (ext_model)
+    {
         bind_list_box (ext_model, self);
+
+        if (self->signal_id > 0)
+            g_signal_handler_disconnect (ext_model, self->signal_id);
+
+        self->signal_id = g_signal_connect (ext_model,
+                                            "items-changed",
+                                            G_CALLBACK (on_extensions_changed),
+                                            self);
+    }
 }
 
 static void

src/local/exm-extension.c

@@ -199,6 +199,25 @@ exm_extension_set_property (GObject      *object,
     }
 }
 
+gint
+compare_extension (ExmExtension *a,
+                   ExmExtension *b,
+                   gpointer      user_data G_GNUC_UNUSED)
+{
+    const gchar *uuid_a, *uuid_b;
+    g_object_get (a, "uuid", &uuid_a, NULL);
+    g_object_get (b, "uuid", &uuid_b, NULL);
+
+    return g_strcmp0 (uuid_a, uuid_b);
+}
+
+gboolean
+is_extension_equal (ExmExtension *a,
+                    ExmExtension *b)
+{
+    return compare_extension (a, b, NULL) == 0;
+}
+
 static void
 exm_extension_class_init (ExmExtensionClass *klass)
 {

src/local/exm-extension.h

@@ -8,6 +8,13 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (ExmExtension, exm_extension, EXM, EXTENSION, GObject)
 
-ExmExtension *exm_extension_new (const gchar *uuid);
+ExmExtension *exm_extension_new  (const gchar *uuid);
+
+gint          compare_extension  (ExmExtension *a,
+                                  ExmExtension *b,
+                                  gpointer      user_data);
+
+gboolean      is_extension_equal (ExmExtension *a,
+                                  ExmExtension *b);
 
 G_END_DECLS

src/local/exm-manager.c

@@ -746,17 +746,6 @@ update_extension_list (ExmManager *self)
     queue_notify_extension_updates (self);
 }
 
-static gboolean
-is_extension_equal (ExmExtension *a,
-                    ExmExtension *b)
-{
-    const gchar *uuid_a, *uuid_b;
-    g_object_get (a, "uuid", &uuid_a, NULL);
-    g_object_get (b, "uuid", &uuid_b, NULL);
-
-    return g_strcmp0 (uuid_a, uuid_b) == 0;
-}
-
 static void
 on_state_changed (ShellExtensions *object G_GNUC_UNUSED,
                   const gchar     *arg_uuid,
@@ -787,25 +776,23 @@ on_state_changed (ShellExtensions *object G_GNUC_UNUSED,
 
     if (is_new)
     {
-        g_list_store_append (list_store, extension);
+        g_list_store_insert_sorted (list_store, extension, (GCompareDataFunc)compare_extension, NULL);
         return;
     }
 
+    guint position;
+
     if (is_uninstall_operation)
     {
-        guint position;
         if (g_list_store_find_with_equal_func (list_store, extension, (GEqualFunc)is_extension_equal, &position))
             g_list_store_remove (list_store, position);
 
         return;
     }
 
     // Emit items-changed signal to re-sort extension list
-    {
-        guint position;
-        if (g_list_store_find_with_equal_func (list_store, extension, (GEqualFunc)is_extension_equal, &position))
-            g_list_model_items_changed (G_LIST_MODEL (list_store), position, 1, 1);
-    }
+    if (g_list_store_find_with_equal_func (list_store, extension, (GEqualFunc)is_extension_equal, &position))
+        g_list_model_items_changed (G_LIST_MODEL (list_store), position, 0, 0);
 
     // If the extension that has changed has an update, then
     // one or more extensions have updates available. Lazily