Merge lp:~tintou/slingshot/gtk+-3.10 into lp:~elementary-pantheon/slingshot/trunk

[Corentin Noël]

Port forward to Gtk 3.10 for improved page switching and other benefits

Now using Gtk 3.10 !

[Cody Garver (codygarver)]

It's like this all the time for me: http://i.imgur.com/NhJH5Mm.png

[Rico Tzschichholz (ricotz)]

Please don't make changes unrelated to using new Gtk wigets.
Meaning no codes-style-changes or refactoring.

If crashes or at least results in a hash-table critical here.

review: Needs Fixing

[lp:~tintou/slingshot/gtk+-3.10]

410. By Corentin Noël on 2014-03-01

Removed code-style changes

[Corentin Noël (tintou)]

HashTable critical errors are also present into trunk

[David Gomes (davidgomes)]

I have the same problem as Cody.

[David Gomes (davidgomes)]

Seems this was merged and I get a transparent Slingshot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-23 19:56:35 +0000
+++ CMakeLists.txt	2014-03-01 15:19:46 +0000
@@ -55,14 +55,14 @@
 endif ()
 
 set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-0.8;libgnome-menu-3.0;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")
-set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")
+set (UI_DEPS "gtk+-3.0>=3.10.0;granite;${ZEITGEIST_DEPS};")
 
 find_package (PkgConfig)
 pkg_check_modules (DEPS REQUIRED "${CORE_DEPS}${UI_DEPS}" gthread-2.0)
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.18.0" MINIMUM)
+ensure_vala_version ("0.22.0" MINIMUM)
 
 include (ValaPrecompile)
 vala_precompile (VALA_C ${APPNAME}
@@ -114,4 +114,4 @@
 add_schema ("org.pantheon.desktop.slingshot.gschema.xml")
 
 # Translations
-add_subdirectory (po)
+add_subdirectory (po)
\ No newline at end of file

=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2013-01-10 16:53:50 +0000
+++ src/Backend/AppSystem.vala	2014-03-01 15:19:46 +0000
@@ -51,8 +51,11 @@
 #if HAVE_ZEITGEIST
         rl_service.refresh_popularity ();
 #endif
-
-        apps_menu.load_sync ();
+        try {
+            apps_menu.load_sync ();
+        } catch (Error e) {
+            warning (e.message);
+        }
 
         update_categories_index ();
         update_apps ();
@@ -224,4 +227,4 @@
 
     }
 
-}
+}
\ No newline at end of file

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-12-26 00:08:04 +0000
+++ src/SlingshotView.vala	2014-03-01 15:19:46 +0000
@@ -27,9 +27,8 @@
     public class SlingshotView : Granite.Widgets.PopOver {
 
         // Widgets
-        public Granite.Widgets.SearchBar searchbar;
-        public Gtk.Layout view_manager;
-        public Widgets.Switcher page_switcher;
+        public Gtk.SearchEntry search_entry;
+        public Gtk.Stack stack;
         public Granite.Widgets.ModeButton view_selector;
 
         // Views
@@ -39,7 +38,6 @@
 
         public Gtk.Grid top;
         public Gtk.Grid center;
-        public Gtk.Grid bottom;
         public Gtk.Grid container;
         public Gtk.Box content_area;
         private Gtk.EventBox event_box;
@@ -156,56 +154,43 @@
             else
                 view_selector.selected = 0;
 
-            searchbar = new Granite.Widgets.SearchBar (_("Search Apps…"));
-            searchbar.pause_delay = 200;
-            searchbar.width_request = 250;
-            searchbar.button_press_event.connect ((e) => {return e.button == 3;});
+            search_entry = new Gtk.SearchEntry ();
+            search_entry.placeholder_text = _("Search Apps…");
+            search_entry.width_request = 250;
+            search_entry.button_press_event.connect ((e) => {return e.button == 3;});
 
             if (Slingshot.settings.show_category_filter) {
                 top.attach (view_selector, 0, 0, 1, 1);
             }
             top.attach (top_separator, 1, 0, 1, 1);
-            top.attach (searchbar, 2, 0, 1, 1);
+            top.attach (search_entry, 2, 0, 1, 1);
 
             center = new Gtk.Grid ();
-            // Create the layout which works like view_manager
-            view_manager = new Gtk.Layout (null, null);
-            view_manager.set_size_request (default_columns * 130, default_rows * 145);
-            center.attach (view_manager, 0, 0, 1, 1);
+            
+            stack = new Gtk.Stack ();
+            stack.set_size_request (default_columns * 130, default_rows * 145);
+            center.attach (stack, 0, 0, 1, 1);
 
             // Create the "NORMAL_VIEW"
+            var scrolled_normal = new Gtk.ScrolledWindow (null, null);
             grid_view = new Widgets.Grid (default_rows, default_columns);
-            view_manager.put (grid_view, 0, 0);
+            scrolled_normal.add_with_viewport (grid_view);
+            stack.add_named (scrolled_normal, "normal");
 
             // Create the "SEARCH_VIEW"
             search_view = new Widgets.SearchView (this);
+
             foreach (Gee.ArrayList<Backend.App> app_list in apps.values) {
                 search_view.add_apps (app_list);
             }
-            view_manager.put (search_view, -columns * 130, 0);
+            stack.add_named (search_view, "search");
 
             // Create the "CATEGORY_VIEW"
             category_view = new Widgets.CategoryView (this);
-            view_manager.put (category_view, -columns * 130, 0);
-
-            // Create the page switcher
-            page_switcher = new Widgets.Switcher ();
-
-            // A bottom widget to keep the page switcher center
-            bottom = new Gtk.Grid ();
-
-
-            var bottom_separator1 = new Gtk.Label (""); // A fake label
-            bottom_separator1.set_hexpand (true);
-            var bottom_separator2 = new Gtk.Label (""); // A fake label
-            bottom_separator2.set_hexpand (true);
-            bottom.attach (bottom_separator1, 0, 0, 1, 1); // A fake label
-            bottom.attach (page_switcher, 1, 0, 1, 1);
-            bottom.attach (bottom_separator2, 2, 0, 1, 1); // A fake label
+            stack.add_named (category_view, "category");
 
             container.attach (Utils.set_padding (top, 12, 12, 12, 12), 0, 0, 1, 1);
             container.attach (Utils.set_padding (center, 0, 12, 12, 12), 0, 1, 1, 1);
-            container.attach (Utils.set_padding (bottom, 0, 24, 12, 24), 0, 2, 1, 1);
 
             event_box = new Gtk.EventBox ();
             event_box.add (container);
@@ -277,17 +262,15 @@
         private void connect_signals () {
 
             this.focus_in_event.connect (() => {
-                searchbar.grab_focus ();
+                search_entry.grab_focus ();
                 return false;
             });
 
-            //view_manager.draw.connect (this.draw_background);
-
             event_box.key_press_event.connect (on_key_press);
-            searchbar.text_changed_pause.connect ((text) => this.search.begin (text));
-            searchbar.grab_focus ();
+            search_entry.search_changed.connect (() => this.search.begin (search_entry.text));
+            search_entry.grab_focus ();
 
-            searchbar.activate.connect (() => {
+            search_entry.activate.connect (() => {
                 if (modality == Modality.SEARCH_VIEW) {
                     search_view.launch_selected ();
                     hide ();
@@ -300,15 +283,8 @@
             search_view.app_launched.connect (() => hide ());
 
             // This function must be after creating the page switcher
-            grid_view.new_page.connect (page_switcher.append);
             populate_grid_view ();
 
-            page_switcher.active_changed.connect (() => {
-
-                move_page (page_switcher.active - page_switcher.old_active);
-                searchbar.grab_focus (); //avoid focus is not on current page
-            });
-
             view_selector.mode_changed.connect (() => {
 
                 set_modality ((Modality) view_selector.selected);
@@ -383,7 +359,7 @@
           when an input method is in use (Gtk3 bug?).  Key press events are
           captured by an Event Box and passed to this function instead.
 
-          Events not dealt with here are propagated to the searchbar by the
+          Events not dealt with here are propagated to the search_entry by the
           usual mechanism.
         */
         public bool on_key_press (Gdk.EventKey event) {
@@ -408,8 +384,8 @@
                     break;
 
                 case "Escape":
-                    if (searchbar.text.length > 0) {
-                        searchbar.text = "";
+                    if (search_entry.text.length > 0) {
+                        search_entry.text = "";
                     } else {
                         hide ();
                     }
@@ -443,25 +419,25 @@
                 case "7":
                 case "8":
                 case "9":
-                    int page = int.parse (key) - 1;
+                    int page = int.parse (key);
 
                     if (event.state != Gdk.ModifierType.MOD1_MASK)
                         return false;
 
                     if (modality == Modality.NORMAL_VIEW) {
-                        if (page < 0 || page == 8)
-                            page_switcher.set_active (grid_view.get_n_pages () - 1);
+                        if (page < 0 || page == 9)
+                            grid_view.go_to_last ();
                         else
-                            page_switcher.set_active (page);
+                            grid_view.go_to_number (page);
                     } else if (modality == Modality.CATEGORY_VIEW) {
-                        if (page < 0 || page == 8)
-                            category_view.switcher.set_active (category_view.switcher.size - 1);
+                        if (page < 0 || page == 9)
+                            category_view.app_view.go_to_last ();
                         else
-                            category_view.switcher.set_active (page);
+                            category_view.app_view.go_to_number (page);
                     } else {
                         return false;
                     }
-                    searchbar.grab_focus ();
+                    search_entry.grab_focus ();
                     break;
 
                 case "Tab":
@@ -480,14 +456,15 @@
 
                 case "Left":
                     if (modality == Modality.NORMAL_VIEW) {
-                        if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Left
-                            page_switcher.set_active (page_switcher.active - 1);
-                        else
+                        if (event.state == Gdk.ModifierType.SHIFT_MASK) {// Shift + Left
+                            grid_view.go_to_previous ();
+                        } else {
                             normal_move_focus (-1, 0);
+                        }
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Left
-                            category_view.switcher.set_active (category_view.switcher.active - 1);
-                        else if (!searchbar.has_focus) {//the user has already selected an AppEntry
+                            category_view.app_view.go_to_previous ();
+                        else if (!search_entry.has_focus) {//the user has already selected an AppEntry
                             category_move_focus (-1, 0);
                         }
                     } else
@@ -497,13 +474,13 @@
                 case "Right":
                     if (modality == Modality.NORMAL_VIEW) {
                         if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Right
-                            page_switcher.set_active (page_switcher.active + 1);
+                            grid_view.go_to_next ();
                         else
                             normal_move_focus (+1, 0);
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Right
-                            category_view.switcher.set_active (category_view.switcher.active + 1);
-                        else if (searchbar.has_focus) // there's no AppEntry selected, the user is switching category
+                            category_view.app_view.go_to_next ();
+                        else if (search_entry.has_focus) // there's no AppEntry selected, the user is switching category
                             top_left_focus ();
                         else //the user has already selected an AppEntry
                             category_move_focus (+1, 0);
@@ -521,14 +498,13 @@
                                 category_view.category_switcher.selected--;
                                 top_left_focus ();
                             }
-                        } else if (searchbar.has_focus) {
+                        } else if (search_entry.has_focus) {
                             category_view.category_switcher.selected--;
                         } else {
                           category_move_focus (0, -1);
                         }
                     } else if (modality == Modality.SEARCH_VIEW) {
                         search_view.selected--;
-                        search_view_up ();
                     }
                     break;
 
@@ -539,23 +515,19 @@
                         if (event.state == Gdk.ModifierType.SHIFT_MASK) { // Shift + Down
                             category_view.category_switcher.selected++;
                             top_left_focus ();
-                        } else if (searchbar.has_focus) {
+                        } else if (search_entry.has_focus) {
                             category_view.category_switcher.selected++;
                         } else { // the user has already selected an AppEntry
                             category_move_focus (0, +1);
                         }
                     } else if (modality == Modality.SEARCH_VIEW) {
                         search_view.selected++;
-                        if (search_view.selected > 7)
-                            search_view_down ();
                     }
                     break;
 
                 case "Page_Up":
                     if (modality == Modality.NORMAL_VIEW) {
-                        page_switcher.set_active (page_switcher.active - 1);
-                        if (page_switcher.active != 0) // we don't wanna lose focus if we don't actually change page
-                            searchbar.grab_focus (); // this is because otherwise focus isn't the current page
+                        grid_view.go_to_previous ();
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         category_view.category_switcher.selected--;
                         top_left_focus ();
@@ -564,9 +536,7 @@
 
                 case "Page_Down":
                     if (modality == Modality.NORMAL_VIEW) {
-                        page_switcher.set_active (page_switcher.active + 1);
-                        if (page_switcher.active != grid_view.get_n_pages () - 1) // we don't wanna lose focus if we don't actually change page
-                            searchbar.grab_focus (); //this is because otherwise focus isn't the current page
+                        grid_view.go_to_next ();
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         category_view.category_switcher.selected++;
                         top_left_focus ();
@@ -575,23 +545,23 @@
 
                 case "BackSpace":
                     if (event.state == Gdk.ModifierType.SHIFT_MASK) { // Shift + Delete
-                        searchbar.text = "";
-                    } else if (searchbar.has_focus) {
+                        search_entry.text = "";
+                    } else if (search_entry.has_focus) {
                         return false;
                     } else {
-                        searchbar.grab_focus ();
-                        searchbar.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
+                        search_entry.grab_focus ();
+                        search_entry.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
                         return false;
                     }
                     break;
 
                 case "Home":
-                    if (searchbar.text.length > 0) {
+                    if (search_entry.text.length > 0) {
                         return false;
                     }
 
                     if (modality == Modality.NORMAL_VIEW) {
-                        page_switcher.set_active (0);
+                        grid_view.go_to_number (1);
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         category_view.category_switcher.selected = 0;
                         top_left_focus ();
@@ -599,12 +569,12 @@
                     break;
 
                 case "End":
-                    if (searchbar.text.length > 0) {
+                    if (search_entry.text.length > 0) {
                         return false;
                     }
 
                     if (modality == Modality.NORMAL_VIEW) {
-                        page_switcher.set_active (grid_view.get_n_pages () - 1);
+                        grid_view.go_to_last ();
                     } else if (modality == Modality.CATEGORY_VIEW) {
                         category_view.category_switcher.selected = category_view.category_switcher.cat_size - 1;
                         top_left_focus ();
@@ -614,14 +584,14 @@
                 case "v":
                 case "V":
                     if ((event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) != 0) {
-                        searchbar.paste_clipboard ();
+                        search_entry.paste_clipboard ();
                     }
                     break;
 
                 default:
-                    if (!searchbar.has_focus) {
-                        searchbar.grab_focus ();
-                        searchbar.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
+                    if (!search_entry.has_focus) {
+                        search_entry.grab_focus ();
+                        search_entry.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
                     }
                     return false;
 
@@ -637,20 +607,16 @@
                 case "GDK_SCROLL_UP":
                 case "GDK_SCROLL_LEFT":
                     if (modality == Modality.NORMAL_VIEW)
-                        page_switcher.set_active (page_switcher.active - 1);
-                    else if (modality == Modality.SEARCH_VIEW)
-                        search_view_up ();
-                    else
-                        category_view.switcher.set_active (category_view.switcher.active - 1);
+                        grid_view.go_to_previous ();
+                    else if (modality == Modality.CATEGORY_VIEW)
+                        category_view.app_view.go_to_previous ();
                     break;
                 case "GDK_SCROLL_DOWN":
                 case "GDK_SCROLL_RIGHT":
                     if (modality == Modality.NORMAL_VIEW)
-                        page_switcher.set_active (page_switcher.active + 1);
-                    else if (modality == Modality.SEARCH_VIEW)
-                        search_view_down ();
-                    else
-                        category_view.switcher.set_active (category_view.switcher.active + 1);
+                        grid_view.go_to_next ();
+                    else if (modality == Modality.CATEGORY_VIEW)
+                        category_view.app_view.go_to_next ();
                     break;
 
             }
@@ -661,14 +627,14 @@
 
         public void show_slingshot () {
 
-            searchbar.text = "";
+            search_entry.text = "";
 
             reposition ();
             show_all ();
             present ();
 
             set_focus(null);
-            searchbar.grab_focus ();
+            search_entry.grab_focus ();
             set_modality ((Modality) view_selector.selected);
 
             while (Gtk.events_pending ())
@@ -681,56 +647,6 @@
                 w.activate (Gdk.x11_get_server_time (this.get_window ()));
         }
 
-        private void move_page (int step) {
-
-            debug ("Moving: step = " + step.to_string ());
-
-            if (step == 0)
-                return;
-            if (step < 0 && current_position >= 0) //Left border
-                return;
-            if (step > 0 && (-current_position) >= ((grid_view.get_n_pages () - 1) * grid_view.get_page_columns () * 130)) //Right border
-                return;
-
-            int count = 0;
-            int increment = -step * 130 * columns / 10;
-            Timeout.add (30 / columns, () => {
-
-                if (count >= 10) {
-                    current_position += -step * 130 * columns - 10 * increment; //We adjust to end of the page
-                    view_manager.move (grid_view, current_position, 0);
-                    return false;
-                }
-
-                current_position += increment;
-                view_manager.move (grid_view, current_position, 0);
-                count++;
-                return true;
-
-            }, Priority.DEFAULT_IDLE);
-        }
-
-        private void search_view_down () {
-
-            if (search_view.apps_showed < default_rows * 3)
-                return;
-
-            if ((search_view_position) > -(search_view.apps_showed * 48)) {
-                view_manager.move (search_view, 0, search_view_position - 2 * 38);
-                search_view_position -= 2 * 38;
-            }
-
-        }
-
-        private void search_view_up () {
-
-            if (search_view_position < 0) {
-                view_manager.move (search_view, 0, search_view_position + 2 * 38);
-                search_view_position += 2 * 38;
-            }
-
-        }
-
         private void set_modality (Modality new_modality) {
 
             modality = new_modality;
@@ -740,57 +656,42 @@
 
                     if (Slingshot.settings.use_category)
                         Slingshot.settings.use_category = false;
-                    bottom.show ();
                     view_selector.show_all ();
-                    page_switcher.show_all ();
-                    category_view.show_page_switcher (false);
-                    view_manager.move (search_view, - 130 * columns, 0);
-                    view_manager.move (category_view, 130 * columns, 0);
-                    view_manager.move (grid_view, current_position, 0);
+                    stack.set_visible_child_name ("normal");
 
                     // change the paddings/margins back to normal
                     get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE + 5);
                     center.set_margin_left (12);
                     top.set_margin_left (12);
-                    view_manager.set_size_request (default_columns * 130, default_rows * 145);
+                    stack.set_size_request (default_columns * 130, default_rows * 145);
                     break;
 
                 case Modality.CATEGORY_VIEW:
 
                     if (!Slingshot.settings.use_category)
                         Slingshot.settings.use_category = true;
-                    bottom.show ();
                     view_selector.show_all ();
-                    page_switcher.hide ();
-                    category_view.show_page_switcher (true);
-                    view_manager.move (grid_view, (columns + 1) * 130, 0); // plus 1 is needed because otherwise grid_view may appear in category view
-                    view_manager.move (search_view, -columns * 130, 0);
-                    view_manager.move (category_view, 0, 0);
+                    stack.set_visible_child_name ("category");
 
                     // remove the padding/margin on the left
                     get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE);
                     center.set_margin_left (0);
                     top.set_margin_left (17);
-                    view_manager.set_size_request (default_columns * 130 + 17, default_rows * 145);
+                    stack.set_size_request (default_columns * 130 + 17, default_rows * 145);
                     break;
 
                 case Modality.SEARCH_VIEW:
                     view_selector.hide ();
-                    bottom.hide (); // Hide the switcher
-                    view_manager.move (grid_view, columns * 130, 0); // Move the grid_view away
-                    view_manager.move (category_view, columns * 130, 0);
-                    view_manager.move (search_view, 0, 0); // Show the searchview
+                    stack.set_visible_child_name ("search");
 
                     // change the paddings/margins back to normal
                     get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE + 5);
                     center.set_margin_left (12);
                     top.set_margin_left (12);
-                    view_manager.set_size_request (default_columns * 130, default_rows * 145);
+                    stack.set_size_request (default_columns * 130, default_rows * 145);
                     break;
 
             }
-            //searchbar.grab_focus ();
-
         }
 
         private async void search (string text) {
@@ -805,7 +706,6 @@
             if (modality != Modality.SEARCH_VIEW)
                 set_modality (Modality.SEARCH_VIEW);
             search_view_position = 0;
-            view_manager.move (search_view, 0, search_view_position);
             search_view.hide_all ();
 
             var filtered = yield app_system.search_results (stripped);
@@ -820,12 +720,8 @@
 
         public void populate_grid_view () {
 
-            page_switcher.clear_children ();
             grid_view.clear ();
 
-            page_switcher.append ("1");
-            page_switcher.set_active (0);
-
             foreach (Backend.App app in app_system.get_apps_by_name ()) {
 
                 var app_entry = new Widgets.AppEntry (app);
@@ -834,7 +730,7 @@
                 app_entry.show_all ();
             }
 
-            view_manager.move (grid_view, 0, 0);
+            stack.set_visible_child_name ("normal");
             current_position = 0;
 
         }
@@ -861,7 +757,6 @@
                 height_request = default_rows * 145 + 180;
 
                 category_view.app_view.resize (default_rows, default_columns);
-                category_view.set_size_request (columns * 130 + 17, view_height);
                 category_view.show_filtered_apps (category_view.category_ids.get (category_view.category_switcher.selected));
             }
 
@@ -869,6 +764,8 @@
 
         private void normal_move_focus (int delta_column, int delta_row) {
             if (get_focus () as Widgets.AppEntry != null) { // we check if any AppEntry has focus. If it does, we move
+                if (column_focus + delta_column < 0 || row_focus + delta_row < 0)
+                    return;
                 var new_focus = grid_view.get_child_at (column_focus + delta_column, row_focus + delta_row); // we check if the new widget exists
                 if (new_focus == null) {
                     if (delta_column <= 0)
@@ -883,14 +780,15 @@
                 column_focus += delta_column;
                 row_focus += delta_row;
                 if (delta_column > 0 && column_focus % grid_view.get_page_columns () == 0 ) //check if we need to change page
-                    page_switcher.set_active (page_switcher.active + 1);
+                    grid_view.go_to_next ();
                 else if (delta_column < 0 && (column_focus + 1) % grid_view.get_page_columns () == 0) //check if we need to change page
-                    page_switcher.set_active (page_switcher.active - 1);
+                    grid_view.go_to_previous ();
                 new_focus.grab_focus ();
             }
             else { // we move to the first app in the top left corner of the current page
-                grid_view.get_child_at (page_switcher.active * grid_view.get_page_columns (), 0).grab_focus ();
-                column_focus = page_switcher.active * grid_view.get_page_columns ();
+                column_focus = (grid_view.get_current_page ()-1) * grid_view.get_page_columns ();
+                if (column_focus >= 0)
+                    grid_view.get_child_at (column_focus, 0).grab_focus ();
                 row_focus = 0;
             }
         }
@@ -909,13 +807,13 @@
                     return;
                 }
                 else if (delta_column > 0 && (category_column_focus + delta_column) % category_view.app_view.get_page_columns () == 0
-                          && category_view.switcher.active + 1 != category_view.app_view.get_n_pages ()) {
-                    category_view.switcher.set_active (category_view.switcher.active + 1);
+                          && category_view.app_view.get_current_page ()+ 1 != category_view.app_view.get_n_pages ()) {
+                    category_view.app_view.go_to_next ();
                     top_left_focus ();
                     return;
                 }
                 else if (category_column_focus == 0 && delta_column < 0) {
-                    searchbar.grab_focus ();
+                    search_entry.grab_focus ();
                     category_column_focus = 0;
                     category_row_focus = 0;
                     return;
@@ -926,11 +824,11 @@
             category_column_focus += delta_column;
             category_row_focus += delta_row;
             if (delta_column > 0 && category_column_focus % category_view.app_view.get_page_columns () == 0 ) { // check if we need to change page
-                category_view.switcher.set_active (category_view.switcher.active + 1);
+                category_view.app_view.go_to_next ();
             }
             else if (delta_column < 0 && (category_column_focus + 1) % category_view.app_view.get_page_columns () == 0) {
                 // check if we need to change page
-                category_view.switcher.set_active (category_view.switcher.active - 1);
+                category_view.app_view.go_to_previous ();
             }
             new_focus.grab_focus ();
         }
@@ -938,10 +836,10 @@
         // this method moves focus to the first AppEntry in the top left corner of the current page. Works in CategoryView only
         private void top_left_focus () {
             // this is the first column of the current page
-            int first_column = category_view.switcher.active * category_view.app_view.get_page_columns ();
+            int first_column = (grid_view.get_current_page ()-1) * category_view.app_view.get_page_columns ();
             category_view.app_view.get_child_at (first_column, 0).grab_focus ();
             category_column_focus = first_column;
-            category_row_focus = 0;
+            category_row_focus = 1;
         }
 
         public void reset_category_focus () {

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2013-12-26 00:08:04 +0000
+++ src/Widgets/AppEntry.vala	2014-03-01 15:19:46 +0000
@@ -104,42 +104,8 @@
 
     }
 
-    public void fade_out () {
-
-        Timeout.add (20, () => {
-
-            if (alpha <= 0.3) {
-                queue_draw ();
-                return false;
-            }
-
-            alpha -= 0.05;
-            queue_draw ();
-            return true;
-
-        });
-
-    }
-
-    public void fade_in () {
-
-        Timeout.add (20, () => {
-
-            if (alpha == 1.0) {
-                queue_draw ();
-                return false;
-            }
-
-            alpha += 0.05;
-            queue_draw ();
-            return true;
-
-        });
-
-    }
-
     public void launch_app () {
         application.launch ();
         app_launched ();
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2013-12-26 00:08:04 +0000
+++ src/Widgets/CategoryView.vala	2014-03-01 15:19:46 +0000
@@ -22,17 +22,13 @@
     public Sidebar category_switcher;
     public Gtk.Separator separator;
     public Widgets.Grid app_view;
-    private Gtk.Layout layout;
-    public Switcher switcher;
     private SlingshotView view;
-    private Gtk.Label empty_cat_label;
 
     private Gtk.Grid page_switcher;
 
     private const string ALL_APPLICATIONS = _("All Applications");
     private const string NEW_FILTER = _("Create a new Filter");
     private int current_position = 0;
-    private bool from_category = false;
 
     public Gee.HashMap<int, string> category_ids = new Gee.HashMap<int, string> ();
 
@@ -53,30 +49,11 @@
         container = new Gtk.Grid ();
         separator = new Gtk.Separator (Gtk.Orientation.VERTICAL);
 
-        layout = new Gtk.Layout (null, null);
-
         app_view = new Widgets.Grid (view.rows, view.columns - 1);
-        layout.put (app_view, 0, 0);
-        empty_cat_label = new Gtk.Label ("");
-        layout.put (empty_cat_label, view.columns*130, view.rows * 130 / 2);
-        layout.set_hexpand (true);
-        layout.set_vexpand (true);
-
-        // Create the page switcher
-        switcher = new Switcher ();
-
-        // A bottom widget to keep the page switcher center
-        page_switcher = new Gtk.Grid ();
-        var bottom_separator1 = new Gtk.Label (""); // A fake label
-        bottom_separator1.set_hexpand(true);
-        var bottom_separator2 = new Gtk.Label (""); // A fake label
-        bottom_separator2.set_hexpand(true);
-        page_switcher.attach (bottom_separator1, 0, 0, 1, 1);
-        page_switcher.attach (switcher, 1, 0, 1, 1);
-        page_switcher.attach (bottom_separator2, 2, 0, 1, 1);
+        app_view.margin_left = 5;
 
         container.attach (separator, 1, 0, 1, 2);
-        container.attach (layout, 2, 0, 1, 1);
+        container.attach (app_view, 2, 0, 1, 1);
 
         add (container);
 
@@ -112,40 +89,6 @@
 
     private void connect_events () {
 
-        layout.scroll_event.connect ((event) => {
-            switch (event.direction.to_string ()) {
-                case "GDK_SCROLL_UP":
-                case "GDK_SCROLL_LEFT":
-                    switcher.set_active (switcher.active - 1);
-                    break;
-                case "GDK_SCROLL_DOWN":
-                case "GDK_SCROLL_RIGHT":
-                    switcher.set_active (switcher.active + 1);
-                    break;
-            }
-            return false;
-        });
-
-        app_view.new_page.connect ((page) => {
-
-            if (switcher.size == 0)
-                switcher.append ("1");
-            switcher.append (page);
-
-            /* Prevents pages from changing */
-            from_category = true;
-        });
-
-        switcher.active_changed.connect (() => {
-            if (from_category || switcher.active - switcher.old_active == 0) {
-                from_category = false;
-                return;
-            }
-
-            move_page (switcher.active - switcher.old_active);
-            view.searchbar.grab_focus (); // this is because otherwise focus isn't the current page
-        });
-
         category_switcher.selected = 0; //Must be after everything else
     }
 
@@ -154,55 +97,20 @@
         var app_entry = new AppEntry (app);
         app_entry.app_launched.connect (() => view.hide ());
         app_view.append (app_entry);
-        app_entry.show_all ();
+        app_view.show_all ();
 
     }
 
     public void show_filtered_apps (string category) {
 
-        switcher.clear_children ();
         app_view.clear ();
-
-        layout.move (empty_cat_label, view.columns*130, view.rows*130 / 2);
         foreach (Backend.App app in view.apps[category])
             add_app (app);
 
-        switcher.set_active (0);
-
-        layout.move (app_view, 0, 0);
         current_position = 0;
 
     }
 
-    public void move_page (int step) {
-
-        debug ("Moving: step = " + step.to_string ());
-
-        if (step == 0)
-            return;
-        if (step < 0 && current_position >= 0) //Left border
-            return;
-        if (step > 0 && (-current_position) >= ((app_view.get_n_pages () - 1) * app_view.get_page_columns () * 130)) //Right border
-            return;
-
-        int count = 0;
-        int increment = -step*130*(view.columns-1)/10;
-        Timeout.add (30/(view.columns-1), () => {
-
-            if (count >= 10) {
-                current_position += -step*130*(view.columns-1) - 10*increment; //We adjust to end of the page
-                layout.move (app_view, current_position, 0);
-                return false;
-            }
-
-            current_position += increment;
-            layout.move (app_view, current_position, 0);
-            count++;
-            return true;
-
-        }, Priority.DEFAULT_IDLE);
-    }
-
     public void show_page_switcher (bool show) {
 
         if (page_switcher.get_parent () == null)
@@ -210,14 +118,12 @@
 
         if (show) {
             page_switcher.show_all ();
-            view.bottom.hide ();
         }
         else
             page_switcher.hide ();
 
-        view.searchbar.grab_focus ();
+        view.search_entry.grab_focus ();
 
     }
 
-}
-
+}
\ No newline at end of file

=== modified file 'src/Widgets/Grid.vala'
--- src/Widgets/Grid.vala	2013-12-26 00:08:04 +0000
+++ src/Widgets/Grid.vala	2014-03-01 15:19:46 +0000
@@ -21,40 +21,70 @@
     struct Page {
         public uint rows;
         public uint columns;
-        public uint number;
+        public int number;
     }
 
-    public class Grid : Gtk.Grid {
-
-        public signal void new_page (string page_num);
+    public class Grid : Gtk.Box {
+        public int row_spacing = 20;
+        public Widgets.Switcher page_switcher;
+        
+        private Gtk.Stack stack;
+        private Gtk.Grid current_grid;
+        private Gee.HashMap<int, Gtk.Grid> grids;
 
         private uint current_row = 0;
         private uint current_col = 0;
         private Page page;
 
         public Grid (int rows, int columns) {
-
+            page.rows = rows;
+            page.columns = columns;
+            page.number = 1;
+            var main_grid = new Gtk.Grid ();
+            main_grid.orientation = Gtk.Orientation.VERTICAL;
+            stack = new Gtk.Stack ();
+            stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
+            page_switcher = new Widgets.Switcher ();
+            page_switcher.set_stack (stack);
+            var fake_grid = new Gtk.Grid ();
+            fake_grid.hexpand = true;
+            var stack_layout = new Gtk.Layout ();
+            stack_layout.expand = true;
+            stack_layout.add (stack);
+
+            main_grid.add (stack_layout);
+            main_grid.add (fake_grid);
+            main_grid.add (page_switcher);
+            add (main_grid);
+
+            grids = new Gee.HashMap<int, Gtk.Grid> (null, null);
+            create_new_grid ();
+            go_to_number (1);
+        }
+        
+        private void create_new_grid () {
             // Grid properties
-            row_homogeneous = true;
-            column_homogeneous = true;
-
-            row_spacing = 20;
-            column_spacing = 0;
-
-            page.rows = rows;
-            page.columns = columns;
-            page.number = 1;
-
+            current_grid = new Gtk.Grid ();
+            current_grid.expand = true;
+            current_grid.row_homogeneous = true;
+            current_grid.column_homogeneous = true;
+
+            current_grid.row_spacing = row_spacing;
+            current_grid.column_spacing = 0;
+            grids.set (page.number, current_grid);
+            stack.add_titled (current_grid, page.number.to_string (), page.number.to_string ());
+
+            // Fake grids in case there are not enough apps to fill the grid
+            current_grid.attach (new Gtk.Grid (), 0, 0, (int)page.columns, (int)page.rows);
         }
 
         public void append (Gtk.Widget widget) {
 
             update_position ();
 
-            var col = current_col + page.columns * (page.number - 1);
-
-            this.attach (widget, (int)col, (int)current_row, 1, 1);
+            current_grid.attach (widget, (int)current_col, (int)current_row, 1, 1);
             current_col++;
+            current_grid.show ();
         }
 
         private void update_position () {
@@ -66,7 +96,7 @@
 
             if (current_row == page.rows) {
                 page.number++;
-                new_page (page.number.to_string ());
+                create_new_grid ();
                 current_row = 0;
             }
 
@@ -74,16 +104,27 @@
 
         public void clear () {
 
-            foreach (Gtk.Widget widget in get_children ()) {
-                if (widget.get_parent () != null)
-                    remove (widget);
-                widget.destroy ();
+            foreach (Gtk.Grid grid in grids.values) {
+                foreach (Gtk.Widget widget in grid.get_children ()) {
+                    widget.destroy ();
+                }
+                grid.destroy ();
             }
+            grids.clear ();
 
             current_row = 0;
             current_col = 0;
             page.number = 1;
-
+            create_new_grid ();
+            stack.set_visible_child (current_grid);
+
+        }
+
+        public Gtk.Widget get_child_at (int column, int row) {
+            var col = ((int)(column/page.columns))+1;
+            
+            var grid = grids.get (col);
+            return grid.get_child_at (column - (int)page.columns*(col-1), row);
         }
 
         public int get_page_columns () {
@@ -104,20 +145,34 @@
 
         }
 
-        public void fade_all_out () {
-
-            foreach (Gtk.Widget widget in get_children ()) {
-                ((AppEntry) widget).fade_out ();
-            }
-
-        }
-
-        public void fade_all_in () {
-
-            foreach (Gtk.Widget widget in get_children ()) {
-                ((AppEntry) widget).fade_in ();
-            }
-
+        public int get_current_page () {
+            return int.parse (stack.get_visible_child_name ());
+        }
+
+        public void go_to_next () {
+            int page_number = get_current_page ()+1;
+            if (page_number <= get_n_pages ())
+                stack.set_visible_child_name ("%d".printf (page_number));
+            
+            page_switcher.update_selected ();
+        }
+
+        public void go_to_previous () {
+            int page_number = get_current_page ()-1;
+            if (page_number > 0)
+                stack.set_visible_child_name ("%d".printf (page_number));
+            
+            page_switcher.update_selected ();
+        }
+
+        public void go_to_last () {
+            stack.set_visible_child_name ("%d".printf (get_n_pages ()));
+            page_switcher.update_selected ();
+        }
+
+        public void go_to_number (int number) {
+            stack.set_visible_child_name ("%d".printf (number));
+            page_switcher.update_selected ();
         }
 
         public void resize (int rows, int columns) {

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2013-12-26 00:08:04 +0000
+++ src/Widgets/SearchView.vala	2014-03-01 15:19:46 +0000
@@ -27,11 +27,12 @@
 
     }
 
-    public class SearchView : Gtk.Box {
+    public class SearchView : Gtk.ScrolledWindow {
 
         private Gee.HashMap<Backend.App, SearchItem> items;
         private SeparatorItem separator;
         private SearchItem selected_app = null;
+        private Gtk.Box main_box;
 
         private int _selected = 0;
         public int selected {
@@ -63,17 +64,23 @@
         private SlingshotView view;
 
         public SearchView (SlingshotView parent) {
-            orientation = Gtk.Orientation.VERTICAL;
-
-            can_focus = true;
-            homogeneous = false;
+            main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            main_box.can_focus = true;
+            main_box.homogeneous = false;
 
             this.view = parent;
-            width_request = view.columns * 130;
+            main_box. width_request = view.columns * 130;
 
             items = new Gee.HashMap<Backend.App, SearchItem> ();
             separator = new SeparatorItem ();
 
+            var expand_grid = new Gtk.Grid ();
+            expand_grid.expand = true;
+            var search_grid = new Gtk.Grid ();
+            search_grid.orientation = Gtk.Orientation.VERTICAL;
+            search_grid.add (main_box);
+            search_grid.add (expand_grid);
+            add_with_viewport (search_grid);
         }
 
         public void add_apps (Gee.ArrayList<Backend.App> apps) {
@@ -111,7 +118,7 @@
             }
 
             if (!(items[app].in_box)) {
-                pack_start (items[app], true, true, 0);
+                main_box.pack_start (items[app], true, true, 0);
                 items[app].in_box = true;
                 items[app].icon_size = 48;
                 items[app].queue_draw ();
@@ -143,10 +150,12 @@
             foreach (SearchItem app in items.values) {
                 app.hide ();
                 if (app.in_box) {
-                    remove (app);
+                    main_box.remove (app);
                     app.in_box = false;
                 }
             }
+
+            vadjustment.value = vadjustment.lower;
             apps_showed = 0;
         }
 
@@ -163,7 +172,7 @@
         private void show_separator () {
 
             if (!(separator.in_box)) {
-                pack_start (separator, true, true, 3);
+                main_box.pack_start (separator, true, true, 3);
                 separator.in_box = true;
             }
             separator.show_all ();
@@ -174,7 +183,7 @@
 
             separator.hide ();
             if (separator.in_box) {
-                remove (separator);
+                main_box.remove (separator);
                 separator.in_box = false;
             }
 
@@ -185,7 +194,7 @@
             if (selected_app != null)
                 selected_app.unset_state_flags (Gtk.StateFlags.PRELIGHT);
 
-            selected_app = (SearchItem) get_children ().nth_data (index);
+            selected_app = (SearchItem) main_box.get_children ().nth_data (index);
             selected_app.set_state_flags (Gtk.StateFlags.PRELIGHT, false);
 
         }

=== modified file 'src/Widgets/Switcher.vala'
--- src/Widgets/Switcher.vala	2013-03-10 12:58:37 +0000
+++ src/Widgets/Switcher.vala	2014-03-01 15:19:46 +0000
@@ -1,6 +1,7 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 //
 //  Copyright (C) 2011-2012 Giulio Collura
+//  Copyright (C) 2014 Corentin Noël <[e-mail]>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -16,78 +17,106 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Gtk;
-
-namespace Slingshot.Widgets {
-
-    public class Switcher : HBox {
-
-        public signal void active_changed (int active);
-
-        public int size {
-            get {
-                return (int) get_children ().length ();
-            }
-        }
-
-        public int active = -1;
-        public int old_active = -1;
-
-        public Switcher (bool with_padding = true) {
-
-            homogeneous = true;
-            spacing = 2;
-
-            can_focus = false;
-
-        }
-
-        public void append (string label) {
-
-            var button = new ToggleButton.with_label (label);
-            button.width_request = 30;
-            button.can_focus = false;
-            button.get_style_context ().add_class ("switcher");
-
-            button.button_release_event.connect (() => {
-
-                int select = get_children ().index (button);
-                set_active (select);
-                return true;
-
-            });
-
-            add (button);
-            button.show_all ();
-
-        }
-
-        public void set_active (int new_active) {
-        
-            if (new_active >= get_children ().length ())
-                return;
-
-            if (active >= 0)
-                ((ToggleButton) get_children ().nth_data (active)).set_active (false);
-
-            old_active = active;
-            active = new_active;
-            active_changed (new_active);
-            ((ToggleButton) get_children ().nth_data (active)).set_active (true);
-            
-        }
-
-        public void clear_children () {
-
-            foreach (weak Widget button in get_children ()) {
-                button.hide ();
-                if (button.get_parent () != null)
-                    remove (button);
-            }
-
-            old_active = 0;
-            active = 0;
-
-        }
-    }
-}
+public class Slingshot.Widgets.Switcher : Gtk.Box {
+
+    public int size {
+        get {
+            return (int) buttons.size;
+        }
+    }
+
+    private Gtk.Stack stack;
+    private Gee.HashMap<Gtk.Widget, Gtk.ToggleButton> buttons;
+
+    public Switcher () {
+        orientation = Gtk.Orientation.HORIZONTAL;
+        spacing = 2;
+        can_focus = false;
+        buttons = new Gee.HashMap<Gtk.Widget, Gtk.ToggleButton> (null, null);
+        pack_start (new Gtk.Grid (), true, true, 0);
+        pack_end (new Gtk.Grid (), true, true, 0);
+    }
+
+    public void set_stack (Gtk.Stack stack) {
+        if (this.stack != null) {
+            clear_children ();
+        }
+        this.stack = stack;
+        populate_switcher ();
+        connect_stack_signals ();
+        update_selected ();
+    }
+
+    private void add_child (Gtk.Widget widget) {
+        var button = new Gtk.ToggleButton.with_label ((buttons.size +1).to_string ());
+        button.width_request = 30;
+        button.can_focus = false;
+        button.get_style_context ().add_class ("switcher");
+        button.button_release_event.connect (() => {
+            foreach (var entry in buttons.entries) {
+                if (entry.value == button)
+                    on_button_clicked (entry.key);
+                entry.value.active = false;
+            }
+            button.active = true;
+            return true;
+        });
+
+        add (button);
+        buttons.set (widget, button);
+        if (buttons.size == 1)
+            button.active = true;
+    }
+    
+    public override void show () {
+        base.show ();
+        if (buttons.size <= 1)
+            hide ();
+    }
+
+    
+    public override void show_all () {
+        base.show_all ();
+        if (buttons.size <= 1)
+            hide ();
+    }
+
+    private void on_button_clicked (Gtk.Widget widget) {
+        stack.set_visible_child (widget);
+    }
+
+    private void populate_switcher () {
+        foreach (var child in stack.get_children ()) {
+            add_child (child);
+        }
+    }
+
+    private void on_stack_child_removed (Gtk.Widget widget) {
+        var button = buttons.get (widget);
+        remove (button);
+        buttons.unset (widget);
+    }
+
+    private void connect_stack_signals () {
+        stack.add.connect_after (add_child);
+        stack.remove.connect_after (on_stack_child_removed);
+    }
+
+    public void clear_children () {
+        foreach (weak Gtk.Widget button in get_children ()) {
+            button.hide ();
+            if (button.get_parent () != null)
+                remove (button);
+        }
+    }
+    
+    public void update_selected () {
+        foreach (var entry in buttons.entries) {
+            if (entry.key == stack.get_visible_child ()) {
+                entry.value.active = true;
+            } else {
+                entry.value.active = false;
+            }
+        }
+    }
+}
\ No newline at end of file