Merge lp:~bregma/unity/lp-1241757-trusty into lp:unity/7.2

[Stephen M. Webb]

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

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

Cherry-picked from Unity trunk.

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2013-09-24 20:40:09 +0000
+++ unity-shared/BGHash.cpp	2015-03-11 21:00:11 +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	2015-03-11 21:00:11 +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: