Merge lp:~tombeckmann/slingshot/faster-start into lp:~elementary-pantheon/slingshot/trunk

[Tom Beckmann]

This branch tries to speed up the start of slingshot. I removed/moved some things which could potentially lead to focus problems. However, I did not encounter any while testing.

One thing that still has to be done here is the reposition() call. I placed a temporary initial variable there, but we certainly need to connect to some signal instead.

Unmerged revisions

366. By Tom Beckmann on 2013-06-20

remove benchmark stuff

365. By Tom Beckmann on 2013-06-20

fix previous commit

364. By Tom Beckmann on 2013-06-20

further improvements

363. By Tom Beckmann on 2013-06-20

Make sure we don't call set_modality when it's not needed

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-06-12 21:40:45 +0000
+++ src/SlingshotView.vala	2013-06-20 16:19:06 +0000
@@ -87,6 +87,8 @@
         private int category_column_focus = 0;
         private int category_row_focus = 0;
 
+		private Wnck.Window? wnck_window;
+
         public SlingshotView () {
 
             // Window properties
@@ -537,26 +539,35 @@
 
         }
 
+		bool initial = true;
         public void show_slingshot () {
-
             searchbar.text = "";
 
-            reposition ();
-            show_all ();
-            present ();
+			if (initial) {
+				reposition ();
+				initial = false;
+			}
+
+            show ();
 
             set_focus(null);
             searchbar.grab_focus ();
+
             set_modality ((Modality) view_selector.selected);
 
-            while (Gtk.events_pending ())
-                Gtk.main_iteration ();
+			if (wnck_window == null) {
+				while (Gtk.events_pending ())
+					Gtk.main_iteration ();
+				Wnck.Screen.get_default ().force_update ();
+				var xid = Gdk.X11Window.get_xid (this.get_window ());
+				wnck_window = Wnck.Window.get (xid);
+			}
 
-            var xid = Gdk.X11Window.get_xid (this.get_window ());
-            var w = Wnck.Window.get (xid);
-            Wnck.Screen.get_default ().force_update ();
-            if (w != null)
-                w.activate (Gdk.x11_get_server_time (this.get_window ()));
+            if (wnck_window != null) {
+				// FIXME Gdk.CURRENT_TIME is faster, but may produce problems
+				// switch back to the proper if that's the case
+                wnck_window.activate (Gdk.CURRENT_TIME);
+			}
 		}
 
         private void move_page (int step) {
@@ -611,6 +622,9 @@
 
         private void set_modality (Modality new_modality) {
 
+			if (modality == new_modality)
+				return;
+
             modality = new_modality;
 
             switch (modality) {