Merge lp:~davidgomes/slingshot/open-on-mouse-option into lp:~elementary-pantheon/slingshot/trunk

[David Gomes]

Fixed bug #897443, it needs "sudo make install", because it changes the schema file.

=== modified file 'org.elementary.slingshot.gschema.xml'
--- org.elementary.slingshot.gschema.xml	2011-10-09 13:52:23 +0000
+++ org.elementary.slingshot.gschema.xml	2012-01-02 16:42:33 +0000
@@ -19,6 +19,11 @@
             <default>true</default>
             <summary>Show the category switcher or not</summary>
             <description>This value handles the category switcher.</description>
+          </key>
+        <key name="open-on-mouse" type="b">
+            <default>false</default>
+            <summary>Open on mouse position.</summary>
+            <description>Whether Slingshot should open on mouse position or not.</description>
         </key>
 	</schema>
 </schemalist>

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2011-10-09 13:52:23 +0000
+++ src/Settings.vala	2012-01-02 16:42:33 +0000
@@ -1,17 +1,17 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-//  
+//
 //  Copyright (C) 2011 Giulio Collura
-// 
+//
 //  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/>.
 //
@@ -26,6 +26,7 @@
         public int rows { get; set; }
         public int icon_size { get; set; }
         public bool show_category_filter { get; set; }
+        public bool open_on_mouse { get; set; }
 
         public Settings () {
             base ("desktop.pantheon.slingshot");

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2011-11-27 16:25:34 +0000
+++ src/SlingshotView.vala	2012-01-02 16:42:33 +0000
@@ -91,7 +91,7 @@
             // Have the window in the right place
             read_settings (true);
             height_request = default_rows * 145 + 180;
-            
+
             Slingshot.icon_theme = IconTheme.get_default ();
 
             app_system = new AppSystem ();
@@ -160,7 +160,7 @@
             bottom.pack_end (new Label (""), true, true, 0); // A fake label
 
             container.pack_start (Utils.set_padding (top, 12, 12, 12, 12), false, true, 0);
-            container.pack_start (Utils.set_padding (center, 0, 12, 12, 12), 
+            container.pack_start (Utils.set_padding (center, 0, 12, 12, 12),
                                                      true, true, 0);
             container.pack_end (Utils.set_padding (bottom, 0, 24, 12, 24), false, true, 0);
 
@@ -425,7 +425,7 @@
         }
 
         public void hide_slingshot () {
-            
+
             // Show the first page
             searchbar.text = "";
 
@@ -438,7 +438,11 @@
 
         public void show_slingshot () {
 
-            move_to_coords (0, 0);
+            if (Slingshot.settings.open_on_mouse)
+                window_position = WindowPosition.MOUSE;
+            else
+                move_to_coords (0, 0);
+
             show_all ();
             set_modality ((Modality) view_selector.selected);
 
@@ -479,7 +483,7 @@
 
             // Avoid unexpected behavior
             if (modality != Modality.NORMAL_VIEW)
-                return;            
+                return;
 
             if ((- current_position) < (grid_view.n_columns*130)) {
                 int count = 0;
@@ -494,7 +498,7 @@
                     current_position -= val;
                     count += val;
                     return true;
-                    
+
                 }, Priority.DEFAULT_IDLE);
             }
 
@@ -553,7 +557,7 @@
                     view_manager.move (category_view, columns*130, 0);
                     view_manager.move (search_view, 0, 0); // Show the searchview
                     return;
-            
+
             }
 
         }
@@ -564,7 +568,7 @@
                 set_modality ((Modality) view_selector.selected);
                 return;
             }
-            
+
             if (modality != Modality.SEARCH_VIEW)
                 set_modality (Modality.SEARCH_VIEW);
             search_view_position = 0;