Merge lp:~unity-team/unity/autohide-load-934514 into lp:unity

[Bilal Akhtar]

LauncherController: Don't hide the launcher for 3 seconds after it finishes loading on login (LP: #934513)

Fixes bug #934513 by ensuring the launcher doesn't start hidden, but instead hides 3 seconds after starting up (when autohide is enabled, that is).

[Tim Penhey (thumper)]

Do we care about the situation where someone has autohide enabled, and moves the mouse over the launcher within the first three seconds of being logged in?

review: Needs Information

[Bilal Akhtar (bilalakhtar)]

Yes, this works. I just re-built and re-tested it, and if the user moves the mouse over the launcher, the ForceReveal(false) does nothing until the mouse moves away from the launcher.

[Tim Penhey (thumper)]

OK. Since this is a "start unity" type test, can I get you to write a manual test for it?

review: Needs Fixing

[Tim Penhey (thumper)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Marco Trevisan (Treviño) (3v1n0)]

 auto hide_all_launchers = [&]()
10 + {
11 + for (auto launcher : launchers)
12 + launcher->ForceReveal(false);
13 + return true;
14 + };
15 + sources_.AddTimeout(3000, hide_all_launchers);

Whi is this timeout always running every 3 seconds?
I'm not sure this is really needed (or a good thing).

Also, probably you could add a sort of unit tests in test_launcher_controller (checking if the force-reveal quirk is correctly set on the launcher's hide machine)...

[Tim Penhey (thumper)]

Marco, could you provide more of a guideline for an automated test?

review: Needs Information

[Bilal Akhtar (bilalakhtar)]

Marco, the test doesn't run every three seconds. Once the "return true" call is reached, the timeout stops running. So it runs only once.

[Bilal Akhtar (bilalakhtar)]

Actually, I was wrong. I need to return false rather than true. Change made.

[lp:~unity-team/unity/autohide-load-934514]

2533. By Bilal Akhtar on 2012-08-28

Change "return true" to "return false" to destroy timeout

[Thomi Richards (thomir-deactivatedaccount)]

Has conflicts with trunk. needs re-merging.

[lp:~unity-team/unity/autohide-load-934514]

2534. By Bilal Akhtar on 2012-09-04

Merge from trunk and fix conflicts

[Bilal Akhtar (bilalakhtar)]

Re-merged, fixed conflicts.

[Marco Trevisan (Treviño) (3v1n0)]

Are 3 seconds enough when loading unity on startup? Couldn't this timeout happen when the interface is still loading?

PS: You can use AddTimeoutSeconds and maybe reduce the timeout priority.

[Bilal Akhtar (bilalakhtar)]

Not sure; John preferred to go for 3 seconds (see the description of the linked bug report).

[Thomi Richards (thomir-deactivatedaccount)]

From a quality POV, I'm happy that this code is merged with only a manual test.

review: Approve (quality)

Unmerged revisions

2534. By Bilal Akhtar on 2012-09-04

Merge from trunk and fix conflicts

2533. By Bilal Akhtar on 2012-08-28

Change "return true" to "return false" to destroy timeout

2532. By Bilal Akhtar on 2012-08-08

Add manual test for login autohide change

2531. By Bilal Akhtar on 2012-08-08

Merge from trunk

2530. By Bilal Akhtar on 2012-07-31

Don't hide the launcher for 3 seconds after it finishes loading on login (LP: #934513)

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-30 21:09:02 +0000
+++ launcher/LauncherController.cpp	2012-09-04 08:17:19 +0000
@@ -173,6 +173,15 @@
       launcher->QueueDraw();
   });
 
+  // Hide launcher after 3 seconds
+  auto hide_all_launchers = [&]()
+  {
+      for (auto launcher : launchers)
+          launcher->ForceReveal(false);
+      return false;
+  };
+  sources_.AddTimeout(3000, hide_all_launchers);
+
   dbus_owner_ = g_bus_own_name(G_BUS_TYPE_SESSION, DBUS_NAME.c_str(), G_BUS_NAME_OWNER_FLAGS_NONE,
                                OnBusAcquired, nullptr, nullptr, this, nullptr);
 }
@@ -219,6 +228,7 @@
     launchers[i]->monitor(monitor);
     launchers[i]->Resize();
     edge_barriers_.Subscribe(launchers[i].GetPointer(), launchers[i]->monitor);
+    launchers[i]->ForceReveal(true);
   }
 
   for (unsigned int i = last_launcher; i < launchers_size; ++i)
 
=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-09-03 00:07:32 +0000
+++ manual-tests/Launcher.txt	2012-09-04 08:17:19 +0000
@@ -703,6 +703,25 @@
  * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.
 
 
+Test launcher autohide on login
+------------------------------------
+
+Setup:
+ * Ensure launcher autohide is enabled.
+
+Action:
+ * Log into Unity
+ * Immediately after the launcher loads, move the mouse over it
+ * Keep mouse over launcher for more than three seconds
+ * Move mouse away from launcher
+
+Expected results:
+ * The launcher loads in a revealed (not hidden) state.
+ * If the user takes no action, the launcher hides after three seconds
+ * Moving the mouse over the launcher prevents the launcher from hiding
+ * After the user moves the mouse away, the launcher hides
+
+
 Stop SD card by dragging it's icon to trash
 ---------------------------------------------------