Merge lp:~townsend/unity/fix-lp1179210-7.1 into lp:unity/7.1

[Christopher Townsend]

In low graphics mode, only draw the Launcher background as needed instead of all of the time, even if the Launcher is hidden. Backport from lp:unity.

= Issue =
When using low graphics and the Launcher is hidden, the background color of the Launcher is always drawn on the screen causing an ugly artefact.

= Fix =
Instead of always drawing the background, only draw the background as needed in the same manner as the normal graphic mode does it.

= Test =
Restart Unity in low graphics mode by doing this: UNITY_LOW_GFX_MODE=1 setsid unity

Note: This is a backport from lp:unity.

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-10-04 03:55:52 +0000
+++ launcher/Launcher.cpp	2013-11-12 19:26:58 +0000
@@ -1735,12 +1735,6 @@
 
   nux::Color clear_colour = nux::Color(0x00000000);
 
-  if (Settings::Instance().GetLowGfxMode())
-  {
-    clear_colour = options()->background_color;
-    clear_colour.alpha = 1.0f;
-  }
-
   // clear region
   GfxContext.PushClippingRectangle(base);
   gPainter.PushDrawColorLayer(GfxContext, base, clear_colour, true, ROP);
@@ -1873,6 +1867,12 @@
       gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
     }
   }
+  else
+  {
+    nux::Color color = options()->background_color;
+    color.alpha = 1.0f;
+    gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
+  }
 
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);