Merge lp:~hikiko/unity/unity.showdesktop into lp:unity

[Eleni Maria Stea]

speeds up the showdesktop plugin in lowgfx mode

speeds up the showdesktop plugin in lowgfx mode

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

Ok!

review: Approve

=== modified file 'plugins/unityshell/src/UnityShowdesktopHandler.cpp'
--- plugins/unityshell/src/UnityShowdesktopHandler.cpp	2012-11-15 20:03:17 +0000
+++ plugins/unityshell/src/UnityShowdesktopHandler.cpp	2016-07-04 11:38:00 +0000
@@ -21,6 +21,7 @@
 
 #include <glib.h>
 #include "UnityShowdesktopHandler.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -99,7 +100,7 @@
     return;
 
   state_ = ShowdesktopHandler::StateFadeOut;
-  progress_ = 0.0f;
+  progress_ = unity::Settings::Instance().GetLowGfxMode() ? 1.0f : 0.0f;
 
   was_hidden_ = showdesktop_handler_window_interface_->Hidden();
 
@@ -143,7 +144,7 @@
 
   if (state_ == ShowdesktopHandler::StateFadeOut)
   {
-    progress_ += inc;
+    progress_ = unity::Settings::Instance().GetLowGfxMode() ? 1.0f : progress_ + inc;
     if (progress_ >= 1.0f)
     {
       progress_ = 1.0f;
@@ -152,7 +153,7 @@
   }
   else if (state_ == StateFadeIn)
   {
-    progress_ -= inc;
+    progress_ = unity::Settings::Instance().GetLowGfxMode() ? 0.0f : progress_ - inc;
     if (progress_ <= 0.0f)
     {
       progress_ = 0.0f;