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

[Corentin Noël]

Make use of Gtk.Popover instead of Granite.Popover.
Animates the view change from the edges.
Use real size of App Buttons (removed useless and wrong code)

Make use of Gtk.Popover instead of Granite.Popover.
Animates the view change from the edges.
Use real size of App Buttons (removed useless and wrong code)

[lp:~tintou/slingshot/gtk-popover]

501. By Corentin Noël on 2015-01-18

Fixed RTL animation.

502. By Corentin Noël on 2015-01-18

Use Gtk.STYLE_CLASS_FLAT instead of "app" class.

[Danielle Foré (danrabbit)]

This seems to be quite an improvement overall. Gaining regular right click menus and also the cut/copy/paste/etc menu is killer.

I love that the animations go to the edge of the popover. Very sexy!

Something that is annoying is that it seems to animate from the bottom up. I see this as a regression. Ideally it would animate from the origin towards the opposite corner of the display. But at least the current version animates from the center out.

It does seem that this makes Slingshot shorter, which is a bit weird at first, but I think it'll be easy to get used to. I wouldn't really consider this a regression.

When navigating by keyboard, I noticed that moving from the 2nd-to-last to the last page, you can lose the selection if you go from the 2nd (or 3rd) row and there is only 1 row on the last page.

The scrolled window in the search view should have a right margin. Unfortunately because of the rounded corners, it seems to hang off of the bottom right corner of the popover.

There is also a small jump where the popover resizes between grid and search views

[lp:~tintou/slingshot/gtk-popover]

503. By Corentin Noël on 2015-01-18

Restore Granite's popover appearing behavior.
Fixed RTL navigation.

[Danielle Foré (danrabbit)]

If I open a right click menu and then click outside the popover, it will not be dismissed no matter how many times I click outside the popover

review: Needs Fixing

[Cody Garver (codygarver)]

So far I've only found these problems:

* Dan's right click issue mentioned above
* The Popover arrow is closer to the panel than before
* Hovering over icons with cursor gives no highlight
* The top search result is no longer highlighted

[lp:~tintou/slingshot/gtk-popover]

504. By Corentin Noël on 2015-02-01

Grab pointer action after showing a menu.

505. By Corentin Noël on 2015-02-01

Fixed alignments with other popovers.

[Corentin Noël (tintou)]

I fixed the right click issue and the popover arrow being closer than before.
Hovering is now fixed with new theme revisions.

[Danielle Foré (danrabbit)]

I can confirm:
* right click issue is fixed.
* Popover top is aligned with other popover tops
* Hovering over items is indeed a theme problem now

With the search results, focus doesn't seem to want to leave the search box even with pressing arrow keys or tab. Did something change there?

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-17 01:18:02 +0000
+++ CMakeLists.txt	2015-02-01 15:13:29 +0000
@@ -83,7 +83,6 @@
     src/Widgets/SearchItem.vala
     src/Widgets/Sidebar.vala
     src/Widgets/CategoryView.vala
-    src/Widgets/PopoverMenu.vala
 PACKAGES
     ${CORE_DEPS}
     ${UI_DEPS}
@@ -128,4 +127,4 @@
 add_schema ("org.pantheon.desktop.slingshot.gschema.xml")
 
 # Translations
-add_subdirectory (po)
 \ No newline at end of file
+add_subdirectory (po)
 
=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2014-07-21 11:27:34 +0000
+++ cmake/ValaPrecompile.cmake	2015-02-01 15:13:29 +0000
@@ -229,7 +229,6 @@
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
         "-g"
-        "--save-temps"
         ${in_files} 
         ${custom_vapi_arguments}
     COMMAND
 
=== modified file 'src/Pixels.vala'
--- src/Pixels.vala	2014-08-14 20:09:55 +0000
+++ src/Pixels.vala	2015-02-01 15:13:29 +0000
@@ -1,9 +1,9 @@
 namespace Slingshot.Pixels {
 
     const int PADDING = 17;
-    const int ROW_SPACING = 20;
+    const int ROW_SPACING = 12;
     const int ITEM_SIZE = 130;
     const int BOTTOM_SPACE = 180;
     const int SIDEBAR_GRID_PADDING = 5;
     const int SIDEBAR_WIDTH = PADDING + ITEM_SIZE - SIDEBAR_GRID_PADDING - 1;
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2014-06-12 09:14:57 +0000
+++ src/Slingshot.vala	2015-02-01 15:13:29 +0000
@@ -69,12 +69,11 @@
                 dbus_service = new DBusService (view);
 
             if (!silent) {
-                //view.move_to_coords (0, 0);
                 view.show_slingshot ();
             }
         } else {
             if (view.visible && !silent)
-                view.hide ();                  
+                view.hide ();
             else
                 view.show_slingshot ();
         }
 
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-11-08 10:49:08 +0000
+++ src/SlingshotView.vala	2015-02-01 15:13:29 +0000
@@ -24,15 +24,13 @@
         SEARCH_VIEW
     }
 
-    public class SlingshotView : Granite.Widgets.PopOver {
+    public class SlingshotView : Granite.Widgets.CompositedWindow {
 
         // Widgets
         public Gtk.SearchEntry search_entry;
         public Gtk.Stack stack;
         public Granite.Widgets.ModeButton view_selector;
         private Gtk.Revealer view_selector_revealer;
-        // Single popover to use for all of app as context menu
-        private Widgets.NofocusPopover context_popover;
 
         // Views
         private Widgets.Grid grid_view;
@@ -44,6 +42,8 @@
         public Gtk.Stack main_stack;
         public Gtk.Box content_area;
         private Gtk.EventBox event_box;
+        private Gtk.Popover popover;
+        private Gtk.Grid ref_grid;
 
         public Backend.AppSystem app_system;
         private Gee.ArrayList<GMenu.TreeDirectory> categories;
@@ -75,13 +75,17 @@
         private int category_column_focus = 0;
         private int category_row_focus = 0;
 
+        private int primary_monitor = 0;
+
         public SlingshotView () {
 
             // Window properties
             this.title = "Slingshot";
             this.skip_pager_hint = true;
             this.skip_taskbar_hint = true;
-            set_keep_above (true);
+            this.set_keep_above (true);
+            this.set_type_hint (Gdk.WindowTypeHint.MENU);
+            this.focus_on_map = true;
 
             // Have the window in the right place
             read_settings (true);
@@ -94,12 +98,14 @@
             categories = app_system.get_categories ();
             apps = app_system.get_apps ();
 
-            if (Slingshot.settings.screen_resolution != @"$(screen.get_width ())x$(screen.get_height ())")
+            primary_monitor = screen.get_primary_monitor ();
+            Gdk.Rectangle geometry;
+            screen.get_monitor_geometry (primary_monitor, out geometry);
+            if (Slingshot.settings.screen_resolution != @"$(geometry.width)x$(geometry.height)")
                 setup_size ();
 
             height_request = calculate_grid_height () + Pixels.BOTTOM_SPACE;
             setup_ui ();
-            context_popover = new Widgets.NofocusPopover (this, event_box);
 
             connect_signals ();
             debug ("Apps loaded");
@@ -115,16 +121,18 @@
         }
 
         private void setup_size () {
-
             debug ("In setup_size ()");
-            Slingshot.settings.screen_resolution = @"$(screen.get_width ())x$(screen.get_height ())";
+            primary_monitor = screen.get_primary_monitor ();
+            Gdk.Rectangle geometry;
+            screen.get_monitor_geometry (primary_monitor, out geometry);
+            Slingshot.settings.screen_resolution = @"$(geometry.width)x$(geometry.height)";
             default_columns = 5;
             default_rows = 3;
-            while ((calculate_grid_width () >= 2 * screen.get_width () / 3)) {
+            while ((calculate_grid_width () >= 2 * geometry.width / 3)) {
                 default_columns--;
             }
 
-            while ((calculate_grid_height () >= 2 * screen.get_height () / 3)) {
+            while ((calculate_grid_height () >= 2 * geometry.width / 3)) {
                 default_rows--;
             }
 
@@ -142,15 +150,17 @@
             // Create the base container
             container = new Gtk.Grid ();
             container.row_spacing = 12;
+            container.margin_top = 12;
 
             // Add top bar
             top = new Gtk.Grid ();
             top.orientation = Gtk.Orientation.HORIZONTAL;
-            top.margin_start = 12;
-            top.margin_end = 12;
+            top.margin_start = 6;
+            top.margin_end = 6;
 
             view_selector = new Granite.Widgets.ModeButton ();
-            view_selector.margin_end = 12;
+            view_selector.margin_end = 6;
+            view_selector.margin_start = 6;
             view_selector_revealer = new Gtk.Revealer ();
             view_selector_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT;
             view_selector_revealer.add (view_selector);
@@ -171,7 +181,8 @@
             search_entry = new Gtk.SearchEntry ();
             search_entry.placeholder_text = _("Search Apps");
             search_entry.hexpand = true;
-            search_entry.button_press_event.connect ((e) => {return e.button == 3;});
+            search_entry.margin_start = 6;
+            search_entry.margin_end = 6;
 
             if (Slingshot.settings.show_category_filter) {
                 top.add (view_selector_revealer);
@@ -191,6 +202,7 @@
 
             // Create the "SEARCH_VIEW"
             search_view = new Widgets.SearchView (this);
+            search_view.margin_end = 6;
             search_view.start_search.connect ((match, target) => {
                 search.begin (search_entry.text, match, target);
             });
@@ -203,22 +215,24 @@
             event_box = new Gtk.EventBox ();
             event_box.add (container);
             // Add the container to the dialog's content area
-            content_area = get_content_area () as Gtk.Box;
-            content_area.pack_start (event_box);
-            content_area.set_margin_start (SHADOW_SIZE-1);
-            content_area.set_margin_end (SHADOW_SIZE-1);
-            content_area.set_margin_top (SHADOW_SIZE-1);
-            content_area.set_margin_bottom (SHADOW_SIZE-1);
+
+            ref_grid = new Gtk.Grid ();
+            this.add (ref_grid);
+
+            popover = new Gtk.Popover (ref_grid);
+            popover.add (event_box);
+            popover.set_position (Gtk.PositionType.TOP);
+
+            this.show.connect (() => popover.show ());
 
             if (Slingshot.settings.use_category)
                 set_modality (Modality.CATEGORY_VIEW);
             else
                 set_modality (Modality.NORMAL_VIEW);
             debug ("Ui setup completed");
-
         }
 
-        private void grab_device () {
+        public void grab_device () {
             var display = Gdk.Display.get_default ();
             var pointer = display.get_device_manager ().get_client_pointer ();
             var keyboard = pointer.associated_device;
@@ -259,6 +273,14 @@
             return false;
         }
 
+        public override void get_preferred_width (out int minimum_width, out int natural_width) {
+            popover.get_preferred_width (out minimum_width, out natural_width);
+        }
+
+        public override void get_preferred_height (out int minimum_height, out int natural_height) {
+            popover.get_preferred_height (out minimum_height, out natural_height);
+        }
+
         public override bool map_event (Gdk.EventAny event) {
             if (visible)
                 grab_device ();
@@ -286,7 +308,12 @@
 
             event_box.key_press_event.connect (on_key_press);
             search_entry.key_press_event.connect (search_entry_key_press);
-
+            // Showing a menu reverts the effect of the grab_device function.
+            search_entry.populate_popup.connect ((menu) => {
+                menu.hide.connect (() => {
+                    grab_device ();
+                });
+            });
             search_entry.search_changed.connect (() => {
                 if (modality != Modality.SEARCH_VIEW)
                     set_modality (Modality.SEARCH_VIEW);
@@ -321,15 +348,23 @@
 
             // position on the right monitor when settings changed
             screen.size_changed.connect (() => {
-                setup_size ();
-                reposition (false);
+                Gdk.Rectangle geometry;
+                screen.get_monitor_geometry (screen.get_primary_monitor (), out geometry);
+                if (Slingshot.settings.screen_resolution != @"$(geometry.width)x$(geometry.height)") {
+                    setup_size ();
+                }
+                reposition ();
             });
             screen.monitors_changed.connect (() => {
-                reposition (false);
+                reposition ();
             });
 
             get_style_context ().notify["direction"].connect (() => {
-                reposition (false);
+                reposition ();
+            });
+
+            popover.hide.connect (() => {
+                hide ();
             });
 
             // check for change in gala settings
@@ -340,19 +375,6 @@
             motion_notify_event.connect (hotcorner_trigger);
         }
 
-        public void show_popover_menu (Gtk.Widget menu, Gtk.Widget relative) {
-            context_popover = new Widgets.NofocusPopover (this, event_box);
-            context_popover.set_relative_to (relative);
-            context_popover.add (menu);
-            context_popover.show_all ();
-
-            var entry = relative as Widgets.AppEntry;
-            if (entry != null)
-                entry.app_launched.connect (() => {context_popover.hide ();});
-                
-            relative.grab_focus ();
-        }
-
         private void gala_settings_changed () {
             if (Slingshot.settings.gala_settings.hotcorner_topleft == "open-launcher") {
                 can_trigger_hotcorner = true;
@@ -361,22 +383,20 @@
             }
         }
 
-        private void reposition (bool show=true) {
+        private void reposition () {
             debug("Repositioning");
 
-            Gdk.Rectangle monitor_dimensions, app_launcher_pos;
+            Gdk.Rectangle monitor_dimensions;
             screen.get_monitor_geometry (this.screen.get_primary_monitor(), out monitor_dimensions);
-            app_launcher_pos = Gdk.Rectangle () { x = monitor_dimensions.x,
-                                                  y = monitor_dimensions.y,
-                                                  width = 100,
-                                                  height = 30
-                                                 };
-
-            if (get_style_context ().direction == Gtk.TextDirection.RTL) {
-                app_launcher_pos.x += monitor_dimensions.width - this.get_window ().get_width ();
+            if (get_style_context ().direction == Gtk.TextDirection.LTR) {
+                popover.set_pointing_to ({36, 0, 0, 0});
+                // Added 36px to y to be aligned with other popovers.
+                move (monitor_dimensions.x, monitor_dimensions.y + 36);
+            } else {
+                popover.set_pointing_to ({ref_grid.get_window ().get_width () - 36, 0, 0, 0});
+                // Added 36px to y to be aligned with other popovers.
+                move (monitor_dimensions.x + monitor_dimensions.width - this.get_window ().get_width (), monitor_dimensions.y + 36);
             }
-
-            move_to_rect (app_launcher_pos, show);
         }
 
         private void change_view_mode (string key) {
@@ -519,40 +539,27 @@
                     break;
 
                 case "Left":
-                    if (modality == Modality.NORMAL_VIEW) {
-                        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.app_view.go_to_previous ();
-                        else if (!search_entry.has_focus) {//the user has already selected an AppEntry
-                            category_move_focus (-1, 0);
-                        }
-                    } else
+                    if (modality != Modality.NORMAL_VIEW && modality != Modality.CATEGORY_VIEW)
                         return false;
+
+                    if (get_style_context ().direction == Gtk.TextDirection.LTR) {
+                        move_left (event);
+                    } else {
+                        move_right (event);
+                    }
+
                     break;
-
                 case "Right":
-                    if (modality == Modality.NORMAL_VIEW) {
-                        if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Right
-                            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.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);
+                    if (modality != Modality.NORMAL_VIEW && modality != Modality.CATEGORY_VIEW)
+                        return false;
+
+                    if (get_style_context ().direction == Gtk.TextDirection.LTR) {
+                        move_right (event);
                     } else {
-                        return false;
+                        move_left (event);
                     }
+
                     break;
-
                 case "Up":
                     if (modality == Modality.NORMAL_VIEW) {
                             normal_move_focus (0, -1);
@@ -667,7 +674,6 @@
         }
 
         public override bool scroll_event (Gdk.EventScroll event) {
-            context_popover.hide ();
             switch (event.direction.to_string ()) {
                 case "GDK_SCROLL_UP":
                 case "GDK_SCROLL_LEFT":
@@ -687,15 +693,14 @@
             }
 
             return false;
-
         }
 
         public void show_slingshot () {
-            context_popover.hide ();
             search_entry.text = "";
 
             reposition ();
             show_all ();
+            popover.show_all ();
             present ();
 
             set_focus (null);
@@ -708,6 +713,44 @@
             stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
         }
 
+        /*
+         * Moves the current view to the left (undependent of the TextDirection).
+         */
+        private void move_left (Gdk.EventKey event) {
+            if (modality == Modality.NORMAL_VIEW) {
+                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.app_view.go_to_previous ();
+                else if (!search_entry.has_focus) {//the user has already selected an AppEntry
+                    category_move_focus (-1, 0);
+                }
+            }
+        }
+
+        /*
+         * Moves the current view to the right (undependent of the TextDirection).
+         */
+        private void move_right (Gdk.EventKey event) {
+            if (modality == Modality.NORMAL_VIEW) {
+                if (event.state == Gdk.ModifierType.SHIFT_MASK) // Shift + Right
+                    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.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);
+            }
+        }
+
         private void set_modality (Modality new_modality) {
             modality = new_modality;
 
@@ -780,23 +823,18 @@
         }
 
         public void populate_grid_view () {
-
             grid_view.clear ();
-
             foreach (Backend.App app in app_system.get_apps_by_name ()) {
-
-                var app_entry = new Widgets.AppEntry (app, this);
+                var app_entry = new Widgets.AppEntry (app);
                 app_entry.app_launched.connect (() => hide ());
                 grid_view.append (app_entry);
                 app_entry.show_all ();
             }
 
-
             stack.set_visible_child_name ("normal");
         }
 
         private void read_settings (bool first_start = false, bool check_columns = true, bool check_rows = true) {
-
             if (check_columns) {
                 if (Slingshot.settings.columns > 3)
                     default_columns = Slingshot.settings.columns;
@@ -819,33 +857,35 @@
                 category_view.app_view.resize (default_rows, default_columns);
                 category_view.show_filtered_apps (category_view.category_ids.get (category_view.category_switcher.selected));
             }
-
         }
 
         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)
                         return;
                     else {
                         new_focus = grid_view.get_child_at (column_focus + delta_column, 0);
-                        delta_row = -row_focus; // so it's 0 at the end
                         if (new_focus == null)
                             return;
+
+                        row_focus = -delta_row; // so it's 0 at the end
                     }
                 }
+
                 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
                     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
                     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
+            } else { // we move to the first app in the top left corner of the current page
                 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 ();
@@ -860,36 +900,34 @@
                     category_view.category_switcher.selected--;
                     top_left_focus ();
                     return;
-                }
-                else if (delta_row > 0 && category_view.category_switcher.selected != category_view.category_switcher.cat_size - 1) {
+                } else if (delta_row > 0 && category_view.category_switcher.selected != category_view.category_switcher.cat_size - 1) {
                     category_view.category_switcher.selected++;
                     top_left_focus ();
                     return;
-                }
-                else if (delta_column > 0 && (category_column_focus + delta_column) % category_view.app_view.get_page_columns () == 0
+                } else if (delta_column > 0 && (category_column_focus + delta_column) % category_view.app_view.get_page_columns () == 0
                           && 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) {
+                } else if (category_column_focus == 0 && delta_column < 0) {
                     search_entry.grab_focus ();
                     category_column_focus = 0;
                     category_row_focus = 0;
                     return;
+                } else {
+                    return;
                 }
-                else
-                    return;
             }
+
             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.app_view.go_to_next ();
-            }
-            else if (delta_column < 0 && (category_column_focus + 1) % category_view.app_view.get_page_columns () == 0) {
+            } 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.app_view.go_to_previous ();
             }
+
             new_focus.grab_focus ();
         }
 
@@ -908,4 +946,4 @@
         }
     }
 
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2014-10-17 04:41:55 +0000
+++ src/Widgets/AppEntry.vala	2015-02-01 15:13:29 +0000
@@ -32,10 +32,9 @@
     private bool dragging = false; //prevent launching
 
     private Backend.App application;
-    private unowned SlingshotView view;
+    private Gtk.Menu menu;
 
-    public AppEntry (Backend.App app, SlingshotView view) {
-        this.view = view;
+    public AppEntry (Backend.App app) {
         Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
         Gtk.drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, {dnd},
                              Gdk.DragAction.COPY);
@@ -50,7 +49,7 @@
         icon_size = Slingshot.settings.icon_size;
         icon = app.icon;
 
-        get_style_context ().add_class ("app");
+        get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
 
         app_label = new Gtk.Label (app_name);
         app_label.halign = Gtk.Align.CENTER;
@@ -75,11 +74,19 @@
         add (grid);
         set_size_request (Pixels.ITEM_SIZE, Pixels.ITEM_SIZE);
 
+        menu = new Gtk.Menu ();
+        create_menu ();
+
         this.clicked.connect (launch_app);
+        // Showing a menu reverts the effect of the grab_device function.
+        menu.hide.connect (() => {
+            var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
+            ((SlingshotView)slingshot_app.active_window).grab_device ();
+        });
 
-        this.button_release_event.connect ((e) => {
-            if (e.button == Gdk.BUTTON_SECONDARY) {
-                show_menu ();
+        this.button_press_event.connect ((e) => {
+            if (e.button == Gdk.BUTTON_SECONDARY && menu.get_children ().length () > 0) {
+                menu.popup (null, null, null, e.button, e.time);
                 return true;
             }
             return false;
@@ -120,7 +127,7 @@
         app_launched ();
     }
 
-    private void show_menu () {
+    private void create_menu () {
         // Display the apps static quicklist items in a popover menu
         if (application.actions == null) {
             try {
@@ -130,24 +137,13 @@
             }
         }
 
-        var menu = new PopoverMenu ();
         foreach (var action in application.actions) {
-            var values = application.actions_map.get (action).split (";;");
-            Gdk.Pixbuf? icon = null;
-            var flags = Gtk.IconLookupFlags.FORCE_SIZE;
-
-            try {
-                if (values.length > 1 && values[1] != "" && values[1] != null)
-                    icon = Slingshot.icon_theme.load_icon (values[1], 16, flags);
-            } catch (Error e) {
-                error ("Error loading quicklist icon");
-            }
-
-            var menuitem = new Widgets.PopoverMenuItem (action, icon);
-            menu.add_menu_item (menuitem);
-
-            menuitem.activated.connect (() => {
+            var menuitem = new Gtk.MenuItem.with_label (action);
+            menu.add (menuitem);
+
+            menuitem.activate.connect (() => {
                 try {
+                    var values = application.actions_map.get (action).split (";;");
                     AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);
                     app_launched ();
                 } catch (Error e) {
@@ -155,9 +151,7 @@
                 }
             });
         }
-
-        if (menu.get_size () > 0)
-            view.show_popover_menu (menu, this);
+        menu.show_all ();
     }
 
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2014-10-27 19:01:28 +0000
+++ src/Widgets/CategoryView.vala	2015-02-01 15:13:29 +0000
@@ -43,10 +43,8 @@
         separator = new Gtk.Separator (Gtk.Orientation.VERTICAL);
 
         category_switcher = new Sidebar ();
-        category_switcher.can_focus = false;
 
         app_view = new Widgets.Grid (view.rows, view.columns - 1);
-        app_view.margin_start = Pixels.SIDEBAR_GRID_PADDING;
 
         container.add (category_switcher);
         container.add (separator);
@@ -97,7 +95,7 @@
     }
 
     private void add_app (Backend.App app) {
-        var app_entry = new AppEntry (app, view);
+        var app_entry = new AppEntry (app);
         app_entry.app_launched.connect (() => view.hide ());
         app_view.append (app_entry);
         app_view.show_all ();
@@ -114,4 +112,4 @@
 
     }
 
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/Grid.vala'
--- src/Widgets/Grid.vala	2014-10-15 21:57:37 +0000
+++ src/Widgets/Grid.vala	2015-02-01 15:13:29 +0000
@@ -34,16 +34,17 @@
 
         private uint current_row = 0;
         private uint current_col = 0;
+
         private Page page;
 
         public Grid (int rows, int columns) {
-            margin_start = 12;
-            margin_end = 12;
             page.rows = rows;
             page.columns = columns;
             page.number = 1;
             var main_grid = new Gtk.Grid ();
             main_grid.orientation = Gtk.Orientation.VERTICAL;
+            main_grid.row_spacing = 6;
+            main_grid.margin_bottom = 12;
             stack = new Gtk.Stack ();
             stack.expand = true;
             stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
@@ -61,13 +62,15 @@
             create_new_grid ();
             go_to_number (1);
         }
-        
+
         private void create_new_grid () {
             // Grid properties
             current_grid = new Gtk.Grid ();
             current_grid.expand = true;
             current_grid.row_homogeneous = true;
             current_grid.column_homogeneous = true;
+            current_grid.margin_start = 12;
+            current_grid.margin_end = 12;
 
             current_grid.row_spacing = Pixels.ROW_SPACING;
             current_grid.column_spacing = 0;
@@ -99,25 +102,16 @@
             }
         }
 
-        public override void get_preferred_width (out int minimum_width, out int natural_width) {
-            minimum_width = (int)page.columns * Pixels.ITEM_SIZE;
-            natural_width = minimum_width;
-        }
-
-        public override void get_preferred_height (out int minimum_height, out int natural_height) {
-            minimum_height = (int)page.rows * Pixels.ITEM_SIZE + ((int)page.rows - 1) * Pixels.ROW_SPACING;
-            natural_height = minimum_height;
-        }
-
         public void clear () {
             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;
@@ -125,11 +119,15 @@
             stack.set_visible_child (current_grid);
         }
 
-        public Gtk.Widget get_child_at (int column, int row) {
+        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);
+            if (grid != null) {
+                return grid.get_child_at (column - (int)page.columns*(col-1), row) as Widgets.AppEntry;
+            } else {
+                return null;
+            }
         }
 
         public int get_page_columns () {
@@ -152,7 +150,7 @@
             int page_number = get_current_page ()+1;
             if (page_number <= get_n_pages ())
                 stack.set_visible_child_name (page_number.to_string ());
-            
+
             page_switcher.update_selected ();
         }
 
@@ -160,7 +158,7 @@
             int page_number = get_current_page ()-1;
             if (page_number > 0)
                 stack.set_visible_child_name (page_number.to_string ());
-            
+
             page_switcher.update_selected ();
         }
 
@@ -181,4 +179,4 @@
             page.number = 1;
         }
     }
-}
 \ No newline at end of file
+}
 
=== removed file 'src/Widgets/PopoverMenu.vala'
--- src/Widgets/PopoverMenu.vala	2014-10-18 01:57:49 +0000
+++ src/Widgets/PopoverMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-//
-//  Copyright (C) 2011-2012 Giulio Collura
-//  Copyright (C) 2014 Maddie May <[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
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-// A menu to be used inside of popovers for when a normal context
-// menu can't be used
-namespace Slingshot.Widgets {
-
-public class PopoverMenu : Gtk.Grid {
-    private int line_count = 0;
-    private Gee.ArrayList<PopoverMenuItem> items = new Gee.ArrayList<PopoverMenuItem> ();
-
-    public PopoverMenu () {
-        row_homogeneous = true;
-        column_homogeneous = true;
-    }
-
-    public void add_menu_item (PopoverMenuItem item) {
-        line_count++;
-        this.items.add (item);
-        this.attach (item.child, 0, line_count, 1 , 1);
-    }
-
-    public int get_size () {
-        return items.size;
-    }
-
-    public override void show () {
-        base.show ();
-        bool has_image = false;
-        foreach (PopoverMenuItem item in items) {
-            if (item.image != null)
-                has_image = true;
-        }
-
-        if (!has_image) {
-            foreach (PopoverMenuItem item in items) {
-                item.label_widget.margin_left = item.label_widget.margin_right = 8;
-                item.space_box.hide ();
-            }
-        }
-    }
-}
-
-public class PopoverMenuItem : Object {
-    public Gtk.Widget child = null;
-    public signal void activated ();
-    public Gtk.Image? image;
-    public Gtk.Box? space_box;
-    public Gtk.Label label_widget;
-
-    public PopoverMenuItem (string label, Gdk.Pixbuf? icon) {
-        var button = new Gtk.Button ();
-        button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM);
-
-        var grid = new Gtk.Grid ();
-        if (icon != null) {
-            image = new Gtk.Image.from_pixbuf (icon);
-            image.margin_left = 2;
-            image.halign = Gtk.Align.START;
-            grid.attach (image, 0, 0, 1, 1);
-        } else {
-            space_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            space_box.set_size_request (24, 16);
-            grid.attach (space_box, 0, 0, 1, 1);
-        }
-
-        label_widget = new Gtk.Label.with_mnemonic (label);
-        label_widget.margin_left = 2;
-        label_widget.margin_right = 16;
-        label_widget.justify = Gtk.Justification.LEFT;
-        label_widget.set_alignment (0, 0);
-        grid.attach (label_widget, 1, 0, 1, 1);
-
-        button.add (grid);
-        button.relief = Gtk.ReliefStyle.NONE;
-        button.clicked.connect (on_activate);
-        child = button;
-    }
-
-    private void on_activate () {
-        activated ();
-    }
-}
-
-// A popover that doesn't grab focus
-public class NofocusPopover : Gtk.Popover {
-    private Gtk.Container parent_container;
-    private unowned SlingshotView view;
-
-    private const string POPOVER_STYLESHEET = """
-        .popover,
-        .popover.osd,
-        GtkPopover {
-            border-radius: 0px;
-            margin: 0px;
-            text-shadow: none;
-        }
-    """;
-
-    public NofocusPopover (SlingshotView view, Gtk.Container parent) {
-        this.view = view;
-        this.parent_container = parent;
-        connect_popover_signals (parent);
-        modal = false;
-        parent.button_release_event.connect (hide_popover_menu);
-        parent.button_press_event.connect (hide_popover_menu);
-        get_style_context ().add_class (Gtk.STYLE_CLASS_MENU);
-        Granite.Widgets.Utils.set_theming_for_screen (get_screen (), POPOVER_STYLESHEET,
-                                      Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
-
-    public void connect_popover_signals (Gtk.Container parent) {
-        foreach (Gtk.Widget child in parent.get_children ()) {
-            if (child is Gtk.Container) {
-                Gtk.Container container = child as Gtk.Container;
-                connect_popover_signals (container);
-            }
-
-            if (child is Widgets.Switcher) {
-                var switcher = child as Widgets.Switcher;
-                switcher.on_stack_changed.connect (switched);
-            }
-
-            child.button_release_event.connect (hide_popover_menu);
-            child.button_press_event.connect (hide_popover_menu);
-        }
-    }
-
-    private void disconnect_popover_signals (Gtk.Container parent) {
-        foreach (Gtk.Widget child in parent.get_children ()) {
-            if (child is Gtk.Container) {
-                Gtk.Container container = child as Gtk.Container;
-                disconnect_popover_signals (container);
-            }
-
-            if (child is Widgets.Switcher) {
-                var switcher = child as Widgets.Switcher;
-                switcher.on_stack_changed.disconnect (switched);
-            }
-            
-            child.button_release_event.disconnect (hide_popover_menu);
-            child.button_press_event.disconnect (hide_popover_menu);
-        }
-    }
-
-    public void switched () {
-        this.hide ();
-    }
-
-    public bool hide_popover_menu (Gdk.EventButton event) {
-        if (this.visible) {
-            view.set_focus (null);
-            view.search_entry.grab_focus ();
-
-            this.hide ();
-            // Block here to replicate context menu behavior
-            return true;
-        }
-        // Visible can be false but the popover still thinks it's up
-        // and will show when it's view is switched back to
-        // in that case don't block forwarding but make sure it is
-        // really hidden
-        this.hide ();
-        return false;
-    }
-
-    ~NofocusPopover () {
-        disconnect_popover_signals (parent_container);
-    }
-}
-
-} // End namespace
 \ No newline at end of file
 
=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2014-11-08 05:40:53 +0000
+++ src/Widgets/SearchItem.vala	2015-02-01 15:13:29 +0000
@@ -35,7 +35,7 @@
         public SearchItem (Backend.App app, string search_term = "") {
             Object (app: app);
             
-            get_style_context ().add_class ("app");
+            get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
 
             var markup = Backend.SynapseSearch.markup_string_with_search (app.name, search_term);
 
@@ -97,4 +97,4 @@
         }
     }
 
-}
 \ No newline at end of file
+}
 
=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2014-11-08 05:40:53 +0000
+++ src/Widgets/SearchView.vala	2015-02-01 15:13:29 +0000
@@ -19,8 +19,6 @@
 namespace Slingshot.Widgets {
 
     public class SearchView : Gtk.ScrolledWindow {
-        const int CONTEXT_WIDTH = 200;
-        const int CONTEXT_ARROW_SIZE = 12;
         const int MAX_RESULTS = 20;
         const int MAX_RESULTS_BEFORE_LIMIT = 10;
 
@@ -32,8 +30,6 @@
         private SearchItem selected_app = null;
         private Gtk.Box main_box;
 
-        private Gtk.Revealer revealer;
-        private Gtk.EventBox context;
         private Gtk.Box context_box;
         private Gtk.Fixed context_fixed;
         private int context_selected_y;
@@ -87,30 +83,20 @@
 
         public SearchView (SlingshotView parent) {
             view = parent;
-
+            hscrollbar_policy = Gtk.PolicyType.NEVER;
             items = new Gee.HashMap<Backend.App, SearchItem> ();
 
             main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             main_box.margin_start = 12;
-            main_box.margin_end = 12;
 
             context_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             context_fixed = new Gtk.Fixed ();
-            context_fixed.margin_start = CONTEXT_ARROW_SIZE;
+            context_fixed.margin_start = 12;
             context_fixed.put (context_box, 0, 0);
-            context = new Gtk.EventBox ();
-            context.draw.connect (draw_context);
-            context.add (context_fixed);
-
-            revealer = new Gtk.Revealer ();
-            revealer.transition_duration = 400;
-            revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
-            revealer.no_show_all = true;
-            revealer.add (context);
 
             var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             box.pack_start (main_box, true);
-            box.pack_start (revealer, false);
+            box.pack_start (context_fixed, false);
 
             add_with_viewport (box);
         }
@@ -189,7 +175,7 @@
                 header.margin_start = 8;
                 header.margin_bottom = 4;
                 header.use_markup = true;
-                header.get_style_context ().add_class ("category-label");
+                header.get_style_context ().add_class ("h4");
                 header.show ();
                 main_box.pack_start (header, false);
 
@@ -252,10 +238,7 @@
                     app.start_search.connect ((search, target) => start_search (search, target));
                     context_box.pack_start (new SearchItem (app));
                 }
-                context.show_all ();
-
-                revealer.show ();
-                revealer.set_reveal_child (true);
+                context_box.show_all ();
 
                 Gtk.Allocation alloc;
                 selected_app.get_allocation (out alloc);
@@ -267,9 +250,6 @@
             } else {
                 in_context_view = false;
 
-                revealer.set_reveal_child (false);
-                revealer.hide ();
-
                 // trigger update of selection
                 selected = selected;
             }
@@ -332,19 +312,6 @@
             return null;
         }
 
-        private bool draw_context (Cairo.Context cr) {
-            cr.rectangle (CONTEXT_ARROW_SIZE, 0, context.get_allocated_width (), context.get_allocated_height ());
-
-            cr.move_to (CONTEXT_ARROW_SIZE, context_selected_y + 6);
-            cr.rel_line_to (-CONTEXT_ARROW_SIZE, 12);
-            cr.rel_line_to (CONTEXT_ARROW_SIZE, 12);
-            cr.close_path ();
-
-            cr.set_source_rgb (0.85, 0.85, 0.85);
-            cr.fill ();
-            return false;
-        }
-
         /**
          * Launch selected app
          *
@@ -358,4 +325,4 @@
 
     }
 
-}
 \ No newline at end of file
+}