Merge lp:~3v1n0/unity/fading-launcher-autohide-dash into lp:unity

[Marco Trevisan (Treviño)]

Launcher: only fade the launcher when in auto-hide and dash is opened

Only fade the launcher when is in auto-hide mode and the dash is shown (in general via super key).
Also reduce the animation duration in this case to match the one of the dash.

John approved this visual change.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3495
http://jenkins.qa.ubuntu.com/job/unity-ci/344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/232/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/344/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

I think the visuals definitely look better and the fade in works. However, I see the Dash fade in first and then a split second later, I see the Launcher fade in into the space where the Launcher should be. I'm not sure if this intended behavior, but to me, it would be more visually appealing if the Dash and the Launcher faded in at the same time. If this is intended behavior, just let me know, and I'll approve this since it works and the code is good.

review: Needs Information

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

> I think the visuals definitely look better and the fade in works. However, I
> see the Dash fade in first and then a split second later, I see the Launcher
> fade in into the space where the Launcher should be. I'm not sure if this
> intended behavior, but to me, it would be more visually appealing if the Dash
> and the Launcher faded in at the same time. If this is intended behavior,
> just let me know, and I'll approve this since it works and the code is good.

Mh, I didn't notice that on my main monitor, but it happens on the secondary one....
The main cause for that is due to the fact that we're using different animation approaches on these views, and this leads to different times.

However, using the nux::Animator for this task seems doable in the launcher as well, and so that's what I've done now.

[Christopher Townsend (townsend)]

Awesome, I think this looks better. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3496
http://jenkins.qa.ubuntu.com/job/unity-ci/347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/234
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/235/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/347/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-09-11 16:47:48 +0000
+++ launcher/Launcher.cpp	2013-09-12 10:41:30 +0000
@@ -159,6 +159,7 @@
   , _last_reveal_progress(0.0f)
   , _drag_action(nux::DNDACTION_NONE)
   , _selection_atom(0)
+  , dash_showing_animation_(90)
   , icon_renderer(std::make_shared<ui::IconRenderer>())
 {
   m_Layout = new nux::HLayout(NUX_TRACKER_LOCATION);
@@ -1052,9 +1053,12 @@
   *launcher_alpha = 1.0f;
   if (options()->hide_mode != LAUNCHER_HIDE_NEVER || _hide_machine.GetQuirk(LauncherHideMachine::LOCK_HIDE))
   {
-
     float autohide_progress = AutohideProgress(current) * (1.0f - DragOutProgress(current));
-    if (options()->auto_hide_animation() == FADE_ONLY)
+    if (_dash_is_open)
+    {
+      *launcher_alpha = dash_showing_animation_.GetCurrentValue();
+    }
+    else if (options()->auto_hide_animation() == FADE_ONLY)
     {
       *launcher_alpha = 1.0f - autohide_progress;
     }
@@ -1259,6 +1263,9 @@
       _dash_is_open = true;
       _hide_machine.SetQuirk(LauncherHideMachine::PLACES_VISIBLE, true);
       _hover_machine.SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, true);
+
+      if (options()->hide_mode != LAUNCHER_HIDE_NEVER)
+        dash_showing_animation_.SetStartValue(0.0f).SetFinishValue(1.0f).Start();
     }
     if (identity == "hud")
     {
@@ -1299,9 +1306,10 @@
   {
     if (identity == "dash")
     {
+      _dash_is_open = false;
       _hide_machine.SetQuirk(LauncherHideMachine::PLACES_VISIBLE, false);
       _hover_machine.SetQuirk(LauncherHoverMachine::PLACES_VISIBLE, false);
-      _dash_is_open = false;
+      dash_showing_animation_.Stop();
     }
     else if (identity == "hud")
     {

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2013-09-11 16:47:48 +0000
+++ launcher/Launcher.h	2013-09-12 10:41:30 +0000
@@ -24,6 +24,7 @@
 #include <Nux/View.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/TimerProc.h>
+#include <NuxCore/Animation.h>
 #include <NuxGraphics/GestureEvent.h>
 #ifndef USE_GLES
 # include <NuxGraphics/IOpenGLAsmShader.h>
@@ -408,6 +409,7 @@
   BaseTexturePtr launcher_sheen_;
   BaseTexturePtr launcher_pressure_effect_;
 
+  nux::animation::AnimateValue<double> dash_showing_animation_;
   ui::AbstractIconRenderer::Ptr icon_renderer;
   BackgroundEffectHelper bg_effect_helper_;