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

[Andrea Azzarone]

Add a ccsm option to change launcher opacity. the default value is 0.6667, about 0xAA (current default value).

[Marco Biscaro (marcobiscaro2112)]

Everything looks good.

Just one comment: an option in cssm with default value 0.6667 looks strange for me.

I think it would be better if the value was between 0 and 255 (with default value = 170). Then, the code in UnityScreen::optionChanged would be something like:

case UnityshellOptions::LauncherOpacity:
  launcher->SetBackgroundAlpha(optionGetLauncherOpacity() / 255.0);
  break;

review: Approve

[Andrea Azzarone (azzar1)]

> Everything looks good.
>
> Just one comment: an option in cssm with default value 0.6667 looks strange
> for me.
>
> I think it would be better if the value was between 0 and 255 (with default
> value = 170). Then, the code in UnityScreen::optionChanged would be something
> like:
>
> case UnityshellOptions::LauncherOpacity:
> launcher->SetBackgroundAlpha(optionGetLauncherOpacity() / 255.0);
> break;

I have your same opinion, but panel opacity has the same scale of values. So it may appear inconsistent.

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

It seems fine to me.

review: Approve

[Neil J. Patel (njpatel)]

Sweet!

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-07-29 03:09:49 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-07-29 20:33:29 +0000
@@ -219,6 +219,7 @@
   _icon_glow_size         = 62;
   _icon_image_size_delta  = 6;
   _icon_size              = _icon_image_size + _icon_image_size_delta;
+  _background_alpha       = 0.6667; // about 0xAA
 
   _enter_y                = 0;
   _launcher_drag_delta    = 0;
@@ -2003,6 +2004,15 @@
   icon_renderer->SetTargetSize(_icon_size, _icon_image_size, _space_between_icons);
 }
 
+void Launcher::SetBackgroundAlpha(float background_alpha)
+{  
+  if (_background_alpha == background_alpha)
+    return;
+    
+  _background_alpha = background_alpha;
+  NeedRedraw();
+}
+
 void Launcher::OnIconAdded(LauncherIcon* icon)
 {
   EnsureAnimation();
@@ -2118,7 +2128,7 @@
   }
   else
   {
-    gPainter.Paint2DQuadColor(GfxContext, bkg_box, nux::Color(0xAA000000));
+    gPainter.Paint2DQuadColor(GfxContext, bkg_box, nux::Color(0.0, 0.0, 0.0, _background_alpha));
   }
   
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-07-29 03:09:49 +0000
+++ plugins/unityshell/src/Launcher.h	2011-07-29 20:33:29 +0000
@@ -112,6 +112,7 @@
   LauncherIcon* GetSelectedMenuIcon();
 
   void SetIconSize(int tile_size, int icon_size);
+  void SetBackgroundAlpha(float background_alpha);
 
   bool Hidden()
   {
@@ -421,6 +422,7 @@
   int _last_button_press;
   int _drag_out_id;
   float _drag_out_delta_x;
+  float _background_alpha;
 
   int _bfb_width;
   int _bfb_height;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-07-28 10:43:23 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-07-29 20:33:29 +0000
@@ -144,6 +144,7 @@
   optionSetLaunchAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetUrgentAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetPanelOpacityNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+  optionSetLauncherOpacityNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetIconSizeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetAutohideAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetDashBlurExperimentalNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -965,6 +966,9 @@
     case UnityshellOptions::PanelOpacity:
       panelController->SetOpacity(optionGetPanelOpacity());
       break;
+    case UnityshellOptions::LauncherOpacity:
+      launcher->SetBackgroundAlpha(optionGetLauncherOpacity());
+      break;
     case UnityshellOptions::IconSize:
       panelController->SetBFBSize(optionGetIconSize() + 18);
       launcher->SetIconSize(optionGetIconSize() + 6, optionGetIconSize());
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2011-07-26 12:33:23 +0000
+++ plugins/unityshell/unityshell.xml.in	2011-07-29 20:33:29 +0000
@@ -166,6 +166,14 @@
               		<max>1.0</max>
               		<precision>0.01</precision>
                 </option>
+                <option type="float" name="launcher_opacity">
+              		<_short>Launcher Opacity</_short>
+                  <_long>The opacity of the Launcher background.</_long>
+              		<default>0.6667</default>
+              		<min>0.0</min>
+              		<max>1.0</max>
+              		<precision>0.0001</precision>
+                </option>
             		<option name="icon_size" type="int">
                     <_short>Launcher icon size</_short>
                     <_long>The size of the launcher icons</_long>