Merge lp:~ivonunes/slingshot/slingshot-focus into lp:~elementary-pantheon/slingshot/trunk

[Cody Garver]

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2012-06-21 14:22:15 +0000
+++ src/Slingshot.vala	2012-06-24 19:02:18 +0000
@@ -92,7 +92,7 @@
                 }
             } else {
                 if (view.visible && !silent)
-                    view.hide_slingshot ();
+                    view.focus_out ();
                 else
                     view.show_slingshot ();
             }

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-06-20 22:54:03 +0000
+++ src/SlingshotView.vala	2012-06-24 19:02:18 +0000
@@ -224,7 +224,7 @@
         private void connect_signals () {
 
             this.focus_out_event.connect (() => {
-                this.hide_slingshot();
+                this.focus_out();
                 return false;
             });
 
@@ -301,7 +301,7 @@
             switch (Gdk.keyval_name (event.keyval)) {
 
                 case "Escape":
-                    hide_slingshot ();
+                    focus_out ();
                     return true;
 
                 case "Return":
@@ -589,7 +589,20 @@
             // Show the first page
             searchbar.text = "";
 
+            set_opacity (0);
+
+            // grab_remove ((Widget) this);
+		    // get_current_event_device ().ungrab (Gdk.CURRENT_TIME);
+
+        }
+
+        public void focus_out () {
+
+            // Show the first page
+            searchbar.text = "";
+
             hide ();
+            set_opacity (1);
 
             // grab_remove ((Widget) this);
 		    // get_current_event_device ().ungrab (Gdk.CURRENT_TIME);