Merge lp:~wingpanel-devs/slingshot/wingpanel-indicator into lp:~elementary-pantheon/slingshot/trunk

[Cody Garver]

Convert to wingpanel indicator

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-25 05:48:28 +0000
+++ CMakeLists.txt	2015-11-27 00:35:16 +0000
@@ -1,14 +1,17 @@
-# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
-
+# Main configuration
 cmake_minimum_required (VERSION 2.6)
 cmake_policy (VERSION 2.6)
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+# Project information
 project (slingshot)
+set (INDICATORTITLE "Slingshot")
+set (INDICATORDESCRIPTION "Application menu")
 
-set (APPNAME "${CMAKE_PROJECT_NAME}-launcher")
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
+# Set some variables
+include (GNUInstallDirs)
+set (DATADIR "${CMAKE_INSTALL_FULL_LIBDIR}/wingpanel")
+set (PKGDATADIR "${DATADIR}")
 set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
 set (RELEASE_NAME "Donatello")
 set (VERSION "0.8.2")
@@ -18,8 +21,8 @@
 # Files
 file (GLOB applications_menu "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-applications.menu")
 
-# Configure file
-configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+# Configuration file
+configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/lib/synapse-core/config.h)
 
 # Add 'make dist' command for creating release tarball
 set (CPACK_PACKAGE_VERSION ${VERSION})
@@ -27,13 +30,12 @@
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
 
+# Include CPack
 include (CPack)
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
-# Slingshot
-
+# Option to configure the use of the unity integration
 option (USE_UNITY "Use Unity integration" ON)
-
 if (USE_UNITY)
   message ("-- Unity integration enabled")
   set (UNITY_DEPS unity)
@@ -42,8 +44,8 @@
   message ("-- Unity integration disabled")
 endif ()
 
+# Option to configure the use of the zeitgeist integration
 option (USE_ZEITGEIST "Use Zeitgeist integration" ON)
-
 if (USE_ZEITGEIST)
   message ("-- Zeitgeist integration enabled")
   set (ZEITGEIST_DEPS zeitgeist-2.0)
@@ -52,7 +54,16 @@
   message ("-- Zeitgeist integration disabled")
 endif ()
 
+# Gettext package
+add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+
+# Comment this out to enable C compiler warnings
+add_definitions (-w)
+
+# Load PkgConfig
 find_package (PkgConfig)
+
+# Check for Vala
  
 pkg_check_modules(PLANK011 QUIET plank>=0.10.9)
 if (PLANK011_FOUND)
@@ -67,7 +78,7 @@
 endif ()
 
 set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};${PLANK_DEPS};")
-set (UI_DEPS "gtk+-3.0>=3.12.0;granite;${ZEITGEIST_DEPS};")
+set (UI_DEPS "wingpanel-2.0;gtk+-3.0>=3.12.0;granite;${ZEITGEIST_DEPS};")
 
 pkg_check_modules (DEPS REQUIRED "${CORE_DEPS}${UI_DEPS}" gthread-2.0)
 
@@ -75,68 +86,29 @@
 include (ValaVersion)
 ensure_vala_version ("0.26.2" MINIMUM)
 
+# Include vala precompile
 include (ValaPrecompile)
-vala_precompile (VALA_C ${APPNAME}
-    src/Slingshot.vala
-    src/SlingshotView.vala
-    src/Settings.vala
-    src/Utils.vala
-    src/Pixels.vala
-    src/Backend/AppSystem.vala
-    src/Backend/DBusService.vala
-    src/Backend/App.vala
-    src/Backend/RelevancyService.vala
-    src/Backend/SynapseSearch.vala
-    src/Widgets/AppEntry.vala
-    src/Widgets/Grid.vala
-    src/Widgets/Switcher.vala
-    src/Widgets/SearchView.vala
-    src/Widgets/SearchItem.vala
-    src/Widgets/Sidebar.vala
-    src/Widgets/CategoryView.vala
-PACKAGES
-    ${CORE_DEPS}
-    ${UI_DEPS}
-    synapse-core
-    synapse-plugins
-CUSTOM_VAPIS
-    vapi/config.vapi
-OPTIONS
-    --thread
-    --target-glib=2.32
-    --vapidir=${CMAKE_BINARY_DIR}/lib/synapse-core
-    --vapidir=${CMAKE_BINARY_DIR}/lib/synapse-plugins
-    -g
-    ${UNITY_OPTIONS}
-    ${ZEITGEIST_OPTIONS}
-    ${PLANK_OPTIONS}
-)
-
-include_directories(${CMAKE_BINARY_DIR}/lib/synapse-core)
-include_directories(${CMAKE_BINARY_DIR}/lib/synapse-plugins)
-
-add_subdirectory(lib/synapse-core)
-add_subdirectory(lib/synapse-plugins)
-
-# Comment this out to enable C compiler warnings
-add_definitions (-w)
-
+
+# Synapse libraries
+include_directories (${CMAKE_BINARY_DIR}/lib/synapse-core)
+include_directories (${CMAKE_BINARY_DIR}/lib/synapse-plugins)
+
+# Link some libraries
 add_definitions (${DEPS_CFLAGS} -DGMENU_I_KNOW_THIS_IS_UNSTABLE -include config.h)
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})
 
-add_executable (${APPNAME} ${VALA_C})
-target_link_libraries(${APPNAME} m synapse-core synapse-plugins)
-
 # Installation
 install (TARGETS ${APPNAME} RUNTIME DESTINATION bin)
 install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
+file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
 
-#
-# GSettings Schema
-#
+# Settings schema
 include (GSettings)
 add_schema ("org.pantheon.desktop.slingshot.gschema.xml")
 
-# Translations
+# Directories
+add_subdirectory (lib/synapse-core)
+add_subdirectory (lib/synapse-plugins)
+add_subdirectory (src)
 add_subdirectory (po)
 
=== modified file 'lib/synapse-core/CMakeLists.txt'
--- lib/synapse-core/CMakeLists.txt	2014-07-03 06:38:42 +0000
+++ lib/synapse-core/CMakeLists.txt	2015-11-27 00:35:16 +0000
@@ -1,7 +1,8 @@
-set(CORE_LIB_VERSION 0.1)
-set(CORE_LIB_SOVERSION 0)
-set(CORE_LIBRARY_NAME synapse-core)
-set(CORE_PKG
+# Library information
+set (CORE_LIB_VERSION 0.1)
+set (CORE_LIB_SOVERSION 0)
+set (CORE_LIBRARY_NAME synapse-core)
+set (CORE_PKG
     glib-2.0
     zeitgeist-2.0
     gio-unix-2.0
@@ -10,9 +11,11 @@
     gtk+-3.0
 )
 
-pkg_check_modules(CORE_DEPS REQUIRED ${CORE_PKG})
+# Check for dependencies
+pkg_check_modules (CORE_DEPS REQUIRED ${CORE_PKG})
 
-set(CORE_SOURCE
+# Source files
+set (CORE_SOURCE
     common-actions.vala
     config-service.vala
     data-sink.vala
@@ -28,9 +31,8 @@
     volume-service.vala
 )
 
-set(LINK_MODE STATIC)
-
-vala_precompile(CORE_VALA_C ${CORE_LIBRARY_NAME}
+# Compile
+vala_precompile (CORE_VALA_C ${CORE_LIBRARY_NAME}
     ${CORE_SOURCE}
 PACKAGES
     ${CORE_PKG}
@@ -40,15 +42,17 @@
     ${CORE_LIBRARY_NAME}
 )
 
-add_definitions(${CORE_DEPS_CFLAGS} -include config.h -w)
-link_directories(${CORE_DEPS_LIBRARY_DIRS})
+# Some compiler flags
+add_definitions (${CORE_DEPS_CFLAGS} -fPIC -include config.h -w)
+link_directories (${CORE_DEPS_LIBRARY_DIRS})
 
-add_library(${CORE_LIBRARY_NAME} STATIC ${CORE_VALA_C})
+# Library
+add_library (${CORE_LIBRARY_NAME} STATIC ${CORE_VALA_C})
 target_link_libraries (${CORE_LIBRARY_NAME} ${CORE_DEPS_LIBRARIES})
 
-set_target_properties(${CORE_LIBRARY_NAME} PROPERTIES
+# Set some properties
+set_target_properties (${CORE_LIBRARY_NAME} PROPERTIES
     OUTPUT_NAME ${CORE_LIBRARY_NAME}
     VERSION ${CORE_LIB_VERSION}
     SOVERSION ${CORE_LIB_SOVERSION}
 )
-
 
=== modified file 'lib/synapse-plugins/CMakeLists.txt'
--- lib/synapse-plugins/CMakeLists.txt	2015-06-03 19:10:24 +0000
+++ lib/synapse-plugins/CMakeLists.txt	2015-11-27 00:35:16 +0000
@@ -1,7 +1,8 @@
-set(PLUGINS_LIB_VERSION 0.1)
-set(PLUGINS_LIB_SOVERSION 0)
-set(PLUGINS_LIBRARY_NAME synapse-plugins)
-set(PLUGINS_PKG
+# Library information
+set (PLUGINS_LIB_VERSION 0.1)
+set (PLUGINS_LIB_SOVERSION 0)
+set (PLUGINS_LIBRARY_NAME synapse-plugins)
+set (PLUGINS_PKG
     glib-2.0
     gio-unix-2.0
     gee-0.8
@@ -9,9 +10,11 @@
     switchboard-2.0
 )
 
-pkg_check_modules(PLUGINS_DEPS REQUIRED ${PLUGINS_PKG})
+# Check for dependencies
+pkg_check_modules (PLUGINS_DEPS REQUIRED ${PLUGINS_PKG})
 
-set(PLUGINS_SOURCE
+# Source files
+set (PLUGINS_SOURCE
     calculator-plugin.vala
     command-plugin.vala
     desktop-file-plugin.vala
@@ -19,9 +22,8 @@
     system-managment.vala
 )
 
-set(LINK_MODE STATIC)
-
-vala_precompile(PLUGINS_VALA_C ${PLUGINS_LIBRARY_NAME}
+# Compile
+vala_precompile (PLUGINS_VALA_C ${PLUGINS_LIBRARY_NAME}
     ${PLUGINS_SOURCE}
 PACKAGES
     ${PLUGINS_PKG}
@@ -34,17 +36,20 @@
     ${PLUGINS_LIBRARY_NAME}
 )
 
-add_definitions(${PLUGINS_DEPS_CFLAGS} -include config.h -w)
-link_directories(${PLUGINS_DEPS_LIBRARY_DIRS})
-include_directories(${CMAKE_BINARY_DIR}/lib/synapse-core)
-
-add_library(${PLUGINS_LIBRARY_NAME} STATIC ${PLUGINS_VALA_C})
-
-set_target_properties(${PLUGINS_LIBRARY_NAME} PROPERTIES
+# Compiler flags
+add_definitions (${PLUGINS_DEPS_CFLAGS} -fPIC -include config.h -w)
+link_directories (${PLUGINS_DEPS_LIBRARY_DIRS})
+include_directories (${CMAKE_BINARY_DIR}/lib/synapse-core)
+
+# Add library
+add_library (${PLUGINS_LIBRARY_NAME} STATIC ${PLUGINS_VALA_C})
+
+# Set some properties
+set_target_properties (${PLUGINS_LIBRARY_NAME} PROPERTIES
     OUTPUT_NAME ${PLUGINS_LIBRARY_NAME}
     VERSION ${PLUGINS_LIB_VERSION}
     SOVERSION ${PLUGINS_LIB_SOVERSION}
 )
 
+# Link libraries
 target_link_libraries (${PLUGINS_LIBRARY_NAME} ${PLUGINS_DEPS_LIBRARIES} synapse-core)
-
 
=== modified file 'src/Backend/DBusService.vala'
--- src/Backend/DBusService.vala	2013-12-26 00:08:04 +0000
+++ src/Backend/DBusService.vala	2015-11-27 00:35:16 +0000
@@ -66,4 +66,4 @@
         // Emit initial state
         service.on_view_visibility_change ();
     }
-}
 \ No newline at end of file
+}
 
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2015-11-27 00:35:16 +0000
@@ -0,0 +1,54 @@
+# Some dependencies
+set (CORE_DEPS "gobject-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;${UNITY_DEPS};${PLANK_DEPS};")
+set (UI_DEPS "gtk+-3.0>=3.12.0;granite;wingpanel-2.0;${ZEITGEIST_DEPS};")
+
+# Check for these dependencies
+pkg_check_modules (DEPS REQUIRED "${CORE_DEPS}${UI_DEPS}" gthread-2.0)
+
+# Compiling options
+vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
+    Slingshot.vala
+    SlingshotView.vala
+    Settings.vala
+    Utils.vala
+    Pixels.vala
+    Backend/AppSystem.vala
+    Backend/DBusService.vala
+    Backend/App.vala
+    Backend/RelevancyService.vala
+    Backend/SynapseSearch.vala
+    Widgets/AppEntry.vala
+    Widgets/Grid.vala
+    Widgets/Switcher.vala
+    Widgets/SearchView.vala
+    Widgets/SearchItem.vala
+    Widgets/Sidebar.vala
+    Widgets/CategoryView.vala
+PACKAGES
+    ${CORE_DEPS}
+    ${UI_DEPS}
+    synapse-core
+    synapse-plugins
+CUSTOM_VAPIS
+    ../vapi/config.vapi
+OPTIONS
+    --thread
+    --target-glib=2.32
+    --vapidir=${CMAKE_BINARY_DIR}/lib/synapse-core
+    --vapidir=${CMAKE_BINARY_DIR}/lib/synapse-plugins
+    -g
+    ${UNITY_OPTIONS}
+    ${ZEITGEIST_OPTIONS}
+    ${PLANK_OPTIONS}
+)
+
+add_definitions(${DEPS_CFLAGS})
+
+# Library
+add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES})
+
+target_link_libraries(${CMAKE_PROJECT_NAME} synapse-plugins)
+
+# Installation
+install (TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${PKGDATADIR})
 
=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2015-01-17 23:56:32 +0000
+++ src/Slingshot.vala	2015-11-27 00:35:16 +0000
@@ -16,92 +16,65 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-public class Slingshot.Slingshot : Granite.Application {
-
-    private SlingshotView view = null;
-    public static bool silent = false;
-    public static bool command_mode = false;
+public class Slingshot.Slingshot : Wingpanel.Indicator {
+
+    private SlingshotView? view = null;
+
+    private Gtk.Label? indicator_label = null;
 
     public static Settings settings { get; private set; default = null; }
-    //public static CssProvider style_provider { get; private set; default = null; }
     public static Gtk.IconTheme icon_theme { get; set; default = null; }
+
     private DBusService? dbus_service = null;
 
-    construct {
-
-        build_data_dir = Build.DATADIR;
-        build_pkg_data_dir = Build.PKGDATADIR;
-        build_release_name = Build.RELEASE_NAME;
-        build_version = Build.VERSION;
-        build_version_info = Build.VERSION_INFO;
-
-        program_name = "Slingshot";
-        exec_name = "slingshot-launcher";
-        app_copyright = "GPLv3";
-        app_icon = "";
-        app_launcher = "";
-        app_years = "2011-2012";
-        application_id = "net.launchpad.slingshot";
-        main_url = "https://launchpad.net/slingshot";
-        bug_url = "https://bugs.launchpad.net/slingshot";
-        help_url = "https://answers.launchpad.net/slingshot";
-        translate_url = "https://translations.launchpad.net/slingshot";
-
-        about_authors = {"Giulio Collura <[e-mail]>",
-                         "Andrea Basso <[e-mail]"};
-        about_artists = {"Harvey Cabaguio 'BassUltra' <[e-mail]>",
-                         "Daniel Foré <[e-mail]>"};
-        about_translators = "Launchpad Translators";
-        about_license_type = Gtk.License.GPL_3_0;
-
-    }
-
     public Slingshot () {
-        settings = new Settings ();
-    }
-
-    protected override void activate () {
-        if (get_windows () == null) {
+        Object (code_name: Wingpanel.Indicator.APP_LAUNCHER,
+        display_name: _("Slingshot"),
+        description:_("The app-menu indicator"));
+    }
+
+    void on_close_indicator () {
+        close ();
+    }
+
+    public override Gtk.Widget? get_widget () {
+        if (view == null) {
+            settings = new Settings ();
+
             view = new SlingshotView ();
-            view.set_application (this);
+
+            view.close_indicator.connect (on_close_indicator);
 
             if (dbus_service == null)
                 dbus_service = new DBusService (view);
-
-            if (!silent) {
-                view.show_slingshot ();
-            }
-        } else {
-            if (view.visible && !silent)
-                view.hide ();
-            else
-                view.show_slingshot ();
-        }
-        silent = false;
-    }
-
-    static const OptionEntry[] entries = {
-        { "silent", 's', 0, OptionArg.NONE, ref silent, "Launch Slingshot as a background process without it appearing visually.", null },
-        { "command-mode", 'c', 0, OptionArg.NONE, ref command_mode, "This feature is not implemented yet. When it is, description will be changed.", null },
-        { null }
-    };
-
-    public static int main (string[] args) {
-        if (args.length > 1) {
-            var context = new OptionContext ("");
-            context.add_main_entries (entries, "slingshot");
-            context.add_group (Gtk.get_option_group (true));
-            
-            try {
-                context.parse (ref args);
-            } catch (Error e) {
-                print (e.message + "\n");
-            }
-        }
-        
-        var app = new Slingshot ();
-
-        return app.run (args);
-    }
-
-}
+        }
+
+        return view;
+    }
+
+    public override Gtk.Widget get_display_widget () {
+        if (indicator_label == null)
+            indicator_label = new Gtk.Label ("Applications");
+
+        visible = true;
+
+        return indicator_label;
+    }
+
+    public override void opened () {
+        if (view != null)
+            view.show_slingshot ();
+    }
+
+    public override void closed () {
+        // TODO: Do we need to do anyhting here?
+    }
+
+}
+
+public Wingpanel.Indicator get_indicator (Module module) {
+    debug ("Activating Slingshot");
+    var indicator = new Slingshot.Slingshot ();
+    return indicator;
+}
+
 
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2015-02-01 15:13:15 +0000
+++ src/SlingshotView.vala	2015-11-27 00:35:16 +0000
@@ -24,8 +24,7 @@
         SEARCH_VIEW
     }
 
-    public class SlingshotView : Granite.Widgets.CompositedWindow {
-
+    public class SlingshotView : Gtk.Grid {
         // Widgets
         public Gtk.SearchEntry search_entry;
         public Gtk.Stack stack;
@@ -42,8 +41,6 @@
         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;
@@ -77,16 +74,11 @@
 
         private int primary_monitor = 0;
 
+        Gdk.Screen screen;
+        
+        public signal void close_indicator ();
+
         public SlingshotView () {
-
-            // Window properties
-            this.title = "Slingshot";
-            this.skip_pager_hint = true;
-            this.skip_taskbar_hint = 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);
 
@@ -98,6 +90,8 @@
             categories = app_system.get_categories ();
             apps = app_system.get_apps ();
 
+            screen = get_screen ();
+
             primary_monitor = screen.get_primary_monitor ();
             Gdk.Rectangle geometry;
             screen.get_monitor_geometry (primary_monitor, out geometry);
@@ -132,7 +126,7 @@
                 default_columns--;
             }
 
-            while ((calculate_grid_height () >= 2 * geometry.width / 3)) {
+            while ((calculate_grid_height () >= 2 * geometry.height / 3)) {
                 default_rows--;
             }
 
@@ -216,14 +210,7 @@
             event_box.add (container);
             // Add the container to the dialog's content area
 
-            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 ());
+            this.add (event_box);
 
             if (Slingshot.settings.use_category)
                 set_modality (Modality.CATEGORY_VIEW);
@@ -232,40 +219,12 @@
             debug ("Ui setup completed");
         }
 
-        public void grab_device () {
-            var display = Gdk.Display.get_default ();
-            var pointer = display.get_device_manager ().get_client_pointer ();
-            var keyboard = pointer.associated_device;
-            var keyboard_status = Gdk.GrabStatus.SUCCESS;
-
-            if (keyboard != null && keyboard.input_source == Gdk.InputSource.KEYBOARD) {
-                keyboard_status = keyboard.grab (get_window (), Gdk.GrabOwnership.NONE, true,
-                                                 Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK,
-                                                 null, Gdk.CURRENT_TIME);
-            }
-
-            var pointer_status = pointer.grab (get_window (), Gdk.GrabOwnership.NONE, true,
-                                               Gdk.EventMask.SMOOTH_SCROLL_MASK | Gdk.EventMask.BUTTON_PRESS_MASK |
-                                               Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.POINTER_MOTION_MASK,
-                                               null, Gdk.CURRENT_TIME);
-
-            if (pointer_status != Gdk.GrabStatus.SUCCESS || keyboard_status != Gdk.GrabStatus.SUCCESS)  {
-                // If grab failed, retry again. Happens when "Applications" button is long held.
-                Timeout.add (100, () => {
-                    if (visible)
-                        grab_device ();
-
-                    return false;
-                });
-            }
-        }
-
         public override bool button_press_event (Gdk.EventButton event) {
             var pointer = Gdk.Display.get_default ().get_device_manager ().get_client_pointer ();
 
             // get_window_at_position returns null if the window belongs to another application.
             if (pointer.get_window_at_position (null, null) == null) {
-                hide ();
+                close_indicator ();
 
                 return true;
             }
@@ -273,21 +232,6 @@
             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 ();
-
-            return false;
-        }
-
         private bool hotcorner_trigger (Gdk.EventMotion event) {
             if (can_trigger_hotcorner && event.x_root <= 0 && event.y_root <= 0) {
                 Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().ungrab (event.time);
@@ -309,11 +253,6 @@
             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);
@@ -322,7 +261,8 @@
             search_entry.grab_focus ();
             search_entry.activate.connect (search_entry_activated);
 
-            search_view.app_launched.connect (() => hide ());
+            // FIXME: signals chain up is not supported
+            search_view.app_launched.connect (() => { close_indicator (); });
 
             // This function must be after creating the page switcher
             populate_grid_view ();
@@ -353,18 +293,6 @@
                 if (Slingshot.settings.screen_resolution != @"$(geometry.width)x$(geometry.height)") {
                     setup_size ();
                 }
-                reposition ();
-            });
-            screen.monitors_changed.connect (() => {
-                reposition ();
-            });
-
-            get_style_context ().notify["direction"].connect (() => {
-                reposition ();
-            });
-
-            popover.hide.connect (() => {
-                hide ();
             });
 
             // check for change in gala settings
@@ -383,22 +311,6 @@
             }
         }
 
-        private void reposition () {
-            debug("Repositioning");
-
-            Gdk.Rectangle monitor_dimensions;
-            screen.get_monitor_geometry (this.screen.get_primary_monitor(), out monitor_dimensions);
-            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);
-            }
-        }
-
         private void change_view_mode (string key) {
             switch (key) {
                 case "1": // Normal view
@@ -413,7 +325,7 @@
         // Handle super+space when the user is typing in the search entry
         private bool search_entry_key_press (Gdk.EventKey event) {
             if ((event.keyval == Gdk.Key.space) && ((event.state & Gdk.ModifierType.SUPER_MASK) != 0)) {
-                hide ();
+                close_indicator ();
                 return true;
             }
 
@@ -425,16 +337,18 @@
                     return true;
             }
 
-            return false;
+            return on_key_press (event);
         }
 
         private void search_entry_activated () {
             if (modality == Modality.SEARCH_VIEW) {
                 if (search_view.launch_selected ())
-                    hide ();
+                    close_indicator ();
             } else {
+/* TODO
                 if (get_focus () as Widgets.AppEntry != null) // checking the selected widget is an AppEntry
                     ((Widgets.AppEntry) get_focus ()).launch_app ();
+*/
             }
         }
 
@@ -462,7 +376,7 @@
             switch (key) {
                 case "F4":
                     if ((event.state & Gdk.ModifierType.MOD1_MASK) != 0) {
-                        hide ();
+                        close_indicator ();
                     }
 
                     break;
@@ -471,7 +385,7 @@
                     if (search_entry.text.length > 0) {
                         search_entry.text = "";
                     } else {
-                        hide ();
+                        close_indicator ();
                     }
 
                     return true;
@@ -481,10 +395,12 @@
                 case "KP_Enter":
                     if (modality == Modality.SEARCH_VIEW) {
                         if (search_view.launch_selected ())
-                            hide ();
+                            close_indicator ();
                     } else {
+/* TODO
                         if (get_focus () as Widgets.AppEntry != null) // checking the selected widget is an AppEntry
                             ((Widgets.AppEntry)get_focus ()).launch_app ();
+*/
                     }
                     return true;
 
@@ -698,14 +614,12 @@
         public void show_slingshot () {
             search_entry.text = "";
 
-            reposition ();
-            show_all ();
-            popover.show_all ();
-            present ();
-
+/* TODO
             set_focus (null);
+*/
+
             search_entry.grab_focus ();
-            //This is needed in order to not animate if the previous view was the search view.
+            // This is needed in order to not animate if the previous view was the search view.
             view_selector_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
             stack.transition_type = Gtk.StackTransitionType.NONE;
             set_modality ((Modality) view_selector.selected);
@@ -826,7 +740,7 @@
             grid_view.clear ();
             foreach (Backend.App app in app_system.get_apps_by_name ()) {
                 var app_entry = new Widgets.AppEntry (app);
-                app_entry.app_launched.connect (() => hide ());
+                app_entry.app_launched.connect (() => close_indicator ());
                 grid_view.append (app_entry);
                 app_entry.show_all ();
             }
@@ -860,6 +774,7 @@
         }
 
         private void normal_move_focus (int delta_column, int delta_row) {
+/* TODO
             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;
@@ -891,6 +806,7 @@
                     grid_view.get_child_at (column_focus, 0).grab_focus ();
                 row_focus = 0;
             }
+*/
         }
 
         private void category_move_focus (int delta_column, int delta_row) {
@@ -944,6 +860,8 @@
             category_column_focus = 0;
             category_row_focus = 0;
         }
+        
+
     }
 
 }
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-11-03 15:36:28 +0000
+++ src/Widgets/AppEntry.vala	2015-11-27 00:35:16 +0000
@@ -118,7 +118,6 @@
         this.drag_end.connect ( () => {
             this.dragging = false;
             var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
-            ((SlingshotView)slingshot_app.active_window).grab_device ();
         });
 
         this.drag_data_get.connect ( (ctx, sel, info, time) => {
@@ -162,7 +161,6 @@
         // 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 ();
         });
 
         foreach (var action in application.actions) {
 
=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2015-01-17 23:56:32 +0000
+++ src/Widgets/CategoryView.vala	2015-11-27 00:35:16 +0000
@@ -96,7 +96,7 @@
 
     private void add_app (Backend.App app) {
         var app_entry = new AppEntry (app);
-        app_entry.app_launched.connect (() => view.hide ());
+        app_entry.app_launched.connect (() => view.close_indicator ());
         app_view.append (app_entry);
         app_view.show_all ();