Merge lp:~azzar1/unity/fix-1241757 into lp:unity

[Andrea Azzarone]

skipped the animation of BGHash on startup to prevent unwanted fade-in

[Andrea Azzarone (azzar1)]

Skip the animation of BGHash on startup.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3894
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1241757/+merge/244423/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

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

Looks good.

You might also have used animation::Skip from AnimationUtils, but this is fine as well.

review: Approve

=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2013-09-24 20:40:09 +0000
+++ unity-shared/BGHash.cpp	2014-12-11 12:55:29 +0000
@@ -44,7 +44,7 @@
   COLORS_ATOM = gdk_x11_get_xatom_by_name("_GNOME_BACKGROUND_REPRESENTATIVE_COLORS");
   transition_animator_.updated.connect(sigc::mem_fun(this, &BGHash::OnTransitionUpdated));
   WindowManager::Default().average_color = unity::colors::Aubergine;
-  RefreshColor();
+  RefreshColor(/* skip_animation */ true);
 }
 
 uint64_t BGHash::ColorAtomId() const
@@ -58,11 +58,11 @@
   RefreshColor();
 }
 
-void BGHash::RefreshColor()
+void BGHash::RefreshColor(bool skip_animation)
 {
   if (override_color_.alpha > 0.0f)
   {
-    TransitionToNewColor(override_color_);
+    TransitionToNewColor(override_color_, skip_animation);
     return;
   }
 
@@ -99,19 +99,25 @@
   {
     gdk_rgba_parse(&color_gdk, colors);
     nux::Color new_color(color_gdk.red, color_gdk.green, color_gdk.blue, 1.0f);
-    TransitionToNewColor(MatchColor(new_color));
+    TransitionToNewColor(MatchColor(new_color), skip_animation);
   }
 
   XFree(colors);
 }
 
-void BGHash::TransitionToNewColor(nux::color::Color const& new_color)
+void BGHash::TransitionToNewColor(nux::color::Color const& new_color, bool skip_animation)
 {
   auto const& current_color = WindowManager::Default().average_color();
   LOG_DEBUG(logger) << "transitioning from: " << current_color.red << " to " << new_color.red;
 
   transition_animator_.Stop();
-  transition_animator_.SetStartValue(current_color).SetFinishValue(new_color).Start();
+  transition_animator_.SetStartValue(current_color)
+                      .SetFinishValue(new_color)
+                      .SetDuration(skip_animation ? 0 : TRANSITION_DURATION)
+                      .Start();
+
+  // This will make sure that the animation starts even if the screen is idle.
+  nux::GetWindowThread()->RequestRedraw();
 }
 
 void BGHash::OnTransitionUpdated(nux::Color const& new_color)

=== modified file 'unity-shared/BGHash.h'
--- unity-shared/BGHash.h	2013-09-24 20:14:21 +0000
+++ unity-shared/BGHash.h	2014-12-11 12:55:29 +0000
@@ -37,12 +37,12 @@
 
     nux::Color CurrentColor() const;
     uint64_t ColorAtomId() const;
-    void RefreshColor();
+    void RefreshColor(bool skip_animation = false);
     void OverrideColor(nux::Color const& color);
 
   private:
     void OnTransitionUpdated(nux::Color const& new_color);
-    void TransitionToNewColor(nux::Color const& new_color);
+    void TransitionToNewColor(nux::Color const& new_color, bool skip_animation = false);
     nux::Color MatchColor(nux::Color const& base_color) const;
 
   private: