Merge lp:~brandontschaefer/unity/no-launcher-delay-when-dash-opens into lp:unity

[Brandon Schaefer]

Show the launcher when the dash is opening with out relaying on ubus.

=== Problem ===
When the launcher is set to auto hide. Then the Dash was opened the launcher would delay in showing at times. This is caused by Ubus by async.

=== Fix ===
Show the launcher as the dash is being open with out doing any ubus calls.

=== Tests ===
Manual tests...

*NOTE* before this gets merged it must be tested on a low-spec machine to confirm it will cause the dash futher problems when opening.

[Michal Hruby (mhr3)]

Doesn't this make opening dash super slow on low-spec machines? The ubus message has idle priority, so launcher redraws will be prioritized and therefore the dash will actually open much later than it does now? (which is already very bad on slow machines)

[Brandon Schaefer (brandontschaefer)]

Thank you for pointing this out.

As we have talked, the real fix would be getting ubus to have a way to sort out the priority of messages.

If someone has a low spec pc and is able to test this branch out and confirm it makes the dash even worse, then reject this branch.

[Omer Akram (om26er)]

Tested, this does seem to work fine on a slow machine that I have. I have not noticed any lag in dash opening than there already is.

review: Approve (functional)

Unmerged revisions

2680. By Brandon Schaefer on 2012-09-11

* The launcher now opens with the dash, instead of relying on UBUS to send the message quick enough.
* Also replaced should with must in the dash manual tests.

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-09-04 15:56:50 +0000
+++ launcher/Launcher.cpp	2012-09-11 23:32:20 +0000
@@ -1216,30 +1216,36 @@
 
   if (overlay_monitor == monitor())
   {
-    if (identity == "dash")
-    {
-      _dash_is_open = true;
-      _hide_machine.SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
-      _hover_machine.SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
-    }
-    if (identity == "hud")
-    {
-      _hud_is_open = true;
-    }
-    bg_effect_helper_.enabled = true;
-    // Don't desaturate icons if the mouse is over the launcher:
-    if (!_hovered)
-    {
-      LOG_DEBUG(logger) << "Desaturate on monitor " << monitor();
-      DesaturateIcons();
-    }
-
-    if (_icon_under_mouse)
-      _icon_under_mouse->HideTooltip();
+    OverlayIsOpening(identity);
   }
   EnsureAnimation();
 }
 
+void Launcher::OverlayIsOpening(const std::string& identity)
+{
+  if (identity == "dash" && !_dash_is_open)
+  {
+    _dash_is_open = true;
+    _hide_machine.SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
+    _hover_machine.SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
+  }
+  else if (identity == "hud")
+  {
+    _hud_is_open = true;
+  }
+  bg_effect_helper_.enabled = true;
+
+  // Don't desaturate icons if the mouse is over the launcher:
+  if (!_hovered)
+  {
+    LOG_DEBUG(logger) << "Desaturate on monitor " << monitor();
+    DesaturateIcons();
+  }
+
+  if (_icon_under_mouse)
+    _icon_under_mouse->HideTooltip();
+}
+
 void Launcher::OnOverlayHidden(GVariant* data)
 {
   // check the type of overlay

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-09-01 14:00:19 +0000
+++ launcher/Launcher.h	2012-09-11 23:32:20 +0000
@@ -80,6 +80,8 @@
   void ForceReveal(bool force);
   void ShowShortcuts(bool show);
 
+  void OverlayIsOpening(const std::string& identity);
+
   void SetModel(LauncherModel::Ptr model);
   LauncherModel::Ptr GetModel() const;
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-09-04 16:40:30 +0000
+++ launcher/LauncherController.cpp	2012-09-11 23:32:20 +0000
@@ -726,6 +726,7 @@
 
 void Controller::Impl::SendHomeActivationRequest()
 {
+  CurrentLauncher()->OverlayIsOpening("dash");
   ubus.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", "home.lens", dash::NOT_HANDLED, ""));
 }
 

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-08-28 12:23:15 +0000
+++ manual-tests/Dash.txt	2012-09-11 23:32:20 +0000
@@ -22,7 +22,7 @@
 #. Tap the Super key again. Verify the Dash is hidden again.
 
 Expected Result:
-  The Dash should appear and disappear in response to each tap on the Super
+  The Dash must appear and disappear in response to each tap on the Super
   key. Note that a tap is anything faster than 1/4 of a second. Any press
   that lasts longer than that is not considered a tap.
 
@@ -55,8 +55,8 @@
 #. Type an arbitrary search string
 
 Expected Result:
-  If the search is taking more than ~150ms, a spinner should be animating next
-  to the search bar, once the spinner stops spinning the results shouldn't
+  If the search is taking more than ~150ms, a spinner must be animating next
+  to the search bar, once the spinner stops spinning the results must not
   change.
 
 
@@ -68,14 +68,14 @@
 
 Actions:
 #. Start guest session
-#. Open the Dash - there shouldn't be any results displayed, since this user
+#. Open the Dash - there must be any results displayed, since this user
    account didn't interact with anything yet
 #. Run an application not present in the launcher (for example gedit)
 #. Close previously opened application
 
 Expected Result:
-  When Dash is opened 'gedit' (or application you launched) should be
-  displayed in the "Recent Apps" category. You shouldn't see
+  When Dash is opened 'gedit' (or application you launched) must be
+  displayed in the "Recent Apps" category. You must not see
   "Sorry nothing matches your search" text.
 
 
@@ -91,7 +91,7 @@
  * Search for something on your system that returns multiple results (more than the number that can fit in a row)
    yet all results are in one category only. This differs per system; try searching for "gnome" in the home lens, or "kde"
    in the app lens. 
- * Multiple results should be returned in both the cases, but if searching for "gnome" on the home lens returns folders in addition to apps
+ * Multiple results must be returned in both the cases, but if searching for "gnome" on the home lens returns folders in addition to apps
    or "kde" returns results from two categories in the apps lens, then keep experimenting with other search strings.
  * When you have at least one situation in which results from only one category are returned, and the number of results are enough to overflow one single row,
    the test is complete.
@@ -100,6 +100,20 @@
  * When a single row of results isn't enough to contain all returned search results, and there are no other category headers, the displayed category
    header expands automatically
 
+Launcher opens with the Dash when set to autohide
+-------------------------------------------------
+This tests that the Launcher opens with the Dash when set to autohide.
+
+Setup:
+#. Go in CompizConfig Manager and set the Launcher to Autohide.
+
+Actions:
+#. Open the Dash.
+
+Expected result:
+  The Launcher must open with the Dash smoothly. Instead of lazily showing.
+
+
 Filter Results Tests
 ========================
 These tests show that the dash "All" button works well.
@@ -115,7 +129,7 @@
 #. Open app lens, and the "Filter results" sidebar
 
 Expected Result:
-  "All" should be selected by default in every filter category.
+  "All" must be selected by default in every filter category.
 
 Test "All" Button 2
 Note: Should be automated
@@ -129,7 +143,7 @@
 #. Try to activate it.
 
 Expected Result:
-  Click on it should do nothing.
+  Click on it must do nothing.
 
 
 Test "All" Button 3
@@ -144,7 +158,7 @@
 #. Select another item in the filter category.
 
 Expected Result:
-  The all button should automatically toggle to the un-selected state.
+  The all button must automatically toggle to the un-selected state.
 
 Test "All" Button 4
 Note: Should be automated
@@ -158,7 +172,7 @@
 #. Deselect all selected items.
 
 Expected Result:
-  The all button should automatically toggle to the selected state.
+  The all button must automatically toggle to the selected state.
 
 Test Expand/Collapse Filters
 -------------------------------
@@ -176,8 +190,8 @@
 #. Click on the arrow (again).
 
 Expected Result:
-  When clicking for the first time the filter category should collapse.
-  When clicking for the second time the filter category should expand.
+  When clicking for the first time the filter category must collapse.
+  When clicking for the second time the filter category must expand.
 
 
 Drag and drop tests
@@ -194,8 +208,8 @@
 
 Expected Result:
   As you drag the document-file watch the drag-targets (drop-recepticals) saturate.
-  this saturation-process should be smooth and without flicker.
-  The tinting of the non-drag-targets should not change.
+  this saturation-process must be smooth and without flicker.
+  The tinting of the non-drag-targets must not change.
 
 
 Dash to Launcher document-file drag
@@ -209,7 +223,7 @@
 #. Drag any music file into the Firefox icon on the launcher.
 
 Expected Result:
-  The Dash should close and the music file should open up in Firefox.
+  The Dash must close and the music file must open up in Firefox.
 
 
 DnD stacking
@@ -244,7 +258,7 @@
 #. Open the dash and search for something (for example "gedit")
 
 Expected Result:
-  Applications lens should automatically restart and gedit should be visible
+  Applications lens must automatically restart and gedit must be visible
   in the results.
 
 
@@ -261,14 +275,14 @@
 press the super key and/or show the dash)
 2. Verify the lensees are not running using the following command:
 $ ps axf|grep [u]nity-lens
-Output of this command should be empty
+Output of this command must be empty
 3. invoke dash (e.g. by pressing the Super key)
 4. Verify the lenses were started by using the following command:
 $ ps axf|grep [u]nity-lens
 
 Expected Result:
-  Step #2 should produce an empty output.
-  Step #4 should produce something like this:
+  Step #2 must produce an empty output.
+  Step #4 must produce something like this:
   $ ps axf|grep [u]nity-lens
     2754 ?        Sl     0:00 /usr/lib/unity-lens-applications/unity-applications-daemon
     2756 ?        Sl     0:00 /usr/lib/unity-lens-files/unity-files-daemon