Merge lp:~tintou/slingshot/fixed-regression into lp:~elementary-pantheon/slingshot/trunk

[Corentin Noël]

Fixed regression triggered by rev 466, now the category view has always an item selected

Fixed regression triggered by rev 466, now the category view has always an item selected

[Tom Beckmann (tombeckmann)]

Code looks good.

review: Approve (code & codestyle)

[Danielle Foré (danrabbit)]

After testing for a day, I'm unable to reproduce the bug :)

review: Approve (testing)

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2014-10-17 01:18:02 +0000
+++ src/Widgets/CategoryView.vala	2014-10-27 19:10:56 +0000
@@ -53,11 +53,12 @@
         container.add (app_view);
         add (container);
 
+        connect_events ();
         setup_sidebar ();
-        connect_events ();
     }
 
     public void setup_sidebar () {
+        var old_selected = category_switcher.selected;
         category_ids.clear ();
         category_switcher.clear ();
         app_view.set_size_request (-1, -1);
@@ -83,6 +84,8 @@
 
         int columns = view.columns - removing_columns;
         app_view.resize (view.rows, columns);
+
+        category_switcher.selected = old_selected;
     }
 
     private void connect_events () {
@@ -91,8 +94,6 @@
             string category = category_ids.get (nth);
             show_filtered_apps (category);
         });
-
-        category_switcher.selected = 0; //Must be after everything else
     }
 
     private void add_app (Backend.App app) {

=== modified file 'src/Widgets/Sidebar.vala'
--- src/Widgets/Sidebar.vala	2014-10-15 21:44:44 +0000
+++ src/Widgets/Sidebar.vala	2014-10-27 19:10:56 +0000
@@ -28,7 +28,7 @@
         }
     }
 
-    private int _selected;
+    private int _selected = 0;
     public int selected {
         get {
             return _selected;