Merge lp:~nick-dedekind/unity/lp1064969.preview-focus-opacity into lp:unity

[Nick Dedekind]

Updated preview action button focus fill (white 20% opacity, LP: #1064969)

Updated preview action button focus fill (white 20% opacity, LP: #1064969)
Design approved by JohnLea.

[Nick Dedekind (nick-dedekind)]

screenshot:
http://ubuntuone.com/61Zoblu1JbPPg6SLm6GSV3

[Brandon Schaefer (brandontschaefer)]

Looks good +1

review: Approve

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2012-09-24 20:45:42 +0000
+++ dash/previews/ActionButton.cpp	2012-10-10 14:52:28 +0000
@@ -199,7 +199,7 @@
 
 void ActionButton::RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr)
 {
-  Style::Instance().ButtonFocusOverlay(cr);
+  Style::Instance().ButtonFocusOverlay(cr, 0.20f);
 }
 
 long ActionButton::ComputeContentSize()

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2012-10-01 13:59:54 +0000
+++ unity-shared/DashStyle.cpp	2012-10-10 14:52:28 +0000
@@ -1760,7 +1760,7 @@
   return true;
 }
 
-bool Style::ButtonFocusOverlay(cairo_t* cr)
+bool Style::ButtonFocusOverlay(cairo_t* cr, float alpha)
 {
   // sanity checks
   if (cairo_status(cr) != CAIRO_STATUS_SUCCESS)
@@ -1773,7 +1773,7 @@
   double h = cairo_image_surface_get_height(cairo_get_target(cr));
 
   nux::Color color(nux::color::White);
-  color.alpha = 0.50f;
+  color.alpha = alpha;
   cairo_set_line_width(cr, pimpl->button_label_border_size_[nux::VISUAL_STATE_NORMAL]);
 
   RoundedRect(cr,

=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2012-10-08 06:36:17 +0000
+++ unity-shared/DashStyle.h	2012-10-10 14:52:28 +0000
@@ -106,7 +106,7 @@
 
   virtual nux::AbstractPaintLayer* FocusOverlay(int width, int height);
 
-  virtual bool ButtonFocusOverlay(cairo_t* cr);
+  virtual bool ButtonFocusOverlay(cairo_t* cr, float alpha = 0.50f);
 
   virtual bool MultiRangeSegment(cairo_t*    cr,
                                  nux::ButtonVisualState  state,