Use GtkSelection

Author: danirabbit

src/Views/Wallpaper.vala

@@ -23,12 +23,12 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
     private static GLib.Settings gnome_background_settings;
 
     private Gtk.ScrolledWindow wallpaper_scrolled_window;
-    private Gtk.FlowBox wallpaper_view;
     private Gtk.Overlay view_overlay;
     private Gtk.ComboBoxText combo;
     private Gtk.ColorButton color_button;
 
     private GLib.ListStore wallpaper_model;
+    private Gtk.SingleSelection wallpaper_selection;
     private WallpaperContainer active_wallpaper = null;
     private SolidColorContainer solid_color = null;
     private WallpaperContainer wallpaper_for_removal = null;
@@ -56,14 +56,16 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
 
         wallpaper_model = new GLib.ListStore (typeof (WallpaperContainer));
 
-        wallpaper_view = new Gtk.FlowBox () {
+        wallpaper_selection = new Gtk.SingleSelection (wallpaper_model);
+
+        var wallpaper_view = new Gtk.FlowBox () {
             activate_on_single_click = true,
             homogeneous = true,
             selection_mode = SINGLE,
             min_children_per_line = 3,
             max_children_per_line = 5
         };
-        wallpaper_view.bind_model (wallpaper_model, create_widget_func);
+        wallpaper_view.bind_model (wallpaper_selection, create_widget_func);
         wallpaper_view.add_css_class (Granite.STYLE_CLASS_VIEW);
         wallpaper_view.child_activated.connect (update_checked_wallpaper);
         wallpaper_view.add_controller (drop_target);
@@ -195,7 +197,7 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
     }
 
     private void update_checked_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
-        var children = (WallpaperContainer) wallpaper_view.get_selected_children ().data;
+        var children = (WallpaperContainer) wallpaper_selection.get_selected_item ();
 
         if (!(children is SolidColorContainer)) {
             current_wallpaper_path = children.uri;
@@ -228,9 +230,8 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
             set_combo_disabled_if_necessary ();
             create_solid_color_container (color_button.rgba.to_string ());
 
-            wallpaper_model.insert_sorted (solid_color, wallpapers_sort_function);
-
-            wallpaper_view.select_child (solid_color);
+            var pos = wallpaper_model.insert_sorted (solid_color, wallpapers_sort_function);
+            wallpaper_selection.set_selected (pos);
 
             if (active_wallpaper != null) {
                 active_wallpaper.checked = false;
@@ -251,17 +252,17 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
             if (active_wallpaper == solid_color) {
                 active_wallpaper.checked = false;
 
-                var child = wallpaper_view.get_first_child ();
-                while (child != null) {
+                var child = wallpaper_selection.get_item (0);
+                for (var pos = 0; child != null; pos++) {
                     var container = (WallpaperContainer) child;
                     if (container.uri == current_wallpaper_path) {
                         container.checked = true;
-                        wallpaper_view.select_child (container);
+                        wallpaper_selection.set_selected (pos);
                         active_wallpaper = container;
                         break;
                     }
 
-                    child = child.get_next_sibling ();
+                    child = wallpaper_selection.get_item (pos);
                 }
             }
         } else {
@@ -337,9 +338,12 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
                 finished = true;
 
                 if (gnome_background_settings.get_string ("picture-options") == "none") {
-                    wallpaper_view.select_child (solid_color);
-                    solid_color.checked = true;
-                    active_wallpaper = solid_color;
+                    uint pos = -1;
+                    if (wallpaper_model.find (solid_color, out pos)) {
+                        wallpaper_selection.set_selected (pos);
+                        solid_color.checked = true;
+                        active_wallpaper = solid_color;
+                    }
                 }
 
                 if (active_wallpaper != null) {
@@ -356,14 +360,9 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
     }
 
     private void create_solid_color_container (string color) {
-        if (solid_color != null) {
-            wallpaper_view.unselect_child (solid_color);
-
-            uint pos = -1;
-            if (wallpaper_model.find (solid_color, out pos)) {
-                wallpaper_model.remove (pos);
-            }
-
+        uint pos = -1;
+        if (solid_color != null && wallpaper_model.find (solid_color, out pos)) {
+            wallpaper_model.remove (pos);
             solid_color.destroy ();
         }
 
@@ -402,7 +401,7 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
             var thumb_path = info.get_attribute_as_string (FileAttribute.THUMBNAIL_PATH);
             var thumb_valid = info.get_attribute_boolean (FileAttribute.THUMBNAIL_IS_VALID);
             var wallpaper = new WallpaperContainer (uri, thumb_path, thumb_valid);
-            wallpaper_model.insert_sorted (wallpaper, wallpapers_sort_function);
+            var pos = wallpaper_model.insert_sorted (wallpaper, wallpapers_sort_function);
 
             wallpaper.trash.connect (() => {
                 send_undo_toast ();
@@ -411,16 +410,14 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
 
             // Select the wallpaper if it is the current wallpaper
             if (current_wallpaper_path.has_suffix (uri) && gnome_background_settings.get_string ("picture-options") != "none") {
-                this.wallpaper_view.select_child (wallpaper);
+                wallpaper_selection.set_selected (pos);
                 // Set the widget activated without activating it
                 wallpaper.checked = true;
                 active_wallpaper = wallpaper;
             }
         } catch (Error e) {
             critical ("Unable to add wallpaper: %s", e.message);
         }
-
-        wallpaper_view.invalidate_sort ();
     }
 
     public void cancel_thumbnail_generation () {