Merge lp:~3v1n0/unity/dash-style-rawpixel into lp:unity

[Marco Trevisan (Treviño)]

DashStyle: return RawPixel's instead of integers for sizes, and avoid duplication in code

[Eleni Maria Stea (hikiko)]

It looks good :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3868
http://jenkins.qa.ubuntu.com/job/unity-ci/1005/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/92/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1005/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3869
http://jenkins.qa.ubuntu.com/job/unity-ci/1006/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/93/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1006/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3870
http://jenkins.qa.ubuntu.com/job/unity-ci/1009/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/96

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1009/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-06-06 13:54:29 +0000
+++ dash/DashController.cpp	2014-07-10 11:23:35 +0000
@@ -468,8 +468,8 @@
   nux::Geometry const& view_content_geo(view_->GetContentGeometry());
 
   nux::Geometry geo(window_geo.x, window_geo.y, view_content_geo.width, view_content_geo.height);
-  geo.width += style.GetDashRightTileWidth();
-  geo.height += style.GetDashBottomTileHeight();
+  geo.width += style.GetDashRightTileWidth().CP(view_->scale());
+  geo.height += style.GetDashBottomTileHeight().CP(view_->scale());
   return geo;
 }
 

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-07-10 11:23:34 +0000
+++ dash/DashView.cpp	2014-07-10 11:23:35 +0000
@@ -36,7 +36,6 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/KeyboardUtil.h"
 #include "unity-shared/PreviewStyle.h"
-#include "unity-shared/RawPixel.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
@@ -493,6 +492,7 @@
 
   overlay_window_buttons_->Show();
 
+  renderer_.scale = scale();
   renderer_.UpdateBlurBackgroundSize(content_geo_, GetRenderAbsoluteGeometry(), false);
   renderer_.AboutToShow();
 }
@@ -500,7 +500,7 @@
 void DashView::AboutToHide()
 {
   if (BackgroundEffectHelper::blur_type == BLUR_STATIC)
-  { 
+  {
     content_geo_ = {0, 0, 0, 0};
     renderer_.UpdateBlurBackgroundSize(content_geo_, GetRenderAbsoluteGeometry(), false);
   }
@@ -589,6 +589,7 @@
 
   search_bar_->scale = scale;
   scope_bar_->scale = scale;
+  renderer_.scale = scale;
 
   if (preview_container_)
     preview_container_->scale = scale;
@@ -600,21 +601,16 @@
 {
   dash::Style const& style = dash::Style::Instance();
 
-  RawPixel const v_separator_size = style.GetVSeparatorSize();
-  RawPixel const h_separator_size = style.GetHSeparatorSize();
-  RawPixel const view_top_padding = style.GetDashViewTopPadding();
-
-  RawPixel const search_bar_left_padding = style.GetSearchBarLeftPadding();
-  RawPixel const search_bar_height       = style.GetSearchBarHeight();
-
-  layout_->SetLeftAndRightPadding(v_separator_size.CP(scale), 0);
-  layout_->SetTopAndBottomPadding(h_separator_size.CP(scale), 0);
-
-  content_layout_->SetTopAndBottomPadding(view_top_padding.CP(scale), 0);
-
-  search_bar_layout_->SetLeftAndRightPadding(search_bar_left_padding.CP(scale), 0);
-  search_bar_->SetMinimumHeight(search_bar_height.CP(scale));
-  search_bar_->SetMaximumHeight(search_bar_height.CP(scale));
+  layout_->SetLeftAndRightPadding(style.GetVSeparatorSize().CP(scale), 0);
+  layout_->SetTopAndBottomPadding(style.GetHSeparatorSize().CP(scale), 0);
+
+  content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding().CP(scale), 0);
+
+  search_bar_layout_->SetLeftAndRightPadding(style.GetSearchBarLeftPadding().CP(scale), 0);
+
+  int search_bar_height = style.GetSearchBarHeight().CP(scale);
+  search_bar_->SetMinimumHeight(search_bar_height);
+  search_bar_->SetMaximumHeight(search_bar_height);
 }
 
 void DashView::SetupUBusConnections()
@@ -635,7 +631,7 @@
   content_geo_ = GetBestFitGeometry(geo);
   dash::Style& style = dash::Style::Instance();
 
-  RawPixel const top_padding = style.GetDashViewTopPadding();
+  int top_padding = style.GetDashViewTopPadding().CP(scale);
 
   // kinda hacky, but it makes sure the content isn't so big that it throws
   // the bottom of the dash off the screen
@@ -643,18 +639,17 @@
   scopes_layout_->SetMaximumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(scale)));
+                                                top_padding));
 
   scopes_layout_->SetMinimumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(scale)));
+                                                top_padding));
 
   layout_->SetMinMaxSize(content_geo_.width, content_geo_.y + content_geo_.height);
 
   // Minus the padding that gets added to the left
-  RawPixel const tile_width = style.GetTileWidth();
-  style.SetDefaultNColumns(floorf((content_geo_.width - (32_em).CP(scale)) / tile_width.CP(scale)));
+  style.columns_number = floorf((content_geo_.width - (32_em).CP(scale)) / style.GetTileWidth().CP(scale));
 
   ubus_manager_.SendMessage(UBUS_DASH_SIZE_CHANGED, g_variant_new("(ii)", content_geo_.width, content_geo_.height));
 
@@ -675,33 +670,24 @@
   int panel_height = renderer_.y_offset;
 
   int width = 0, height = 0;
-  RawPixel const tile_width  = style.GetTileWidth();
-  RawPixel const tile_height = style.GetTileHeight();
-  RawPixel const group_top_space    = style.GetPlacesGroupTopSpace();
-  RawPixel const category_icon_size = style.GetCategoryIconSize();
-  RawPixel const group_top_padding  = style.GetPlacesGroupResultTopPadding();
+  int tile_width = style.GetTileWidth().CP(scale);
 
-  int category_height = (group_top_space.CP(scale) + category_icon_size.CP(scale) +
-                         group_top_padding.CP(scale) + tile_height.CP(scale));
+  int category_height = (style.GetPlacesGroupTopSpace().CP(scale) +
+                         style.GetCategoryIconSize().CP(scale) +
+                         style.GetPlacesGroupResultTopPadding().CP(scale) +
+                         style.GetTileHeight().CP(scale));
 
   int half = for_geo.width / 2;
 
   // if default dash size is bigger than half a screens worth of items, go for that.
-  while ((width += tile_width.CP(scale)) < half)
-    ;
-
-  RawPixel const v_separator_size   = style.GetVSeparatorSize();
-  RawPixel const group_left_padding = style.GetPlacesGroupResultLeftPadding();
-
-  width = std::max(width, tile_width.CP(scale) * DASH_TILE_HORIZONTAL_COUNT);
-  width += v_separator_size.CP(scale);
-  width += group_left_padding.CP(scale) + DASH_RESULT_RIGHT_PAD.CP(scale);
-
-  RawPixel const h_separator_size = style.GetHSeparatorSize();
-  RawPixel const top_padding      = style.GetDashViewTopPadding();
-
-  height = h_separator_size.CP(scale);
-  height += top_padding.CP(scale);
+  while ((width += tile_width) < half);
+
+  width = std::max(width, tile_width * DASH_TILE_HORIZONTAL_COUNT);
+  width += style.GetVSeparatorSize().CP(scale);
+  width += style.GetPlacesGroupResultLeftPadding().CP(scale) + DASH_RESULT_RIGHT_PAD.CP(scale);
+
+  height = style.GetHSeparatorSize().CP(scale);
+  height += style.GetDashViewTopPadding().CP(scale);
   height += search_bar_->GetGeometry().height;
   height += category_height * DASH_DEFAULT_CATEGORY_COUNT; // adding three categories
   height += scope_bar_->GetGeometry().height;
@@ -1145,11 +1131,8 @@
   if (Settings::Instance().form_factor() == FormFactor::DESKTOP)
   {
     dash::Style& style = dash::Style::Instance();
-    RawPixel const right_title_width  = style.GetDashRightTileWidth();
-    RawPixel const bottom_title_width = style.GetDashBottomTileHeight();
-
-    geo.width  += right_title_width.CP(scale);
-    geo.height += bottom_title_width.CP(scale);
+    geo.width  += style.GetDashRightTileWidth().CP(scale);
+    geo.height += style.GetDashBottomTileHeight().CP(scale);
   }
 }
 
@@ -1509,9 +1492,6 @@
   int num_rows = 1; // The search bar
   std::vector<bool> button_on_monitor;
 
-  RawPixel const right_title_width  = style.GetDashRightTileWidth();
-  RawPixel const bottom_title_width = style.GetDashBottomTileHeight();
-
   if (active_scope_view_.IsValid())
     num_rows += active_scope_view_->GetNumRows();
 
@@ -1530,8 +1510,8 @@
   introspection.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height))
                .add("num_rows", num_rows)
                .add("form_factor", form_factor)
-               .add("right-border-width", right_title_width.CP(scale))
-               .add("bottom-border-height", bottom_title_width.CP(scale))
+               .add("right-border-width", style.GetDashRightTileWidth().CP(scale))
+               .add("bottom-border-height", style.GetDashBottomTileHeight().CP(scale))
                .add("preview_displaying", preview_displaying_)
                .add("preview_animation", animate_split_value_ * animate_preview_container_value_ * animate_preview_value_)
                .add("dash_maximized", style.always_maximised())

=== modified file 'dash/FilterExpanderLabel.cpp'
--- dash/FilterExpanderLabel.cpp	2014-03-20 04:05:39 +0000
+++ dash/FilterExpanderLabel.cpp	2014-07-10 11:23:35 +0000
@@ -22,7 +22,6 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.h"
 #include "FilterExpanderLabel.h"
 
 namespace

=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2014-07-10 11:23:34 +0000
+++ dash/PlacesGroup.cpp	2014-07-10 11:23:35 +0000
@@ -33,7 +33,6 @@
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.h"
 
 #include "ResultView.h"
 #include "ResultViewGrid.h"
@@ -158,11 +157,10 @@
   _group_layout->AddView(_header_view, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
   _header_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
-  _header_layout->SetLeftAndRightPadding(_style.GetCategoryHeaderLeftPadding(), 0);
+  _header_layout->SetLeftAndRightPadding(_style.GetCategoryHeaderLeftPadding().CP(scale), 0);
   _header_view->SetLayout(_header_layout);
 
-  RawPixel const icon_size = _style.GetCategoryIconSize();
-  _icon = new IconTexture("", icon_size.CP(scale()));
+  _icon = new IconTexture("", _style.GetCategoryIconSize().CP(scale));
   _header_layout->AddView(_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
@@ -223,17 +221,16 @@
 void
 PlacesGroup::UpdatePlacesGroupSize()
 {
-   RawPixel const icon_size = _style.GetCategoryIconSize();
-   RawPixel const group_top = _style.GetPlacesGroupTopSpace();
+   int icon_size = _style.GetCategoryIconSize().CP(scale);
+   int top_space = _style.GetPlacesGroupTopSpace().CP(scale);
 
-   int top_space = group_top.CP(scale());
    _space_layout->SetMinimumSize(top_space, top_space);
    _space_layout->SetMaximumSize(top_space, top_space);
 
   _header_layout->SetSpaceBetweenChildren(SPACE_BETWEEN_CHILDREN.CP(scale()));
-  _header_layout->SetLeftAndRightPadding(RawPixel(_style.GetCategoryHeaderLeftPadding()).CP(scale), 0);
+  _header_layout->SetLeftAndRightPadding(_style.GetCategoryHeaderLeftPadding().CP(scale), 0);
 
-  _icon->SetMinMaxSize(icon_size.CP(scale()), icon_size.CP(scale()));
+  _icon->SetMinMaxSize(icon_size, icon_size);
 
   _text_layout->SetHorizontalInternalMargin(TEXT_INTERNAL_MARGIN.CP(scale()));
   _expand_layout->SetHorizontalInternalMargin(EXPAND_INTERNAL_MARGIN.CP(scale()));
@@ -242,14 +239,12 @@
 void
 PlacesGroup::UpdateScale(double scale)
 {
-  RawPixel const icon_size = _style.GetCategoryIconSize();
-
   _name->SetMinimumSize(nux::AREA_MIN_WIDTH, nux::AREA_MIN_HEIGHT);
   _name->SetMaximumSize(nux::AREA_MAX_WIDTH, nux::AREA_MAX_HEIGHT);
   _name->SetScale(scale);
   _expand_label->SetScale(scale);
 
-  _icon->SetSize(icon_size.CP(scale));
+  _icon->SetSize(_style.GetCategoryIconSize().CP(scale));
   _icon->ReLoadIcon();
 
   auto const& arrow = _expand_icon->texture();
@@ -313,7 +308,7 @@
 void
 PlacesGroup::SetIcon(std::string const& path_to_emblem)
 {
-  _icon->SetByIconName(path_to_emblem, RawPixel(_style.GetCategoryIconSize()).CP(scale));
+  _icon->SetByIconName(path_to_emblem, _style.GetCategoryIconSize().CP(scale));
 }
 
 void
@@ -321,11 +316,8 @@
 {
   if (_child_layout)
   {
-    RawPixel const result_top_padding  = _style.GetPlacesGroupResultTopPadding();
-    RawPixel const result_left_padding = _style.GetPlacesGroupResultLeftPadding();
-
-    _child_layout->SetTopAndBottomPadding(result_top_padding.CP(scale()), 0);
-    _child_layout->SetLeftAndRightPadding(result_left_padding.CP(scale()), 0);
+    _child_layout->SetTopAndBottomPadding(_style.GetPlacesGroupResultTopPadding().CP(scale), 0);
+    _child_layout->SetLeftAndRightPadding(_style.GetPlacesGroupResultLeftPadding().CP(scale), 0);
   }
 }
 

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2014-05-03 17:57:47 +0000
+++ dash/ResultRendererTile.cpp	2014-07-10 11:23:35 +0000
@@ -31,7 +31,6 @@
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/TextureCache.h"
-#include "unity-shared/RawPixel.h"
 #include "unity-shared/UnitySettings.h"
 
 namespace unity
@@ -120,13 +119,7 @@
     return;
 
   dash::Style const& style = dash::Style::Instance();
-  RawPixel const tile_size   = style.GetTileImageSize();
-  RawPixel const tile_width  = style.GetTileWidth();
-  RawPixel const tile_height = style.GetTileHeight();
-  RawPixel const tile_highlight_width  = style.GetTileIconHightlightWidth();
-  RawPixel const tile_highlight_height = style.GetTileIconHightlightHeight();
-
-  int tile_icon_size = tile_size.CP(scale());
+  int tile_icon_size = style.GetTileImageSize().CP(scale);
 
   // set up our texture mode
   nux::TexCoordXForm texxform;
@@ -148,8 +141,8 @@
   // render highlight if its needed
   if (container->prelight && state != ResultRendererState::RESULT_RENDERER_NORMAL)
   {
-    int highlight_x =  (geometry.x + geometry.width/2) - tile_highlight_width.CP(scale())/2;
-    int highlight_y =  (geometry.y + PADDING.CP(scale()) + tile_icon_size / 2) - tile_highlight_height.CP(scale())/2;
+    int highlight_x = (geometry.x + geometry.width/2) - style.GetTileIconHightlightWidth().CP(scale)/2;
+    int highlight_y = (geometry.y + PADDING.CP(scale) + tile_icon_size / 2) - style.GetTileIconHightlightHeight().CP(scale)/2;
 
     RenderTexture(GfxContext,
                   highlight_x,
@@ -179,10 +172,10 @@
   if (container->text)
   {
     RenderTexture(GfxContext,
-                  geometry.x + PADDING.CP(scale()),
-                  geometry.y + tile_icon_size + SPACING.CP(scale()),
-                  tile_width.CP(scale()) - (PADDING.CP(scale()) * 2),
-                  tile_height.CP(scale()) - tile_icon_size - SPACING.CP(scale()),
+                  geometry.x + PADDING.CP(scale),
+                  geometry.y + tile_icon_size + SPACING.CP(scale),
+                  style.GetTileWidth().CP(scale) - (PADDING.CP(scale) * 2),
+                  style.GetTileHeight().CP(scale) - tile_icon_size - SPACING.CP(scale),
                   container->text->GetDeviceTexture(),
                   texxform,
                   color,
@@ -273,10 +266,8 @@
 void ResultRendererTile::LoadIcon(Result const& row)
 {
   Style const& style = Style::Instance();
-  RawPixel const tile_size   = style.GetTileImageSize();
-  RawPixel const tile_gsize  = style.GetTileGIconSize();
-  RawPixel const tile_highlight_width  = style.GetTileIconHightlightWidth();
-  RawPixel const tile_highlight_height = style.GetTileIconHightlightHeight();
+  int tile_size   = style.GetTileImageSize().CP(scale);
+  int tile_gsize  = style.GetTileGIconSize().CP(scale);
 
   std::string const& icon_hint = row.icon_hint;
   std::string const& icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
@@ -288,8 +279,8 @@
   {
     TextureCache& cache = TextureCache::GetDefault();
     BaseTexturePtr texture_prelight(cache.FindTexture("resultview_prelight",
-                                                      tile_highlight_width.CP(scale()),
-                                                      tile_highlight_height.CP(scale()),
+                                                      style.GetTileIconHightlightWidth().CP(scale),
+                                                      style.GetTileIconHightlightHeight().CP(scale),
                                                       sigc::mem_fun(this, &ResultRendererTile::DrawHighlight)));
     container->prelight = texture_prelight;
   }
@@ -300,13 +291,13 @@
   {
     bool use_large_icon = icon.IsType(G_TYPE_FILE_ICON) || !icon.IsType(G_TYPE_THEMED_ICON);
     container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, 
-                                                                          tile_size.CP(scale()),
+                                                                          tile_size,
                                                                           use_large_icon ?
-                                                                          tile_size.CP(scale()) : tile_gsize.CP(scale()), slot);
+                                                                          tile_size : tile_gsize, slot);
   }
   else
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, -1, tile_gsize.CP(scale()), slot);
+    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, -1, tile_gsize, slot);
   }
 }
 
@@ -333,15 +324,12 @@
   }
   else
   {
-    Style const& style = Style::Instance();
-    RawPixel const tile_size = style.GetTileImageSize();
-
     // slow path for non square icons that must be resized to fit in the square
     // texture
     float aspect = static_cast<float>(pixbuf_height) / pixbuf_width; // already sanitized width/height so can not be 0.0
     if (aspect < 1.0f)
     {
-      pixbuf_width = tile_size.CP(scale());
+      pixbuf_width = Style::Instance().GetTileImageSize().CP(scale);
       pixbuf_height = pixbuf_width * aspect;
 
       if (pixbuf_height > height)
@@ -470,13 +458,10 @@
 void ResultRendererTile::LoadText(Result const& row)
 {
   Style const& style = Style::Instance();
-  RawPixel const tile_size   = style.GetTileImageSize();
-  RawPixel const tile_width  = style.GetTileWidth();
-  RawPixel const tile_height = style.GetTileHeight();
 
   nux::CairoGraphics _cairoGraphics(CAIRO_FORMAT_ARGB32,
-                                    tile_width.CP(scale()) - (PADDING.CP(scale()) * 2),
-                                    tile_height.CP(scale()) - tile_size.CP(scale()) - SPACING.CP(scale()));
+                                    style.GetTileWidth().CP(scale()) - (PADDING.CP(scale()) * 2),
+                                    style.GetTileHeight().CP(scale()) - style.GetTileImageSize().CP(scale()) - SPACING.CP(scale()));
   cairo_surface_set_device_scale(_cairoGraphics.GetSurface(), scale(), scale());
 
   cairo_t* cr = _cairoGraphics.GetInternalContext();
@@ -499,7 +484,7 @@
 
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_START);
-  pango_layout_set_width(layout, (tile_width - (PADDING * 2))* PANGO_SCALE);
+  pango_layout_set_width(layout, (style.GetTileWidth() - (PADDING * 2))* PANGO_SCALE);
   pango_layout_set_height(layout, -2);
 
   // FIXME bug #1239381

=== modified file 'dash/ScopeBar.cpp'
--- dash/ScopeBar.cpp	2014-03-20 04:05:39 +0000
+++ dash/ScopeBar.cpp	2014-07-10 11:23:35 +0000
@@ -27,7 +27,6 @@
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.h"
 #include "unity-shared/UBusMessages.h"
 
 namespace unity

=== modified file 'dash/ScopeBarIcon.cpp'
--- dash/ScopeBarIcon.cpp	2014-03-20 21:43:02 +0000
+++ dash/ScopeBarIcon.cpp	2014-07-10 11:23:35 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/RawPixel.h"
 #include "ScopeBarIcon.h"
 
 #include "config.h"

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2014-07-10 11:23:34 +0000
+++ dash/ScopeView.cpp	2014-07-10 11:23:35 +0000
@@ -31,7 +31,6 @@
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/PlacesOverlayVScrollBar.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.h"
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
@@ -277,19 +276,17 @@
 {
   dash::Style const& style = dash::Style::Instance();
 
-  RawPixel const scope_filter_space = style.GetSpaceBetweenScopeAndFilters();
-  RawPixel const right_padding      = style.GetFilterViewRightPadding();
-  RawPixel const filter_width       = style.GetFilterBarWidth() +
-                                      style.GetFilterBarLeftPadding() +
-                                      style.GetFilterBarRightPadding();
-
-  double scale = this->scale();
-  layout_->SetSpaceBetweenChildren(scope_filter_space.CP(scale));
-
-  fscroll_view_->SetMinimumWidth(filter_width.CP(scale) + right_padding.CP(scale));
-  fscroll_view_->SetMaximumWidth(filter_width.CP(scale) + right_padding.CP(scale));
-  filter_bar_->SetMinimumWidth(filter_width.CP(scale));
-  filter_bar_->SetMaximumWidth(filter_width.CP(scale));
+  int right_padding = style.GetFilterViewRightPadding().CP(scale);
+  int filter_width  = style.GetFilterBarWidth().CP(scale) +
+                      style.GetFilterBarLeftPadding().CP(scale) +
+                      style.GetFilterBarRightPadding().CP(scale);
+
+  layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenScopeAndFilters().CP(scale));
+
+  fscroll_view_->SetMinimumWidth(filter_width + right_padding);
+  fscroll_view_->SetMaximumWidth(filter_width + right_padding);
+  filter_bar_->SetMinimumWidth(filter_width);
+  filter_bar_->SetMaximumWidth(filter_width);
 }
 
 void ScopeView::UpdateScale(double scale)

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2014-07-10 11:23:34 +0000
+++ dash/previews/ActionButton.cpp	2014-07-10 11:23:35 +0000
@@ -25,7 +25,6 @@
 #include <Nux/HLayout.h>
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/RawPixel.h"
 
 namespace unity
 {

=== modified file 'hud/StandaloneHud.cpp'
--- hud/StandaloneHud.cpp	2013-11-14 03:00:29 +0000
+++ hud/StandaloneHud.cpp	2014-07-10 11:23:35 +0000
@@ -30,10 +30,13 @@
 #include "HudView.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/UnitySettings.h"
+#include "unity-shared/PanelStyle.h"
 #include <NuxCore/Logger.h>
 
 DECLARE_LOGGER(logger, "unity.tests.hud");
 
+using namespace unity;
+
 class TestRunner
 {
 public:
@@ -44,7 +47,6 @@
   void Init ();
   nux::Layout *layout;
   unity::hud::View* hud_view_;
-  unity::Settings dash_settings_;
 
 private:
   unity::hud::Hud hud_service_;
@@ -64,7 +66,7 @@
   LOG_WARNING(logger) << "test init";
   layout = new nux::VLayout();
 
-  hud_view_ = new unity::hud::View();
+  hud_view_ = new hud::View();
 
   layout->AddView (hud_view_, 1, nux::MINOR_POSITION_START);
   nux::GetWindowCompositor().SetKeyFocusArea(hud_view_->default_focus());
@@ -135,15 +137,16 @@
   gtk_init (&argc, &argv);
 
   nux::NuxInitialize(0);
-  
+
   // Slightly higher as we're more likely to test things we know will fail
   nux::logging::configure_logging("unity.hud=debug");
-  
+
   nux::logging::configure_logging(::getenv("UNITY_LOG_SEVERITY"));
   LOG_DEBUG(logger) << "starting the standalone hud";
   // The instances for the pseudo-singletons.
   unity::Settings settings;
-  unity::dash::Style dash_style;
+  panel::Style panel_style;
+  dash::Style dash_style;
 
   TestRunner *test_runner = new TestRunner ();
   wt = nux::CreateGUIThread(TEXT("Hud Prototype Test"),

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-06-07 16:26:51 +0000
+++ lockscreen/UserPromptView.cpp	2014-07-10 11:23:35 +0000
@@ -24,7 +24,6 @@
 
 #include "LockScreenSettings.h"
 #include "unity-shared/CairoTexture.h"
-#include "unity-shared/DashStyle.h"
 #include "unity-shared/TextInput.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/RawPixel.h"

=== modified file 'tests/test_places_group.cpp'
--- tests/test_places_group.cpp	2013-07-03 23:20:03 +0000
+++ tests/test_places_group.cpp	2014-07-10 11:23:35 +0000
@@ -46,12 +46,12 @@
   MOCK_METHOD0(GetGroupExpandIcon, nux::BaseTexture*());
   MOCK_METHOD0(GetGroupUnexpandIcon, nux::BaseTexture*());
 
-  MOCK_CONST_METHOD0(GetCategoryIconSize, int());
-  MOCK_CONST_METHOD0(GetCategoryHeaderLeftPadding, int());
+  MOCK_CONST_METHOD0(GetCategoryIconSize, RawPixel());
+  MOCK_CONST_METHOD0(GetCategoryHeaderLeftPadding, RawPixel());
 
-  MOCK_CONST_METHOD0(GetPlacesGroupTopSpace, int());
-  MOCK_CONST_METHOD0(GetPlacesGroupResultTopPadding, int());
-  MOCK_CONST_METHOD0(GetPlacesGroupResultLeftPadding, int());
+  MOCK_CONST_METHOD0(GetPlacesGroupTopSpace, RawPixel());
+  MOCK_CONST_METHOD0(GetPlacesGroupResultTopPadding, RawPixel());
+  MOCK_CONST_METHOD0(GetPlacesGroupResultLeftPadding, RawPixel());
 
   nux::ObjectPtr<nux::BaseTexture> base_texture_;
 };
@@ -85,10 +85,19 @@
          .WillByDefault(Return(dash_style_.base_texture_.GetPointer()));
 
     ON_CALL(dash_style_, GetCategoryHeaderLeftPadding())
-         .WillByDefault(Return(19));
+         .WillByDefault(Return(19_em));
 
     ON_CALL(dash_style_, GetPlacesGroupTopSpace())
-         .WillByDefault(Return(7));
+         .WillByDefault(Return(7_em));
+
+    ON_CALL(dash_style_, GetCategoryIconSize())
+         .WillByDefault(Return(0_em));
+
+    ON_CALL(dash_style_, GetPlacesGroupResultTopPadding())
+         .WillByDefault(Return(0_em));
+
+    ON_CALL(dash_style_, GetPlacesGroupResultLeftPadding())
+         .WillByDefault(Return(0_em));
   }
 
   NiceMock<MockDashStyle> dash_style_;

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2014-07-10 11:23:34 +0000
+++ unity-shared/DashStyle.cpp	2014-07-10 11:23:35 +0000
@@ -217,7 +217,6 @@
 
   int text_width_;
   int text_height_;
-  int number_of_columns_;
 
   LazyLoadTexture category_texture_;
   LazyLoadTexture category_texture_no_filters_;
@@ -268,7 +267,6 @@
   , text_color_(nux::color::White)
   , text_width_(0)
   , text_height_(0)
-  , number_of_columns_(6)
   , category_texture_("/category_gradient.png")
   , category_texture_no_filters_("/category_gradient_no_refine.png")
   , dash_bottom_texture_("/dash_bottom_border_tile.png")
@@ -437,7 +435,8 @@
 }
 
 Style::Style()
-  : always_maximised(false)
+  : columns_number(6)
+  , always_maximised(false)
   , pimpl(new Impl(this))
 {
   if (style_instance)
@@ -2126,7 +2125,7 @@
   return true;
 }
 
-int Style::GetButtonGarnishSize()
+RawPixel Style::GetButtonGarnishSize() const
 {
   int maxBlurSize = 0;
 
@@ -2139,12 +2138,12 @@
   return 2 * maxBlurSize;
 }
 
-int Style::GetSeparatorGarnishSize()
+RawPixel Style::GetSeparatorGarnishSize() const
 {
   return pimpl->separator_blur_size_;
 }
 
-int Style::GetScrollbarGarnishSize()
+RawPixel Style::GetScrollbarGarnishSize() const
 {
   return pimpl->scrollbar_blur_size_;
 }
@@ -2154,68 +2153,53 @@
   return pimpl->text_color_;
 }
 
-int  Style::GetDefaultNColumns() const
-{
-  return pimpl->number_of_columns_;
-}
-
-void Style::SetDefaultNColumns(int n_cols)
-{
-  if (pimpl->number_of_columns_ == n_cols)
-    return;
-
-  pimpl->number_of_columns_ = n_cols;
-
-  columns_changed.emit();
-}
-
-int Style::GetTileGIconSize() const
+RawPixel Style::GetTileGIconSize() const
 {
   return 64;
 }
 
-int Style::GetTileImageSize() const
+RawPixel Style::GetTileImageSize() const
 {
   return 96;
 }
 
-int Style::GetTileWidth() const
+RawPixel Style::GetTileWidth() const
 {
   return std::max(pimpl->text_width_, 150);
 }
 
-int Style::GetTileHeight() const
+RawPixel Style::GetTileHeight() const
 {
   return std::max(GetTileImageSize() + (pimpl->text_height_ * 2) + 15,
                   GetTileImageSize() + 32); // magic design numbers.
 }
 
-int Style::GetTileIconHightlightHeight() const
-{
-  return 106;
-}
-
-int Style::GetTileIconHightlightWidth() const
-{
-  return 106;
-}
-
-int Style::GetHomeTileIconSize() const
+RawPixel Style::GetTileIconHightlightHeight() const
+{
+  return 106;
+}
+
+RawPixel Style::GetTileIconHightlightWidth() const
+{
+  return 106;
+}
+
+RawPixel Style::GetHomeTileIconSize() const
 {
   return 104;
 }
 
-int Style::GetHomeTileWidth() const
+RawPixel Style::GetHomeTileWidth() const
 {
   return pimpl->text_width_ * 1.2;
 }
 
-int Style::GetHomeTileHeight() const
+RawPixel Style::GetHomeTileHeight() const
 {
   return GetHomeTileIconSize() + (pimpl->text_height_ * 5);
 }
 
-int Style::GetTextLineHeight() const
+RawPixel Style::GetTextLineHeight() const
 {
   return pimpl->text_height_;
 }
@@ -2366,149 +2350,147 @@
   return pimpl->dash_shine_.texture();
 }
 
-int Style::GetDashBottomTileHeight() const
-{
-  return 30;
-}
-
-int Style::GetDashRightTileWidth() const
-{
-  return 30;
-}
-
-int Style::GetVSeparatorSize() const
-{
-  return 1;
-}
-
-int Style::GetHSeparatorSize() const
-{
-  return 1;
-
-}
-
-int Style::GetFilterBarWidth() const
+RawPixel Style::GetDashBottomTileHeight() const
+{
+  return 30;
+}
+
+RawPixel Style::GetDashRightTileWidth() const
+{
+  return 30;
+}
+
+RawPixel Style::GetVSeparatorSize() const
+{
+  return 1;
+}
+
+RawPixel Style::GetHSeparatorSize() const
+{
+  return 1;
+}
+
+RawPixel Style::GetFilterBarWidth() const
 {
   return 300;
 }
 
-
-int Style::GetFilterBarLeftPadding() const
-{
-  return 5;
-}
-
-int Style::GetFilterBarRightPadding() const
-{
-  return 5;
-}
-
-int Style::GetDashViewTopPadding() const
-{
-  return 10;
-}
-
-int Style::GetSearchBarLeftPadding() const
-{
-  return 10;
-}
-
-int Style::GetSearchBarRightPadding() const
-{
-  return 10;
-}
-
-int Style::GetSearchBarHeight() const
+RawPixel Style::GetFilterBarLeftPadding() const
+{
+  return 5;
+}
+
+RawPixel Style::GetFilterBarRightPadding() const
+{
+  return 5;
+}
+
+RawPixel Style::GetDashViewTopPadding() const
+{
+  return 10;
+}
+
+RawPixel Style::GetSearchBarLeftPadding() const
+{
+  return 10;
+}
+
+RawPixel Style::GetSearchBarRightPadding() const
+{
+  return 10;
+}
+
+RawPixel Style::GetSearchBarHeight() const
 {
   return 42;
 }
 
-int Style::GetFilterResultsHighlightRightPadding() const
-{
-  return 5;
-}
-
-int Style::GetFilterResultsHighlightLeftPadding() const
-{
-  return 5;
-}
-
-int Style::GetFilterBarTopPadding() const
+RawPixel Style::GetFilterResultsHighlightRightPadding() const
+{
+  return 5;
+}
+
+RawPixel Style::GetFilterResultsHighlightLeftPadding() const
+{
+  return 5;
+}
+
+RawPixel Style::GetFilterBarTopPadding() const
 {
   return 10;
 }
 
-int Style::GetFilterHighlightPadding() const
+RawPixel Style::GetFilterHighlightPadding() const
 {
   return 2;
 }
 
-int Style::GetSpaceBetweenFilterWidgets() const
+RawPixel Style::GetSpaceBetweenFilterWidgets() const
 {
   return 12;
 }
 
-int Style::GetAllButtonHeight() const
-{
-  return 30;
-}
-
-int Style::GetFilterButtonHeight() const
-{
-  return 30;
-}
-
-int Style::GetSpaceBetweenScopeAndFilters() const
-{
-  return 10;
-}
-
-int Style::GetFilterViewRightPadding() const
-{
-  return 10;
-}
-
-int Style::GetScrollbarWidth() const
+RawPixel Style::GetAllButtonHeight() const
+{
+  return 30;
+}
+
+RawPixel Style::GetFilterButtonHeight() const
+{
+  return 30;
+}
+
+RawPixel Style::GetSpaceBetweenScopeAndFilters() const
+{
+  return 10;
+}
+
+RawPixel Style::GetFilterViewRightPadding() const
+{
+  return 10;
+}
+
+RawPixel Style::GetScrollbarWidth() const
 {
   return 3;
 }
 
-int Style::GetCategoryIconSize() const
+RawPixel Style::GetCategoryIconSize() const
 {
   return 22;
 }
 
-int Style::GetCategoryHighlightHeight() const
+RawPixel Style::GetCategoryHighlightHeight() const
 {
   return 24;
 }
 
-int Style::GetPlacesGroupTopSpace() const
+RawPixel Style::GetPlacesGroupTopSpace() const
 {
   return 7;
 }
 
-int Style::GetPlacesGroupResultTopPadding() const
+RawPixel Style::GetPlacesGroupResultTopPadding() const
 {
   return 2;
 }
 
-int Style::GetPlacesGroupResultLeftPadding() const
+RawPixel Style::GetPlacesGroupResultLeftPadding() const
 {
   return 25;
 }
 
-int Style::GetCategoryHeaderLeftPadding() const
+RawPixel Style::GetCategoryHeaderLeftPadding() const
 {
   return 19;
 }
 
-int Style::GetCategorySeparatorLeftPadding() const
+RawPixel Style::GetCategorySeparatorLeftPadding() const
 {
   return 15;
 }
 
-int Style::GetCategorySeparatorRightPadding() const
+RawPixel Style::GetCategorySeparatorRightPadding() const
 {
   return 15;
 }

=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2013-02-19 15:07:36 +0000
+++ unity-shared/DashStyle.h	2014-07-10 11:23:35 +0000
@@ -135,11 +135,11 @@
 
   virtual bool SeparatorHoriz(cairo_t* cr);
 
-  virtual int GetButtonGarnishSize();
-
-  virtual int GetSeparatorGarnishSize();
-
-  virtual int GetScrollbarGarnishSize();
+  RawPixel GetButtonGarnishSize() const;
+
+  RawPixel GetSeparatorGarnishSize() const;
+
+  RawPixel GetScrollbarGarnishSize() const;
 
   void Blur(cairo_t* cr, int size);
 
@@ -153,23 +153,18 @@
 
   nux::Color const& GetTextColor() const;
 
-  // TODO nux::Property<int>
-  int  GetDefaultNColumns() const;
-  void SetDefaultNColumns(int n_cols);
-  sigc::signal<void> columns_changed;
-
-  int GetTileGIconSize() const;
-  int GetTileImageSize() const;
-  int GetTileWidth() const;
-  int GetTileHeight() const;
-  int GetTileIconHightlightHeight() const;
-  int GetTileIconHightlightWidth() const;
-
-  int GetHomeTileIconSize() const;
-  int GetHomeTileWidth() const;
-  int GetHomeTileHeight() const;
-
-  int GetTextLineHeight() const;
+  RawPixel GetTileGIconSize() const;
+  RawPixel GetTileImageSize() const;
+  RawPixel GetTileWidth() const;
+  RawPixel GetTileHeight() const;
+  RawPixel GetTileIconHightlightHeight() const;
+  RawPixel GetTileIconHightlightWidth() const;
+
+  RawPixel GetHomeTileIconSize() const;
+  RawPixel GetHomeTileWidth() const;
+  RawPixel GetHomeTileHeight() const;
+
+  RawPixel GetTextLineHeight() const;
 
   nux::BaseTexture* GetCategoryBackground();
   nux::BaseTexture* GetCategoryBackgroundNoFilters();
@@ -188,8 +183,8 @@
   nux::BaseTexture* GetDashTopCornerMask();
   nux::BaseTexture* GetDashTopTile();
 
-  int GetDashBottomTileHeight() const;
-  int GetDashRightTileWidth() const;
+  RawPixel GetDashBottomTileHeight() const;
+  RawPixel GetDashRightTileWidth() const;
 
   nux::BaseTexture* GetDashShine();
 
@@ -204,60 +199,58 @@
   nux::BaseTexture* GetStarDeselectedIcon();
   nux::BaseTexture* GetStarSelectedIcon();
   nux::BaseTexture* GetStarHighlightIcon();
- 
+
   nux::BaseTexture* GetInformationTexture();
 
   nux::BaseTexture* GetRefineTextureCorner();
   nux::BaseTexture* GetRefineTextureDash();
-  
+
   // Returns the width of the separator between the dash and the launcher.
-  int GetVSeparatorSize() const;
+  RawPixel GetVSeparatorSize() const;
 
   // Returns the height of the separator between the dash and the top panel.
-  int GetHSeparatorSize() const;
+  RawPixel GetHSeparatorSize() const;
 
   // Practically it is the space between the top border of the dash and the searchbar.
-  int GetDashViewTopPadding() const;
-
-  
+  RawPixel GetDashViewTopPadding() const;
+
+
   // Search bar
-  int GetSearchBarLeftPadding() const;
-  int GetSearchBarRightPadding() const;
-  int GetSearchBarHeight() const;
-  int GetFilterResultsHighlightRightPadding() const;
-  int GetFilterResultsHighlightLeftPadding() const;
+  RawPixel GetSearchBarLeftPadding() const;
+  RawPixel GetSearchBarRightPadding() const;
+  RawPixel GetSearchBarHeight() const;
 
   // Filter bar
-  int GetFilterBarTopPadding() const;
-  int GetFilterHighlightPadding() const;
-  int GetSpaceBetweenFilterWidgets() const;
-  int GetAllButtonHeight() const;
-  int GetFilterBarLeftPadding() const;
-  int GetFilterBarRightPadding() const;
-  int GetFilterBarWidth() const;
-  int GetFilterButtonHeight() const;
-  int GetFilterViewRightPadding() const;
+  RawPixel GetFilterResultsHighlightRightPadding() const;
+  RawPixel GetFilterResultsHighlightLeftPadding() const;
+  RawPixel GetFilterBarTopPadding() const;
+  RawPixel GetFilterHighlightPadding() const;
+  RawPixel GetSpaceBetweenFilterWidgets() const;
+  RawPixel GetAllButtonHeight() const;
+  RawPixel GetFilterBarLeftPadding() const;
+  RawPixel GetFilterBarRightPadding() const;
+  RawPixel GetFilterBarWidth() const;
+  RawPixel GetFilterButtonHeight() const;
+  RawPixel GetFilterViewRightPadding() const;
 
-  int GetSpaceBetweenScopeAndFilters() const;
+  RawPixel GetSpaceBetweenScopeAndFilters() const;
 
   // Scrollbars
-  int GetScrollbarWidth() const;
+  RawPixel GetScrollbarWidth() const;
 
   // Places Group
-  int GetCategoryIconSize() const;
-  int GetCategoryHighlightHeight() const;
-  int GetPlacesGroupTopSpace() const;
-  int GetPlacesGroupResultTopPadding() const;
-  int GetPlacesGroupResultLeftPadding() const;  
-  int GetCategoryHeaderLeftPadding() const;
-  int GetCategorySeparatorLeftPadding() const;
-  int GetCategorySeparatorRightPadding() const;
-  
-  bool GetUseBlur() const;
-
+  RawPixel GetCategoryIconSize() const;
+  RawPixel GetCategoryHighlightHeight() const;
+  RawPixel GetPlacesGroupTopSpace() const;
+  RawPixel GetPlacesGroupResultTopPadding() const;
+  RawPixel GetPlacesGroupResultLeftPadding() const;
+  RawPixel GetCategoryHeaderLeftPadding() const;
+  RawPixel GetCategorySeparatorLeftPadding() const;
+  RawPixel GetCategorySeparatorRightPadding() const;
 
   sigc::signal<void> changed;
 
+  nux::Property<int> columns_number;
   nux::Property<bool> always_maximised;
   nux::Property<bool> preview_mode;
 

=== modified file 'unity-shared/DashStyleInterface.h'
--- unity-shared/DashStyleInterface.h	2012-12-13 12:56:29 +0000
+++ unity-shared/DashStyleInterface.h	2014-07-10 11:23:35 +0000
@@ -21,6 +21,7 @@
 #define UNITYSHELL_DASH_STYLE_INTERFACE_H
 
 #include <memory>
+#include "unity-shared/RawPixel.h"
 
 namespace nux {
   class AbstractPaintLayer;
@@ -43,11 +44,11 @@
   virtual nux::BaseTexture* GetGroupUnexpandIcon() = 0;
   virtual nux::BaseTexture* GetGroupExpandIcon() = 0;
 
-  virtual int GetCategoryIconSize() const = 0;
-  virtual int GetCategoryHeaderLeftPadding() const = 0;
-  virtual int GetPlacesGroupTopSpace() const = 0;
-  virtual int GetPlacesGroupResultTopPadding() const = 0;
-  virtual int GetPlacesGroupResultLeftPadding() const = 0;  
+  virtual RawPixel GetCategoryIconSize() const = 0;
+  virtual RawPixel GetCategoryHeaderLeftPadding() const = 0;
+  virtual RawPixel GetPlacesGroupTopSpace() const = 0;
+  virtual RawPixel GetPlacesGroupResultTopPadding() const = 0;
+  virtual RawPixel GetPlacesGroupResultLeftPadding() const = 0;
 };
 
 }

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2013-11-18 17:44:31 +0000
+++ unity-shared/OverlayRenderer.cpp	2014-07-10 11:23:35 +0000
@@ -35,8 +35,16 @@
 DECLARE_LOGGER(logger, "unity.overlayrenderer");
 namespace
 {
-const int INNER_CORNER_RADIUS = 5;
+const RawPixel INNER_CORNER_RADIUS = 5_em;
 const int EXCESS_BORDER = 10;
+
+const nux::Color LINE_COLOR = nux::color::White * 0.07f;
+const RawPixel GRADIENT_HEIGHT = 50_em;
+const RawPixel VERTICAL_PADDING = 20_em;
+
+// Now that we mask the corners of the dash,
+// draw longer lines to fill the minimal gaps
+const RawPixel CORNER_OVERLAP = 3_em;
 }
 
 // Impl class
@@ -88,6 +96,7 @@
   : visible(false)
   , parent(parent_)
 {
+  parent_->scale = 1.0;
   UpdateTextures();
 }
 
@@ -427,6 +436,7 @@
 void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry const& content_geo, nux::Geometry const& absolute_geo, nux::Geometry const& geometry, bool force_edges)
 {
   nux::Geometry geo(content_geo);
+  double scale = parent->scale;
 
   nux::Geometry larger_content_geo = content_geo;
   nux::Geometry larger_absolute_geo = absolute_geo;
@@ -480,32 +490,22 @@
   gfx_context.GetRenderStates().SetBlend(true);
   gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  const double line_opacity = 0.1f;
-  const int gradient_height = 50;
-  const int vertical_padding = 20;
-
-  // Now that we mask the corners of the dash,
-  // draw longer lines to fill the minimal gaps
-  const int corner_overlap = 3;
-
-  nux::Color line_color = nux::color::White * line_opacity;
-
   // Vertical lancher/dash separator
   nux::GetPainter().Paint2DQuadColor(gfx_context,
                                      nux::Geometry(geometry.x,
-                                     geometry.y + vertical_padding,
-                                     style.GetVSeparatorSize(),
-                                     gradient_height),
+                                       geometry.y + VERTICAL_PADDING.CP(scale),
+                                       style.GetVSeparatorSize().CP(scale),
+                                       GRADIENT_HEIGHT.CP(scale)),
                                      nux::color::Transparent,
-                                     line_color * 0.7f, // less opacity
-                                     line_color * 0.7f, // less opacity
+                                     LINE_COLOR,
+                                     LINE_COLOR,
                                      nux::color::Transparent);
   nux::GetPainter().Draw2DLine(gfx_context,
                                geometry.x,
-                               geometry.y + vertical_padding + gradient_height,
-                               style.GetVSeparatorSize(),
-                               geometry.y + content_geo.height + INNER_CORNER_RADIUS + corner_overlap,
-                               line_color * 0.7f); // less opacity
+                               geometry.y + VERTICAL_PADDING.CP(scale) + GRADIENT_HEIGHT.CP(scale),
+                               style.GetVSeparatorSize().CP(scale),
+                               geometry.y + content_geo.height + INNER_CORNER_RADIUS.CP(scale) + CORNER_OVERLAP.CP(scale),
+                               LINE_COLOR);
 
   //Draw the background
   bg_darken_layer_->SetGeometry(larger_content_geo);
@@ -925,9 +925,7 @@
 
 OverlayRenderer::OverlayRenderer()
   : pimpl_(new OverlayRendererImpl(this))
-{
-
-}
+{}
 
 
 OverlayRenderer::~OverlayRenderer()

=== modified file 'unity-shared/OverlayRenderer.h'
--- unity-shared/OverlayRenderer.h	2013-11-18 16:24:41 +0000
+++ unity-shared/OverlayRenderer.h	2014-07-10 11:23:35 +0000
@@ -39,6 +39,7 @@
 
   nux::Property<int> x_offset;
   nux::Property<int> y_offset;
+  nux::Property<double> scale;
   
   OverlayRenderer();
   ~OverlayRenderer();