Merge lp:~3v1n0/unity/dash-filters-scaling into lp:unity

[Marco Trevisan (Treviño)]

FilterWidgets: add support for scaling

[Eleni Maria Stea (hikiko)]

it looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-07-10 12:35:22 +0000
+++ dash/DashView.cpp	2014-07-10 12:35:22 +0000
@@ -605,12 +605,7 @@
   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()

=== modified file 'dash/FilterBar.cpp'
--- dash/FilterBar.cpp	2014-03-20 04:05:39 +0000
+++ dash/FilterBar.cpp	2014-07-10 12:35:22 +0000
@@ -47,28 +47,20 @@
   : View(NUX_FILE_LINE_PARAM)
   , scale(DEFAULT_SCALE)
 {
-  Init();
-}
-
-FilterBar::~FilterBar()
-{
-}
-
-void FilterBar::Init()
-{
-  dash::Style& style = dash::Style::Instance();
-
-  nux::LinearLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout->SetTopAndBottomPadding(style.GetFilterBarTopPadding() - style.GetFilterHighlightPadding());
-  layout->SetSpaceBetweenChildren(style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding());
+  SetLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
   scale.changed.connect(sigc::mem_fun(this, &FilterBar::UpdateScale));
-  SetLayout(layout);
+  UpdateScale(scale);
 }
 
 void FilterBar::UpdateScale(double scale)
 {
   for (auto& filters : filter_map_)
     filters.second->scale = scale;
+
+  auto& style = dash::Style::Instance();
+  auto* layout = static_cast<nux::VLayout*>(GetLayout());
+  layout->SetTopAndBottomPadding(style.GetFilterBarTopPadding().CP(scale) - style.GetFilterHighlightPadding().CP(scale));
+  layout->SetSpaceBetweenChildren(style.GetSpaceBetweenFilterWidgets().CP(scale) - style.GetFilterHighlightPadding().CP(scale));
 }
 
 void FilterBar::SetFilters(Filters::Ptr const& filters)
@@ -118,9 +110,7 @@
 }
 
 void FilterBar::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
-{
-
-}
+{}
 
 void FilterBar::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {

=== modified file 'dash/FilterBar.h'
--- dash/FilterBar.h	2014-03-20 04:05:39 +0000
+++ dash/FilterBar.h	2014-07-10 12:35:22 +0000
@@ -42,7 +42,6 @@
   NUX_DECLARE_OBJECT_TYPE(FilterBar, nux::View);
 public:
   FilterBar(NUX_FILE_LINE_PROTO);
-  ~FilterBar();
 
   nux::Property<double> scale;
 
@@ -62,7 +61,6 @@
   virtual void AddProperties(debug::IntrospectionData&);
 
 private:
-  void Init();
   void UpdateScale(double scale);
 
   FilterFactory factory_;

=== modified file 'dash/FilterBasicButton.cpp'
--- dash/FilterBasicButton.cpp	2013-11-14 03:00:29 +0000
+++ dash/FilterBasicButton.cpp	2014-07-10 12:35:22 +0000
@@ -22,53 +22,36 @@
 #include "unity-shared/DashStyle.h"
 #include "FilterBasicButton.h"
 
-namespace
-{
-const int kMinButtonHeight = 30;
-const int kMinButtonWidth  = 48;
-const int kFontSizePx = 15; // 15px == 11pt
-}
-
 namespace unity
 {
 namespace dash
 {
-  
+namespace
+{
+const RawPixel BUTTON_HEIGHT = 30_em;
+const RawPixel MIN_BUTTON_WIDTH  = 48_em;
+const int FONT_SIZE_PX = 15; // 15px == 11pt
+}
+
 NUX_IMPLEMENT_OBJECT_TYPE(FilterBasicButton);
 
 FilterBasicButton::FilterBasicButton(nux::TextureArea* image, NUX_FILE_LINE_DECL)
-  : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
-{
-  Init();
-}
+  : FilterBasicButton(std::string(), image, NUX_FILE_LINE_PARAM)
+{}
+
+FilterBasicButton::FilterBasicButton(NUX_FILE_LINE_DECL)
+  : FilterBasicButton(std::string(), NUX_FILE_LINE_PARAM)
+{}
 
 FilterBasicButton::FilterBasicButton(std::string const& label, NUX_FILE_LINE_DECL)
-  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
-  , label_(label)
-{
-  Init();
-}
+  : FilterBasicButton(label, nullptr, NUX_FILE_LINE_PARAM)
+{}
 
 FilterBasicButton::FilterBasicButton(std::string const& label, nux::TextureArea* image, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , label_(label)
 {
-  Init();
-}
-
-FilterBasicButton::FilterBasicButton(NUX_FILE_LINE_DECL)
-  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
-{
-  Init();
-}
-
-FilterBasicButton::~FilterBasicButton()
-{
-}
-
-void FilterBasicButton::Init()
-{
-
   InitTheme();
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(true);
@@ -85,34 +68,44 @@
     if (GetInputEventSensitivity())
       Active() ? Deactivate() : Activate();
   });
+
+  scale.changed.connect(sigc::mem_fun(this, &FilterBasicButton::UpdateScale));
 }
 
 void FilterBasicButton::InitTheme()
 {
-  if (!active_)
-  {
-    nux::Geometry const& geo = GetGeometry();
-
-    prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
-    active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
-    normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
-    focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &FilterBasicButton::RedrawFocusOverlay)));
-  }
-
-  SetMinimumHeight(kMinButtonHeight);
-  SetMinimumWidth(kMinButtonWidth);
+  nux::Geometry const& geo = GetGeometry();
+
+  prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+  normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+  focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &FilterBasicButton::RedrawFocusOverlay)));
+
+  SetMinimumWidth(MIN_BUTTON_WIDTH.CP(scale));
+  ApplyMinWidth();
+
+  SetMinimumHeight(BUTTON_HEIGHT.CP(scale));
+  SetMaximumHeight(BUTTON_HEIGHT.CP(scale));
 }
 
 void FilterBasicButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
 {
-  Style::Instance().Button(cr, faked_state, label_, kFontSizePx, Alignment::CENTER, true);
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
+  Style::Instance().Button(cr, faked_state, label_, FONT_SIZE_PX, Alignment::CENTER, true);
 }
 
 void FilterBasicButton::RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr)
 {
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
   Style::Instance().ButtonFocusOverlay(cr);
 }
 
+void FilterBasicButton::UpdateScale(double scale)
+{
+  InitTheme();
+  QueueDraw();
+}
+
 long FilterBasicButton::ComputeContentSize()
 {
   long ret = nux::Button::ComputeContentSize();

=== modified file 'dash/FilterBasicButton.h'
--- dash/FilterBasicButton.h	2012-12-13 09:19:34 +0000
+++ dash/FilterBasicButton.h	2014-07-10 12:35:22 +0000
@@ -39,15 +39,15 @@
   FilterBasicButton(std::string const& label, NUX_FILE_LINE_PROTO);
   FilterBasicButton(std::string const& label, nux::TextureArea* image, NUX_FILE_LINE_PROTO);
   FilterBasicButton(NUX_FILE_LINE_PROTO);
-  virtual ~FilterBasicButton();
-
-  void SetClearBeforeDraw(bool clear_before_draw);
+
+  nux::Property<double> scale;
+
 protected:
   virtual long ComputeContentSize();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
-  void Init();
   void InitTheme();
+  void SetClearBeforeDraw(bool clear_before_draw);
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
   void RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr);
 
@@ -61,6 +61,8 @@
   nux::Geometry cached_geometry_;
 
 private:
+  void UpdateScale(double);
+
   std::string label_;
   bool clear_before_draw_;
 };

=== modified file 'dash/FilterExpanderLabel.cpp'
--- dash/FilterExpanderLabel.cpp	2014-07-10 12:35:22 +0000
+++ dash/FilterExpanderLabel.cpp	2014-07-10 12:35:22 +0000
@@ -24,13 +24,18 @@
 #include "unity-shared/GraphicsUtils.h"
 #include "FilterExpanderLabel.h"
 
+namespace unity
+{
+namespace dash
+{
 namespace
 {
-
+const double DEFAULT_SCALE = 1.0;
 const float EXPAND_DEFAULT_ICON_OPACITY = 1.0f;
-
-// expander_layout_
-const int EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN = 8;
+const RawPixel EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN = 8_em;
+const RawPixel ARROW_HORIZONTAL_PADDING = 2_em;
+const RawPixel ARROW_TOP_PADDING = 11_em;
+const RawPixel ARROW_BOTTOM_PADDING = 9_em;
 
 // font
 const char* const FONT_EXPANDER_LABEL = "Ubuntu 13"; // 17px = 13
@@ -71,16 +76,6 @@
 
 }
 
-namespace unity
-{
-namespace dash
-{
-
-namespace
-{
-  double const DEFAULT_SCALE = 1.0;
-}
-
 NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel);
 
 FilterExpanderLabel::FilterExpanderLabel(std::string const& label, NUX_FILE_LINE_DECL)
@@ -93,8 +88,6 @@
   , expander_layout_(nullptr)
   , right_hand_contents_(nullptr)
   , cairo_label_(nullptr)
-  , raw_label_(label)
-  , label_("label")
 {
   scale.changed.connect(sigc::mem_fun(this, &FilterExpanderLabel::UpdateScale));
   expanded.changed.connect(sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
@@ -103,14 +96,13 @@
 
 void FilterExpanderLabel::SetLabel(std::string const& label)
 {
-  raw_label_ = label;
-
-  cairo_label_->SetText(label.c_str());
+  cairo_label_->SetText(label);
 }
 
 void FilterExpanderLabel::UpdateScale(double scale)
 {
   cairo_label_->SetScale(scale);
+  UpdateLayoutSizes();
 }
 
 void FilterExpanderLabel::SetRightHandView(nux::View* view)
@@ -142,40 +134,27 @@
 
 void FilterExpanderLabel::BuildLayout()
 {
-  dash::Style& style = dash::Style::Instance();
-
   layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout_->SetLeftAndRightPadding(style.GetFilterBarLeftPadding(), style.GetFilterBarRightPadding());
-
   top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  top_bar_layout_->SetTopAndBottomPadding(style.GetFilterHighlightPadding());
-
   expander_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  expander_layout_->SetSpaceBetweenChildren(EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN);
 
   expander_view_ = new ExpanderView(NUX_TRACKER_LOCATION);
   expander_view_->SetLayout(expander_layout_);
   top_bar_layout_->AddView(expander_view_, 1);
 
-  cairo_label_ = new StaticCairoText(label_.c_str(), NUX_TRACKER_LOCATION);
+  cairo_label_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   cairo_label_->SetFont(FONT_EXPANDER_LABEL);
+  cairo_label_->SetScale(scale);
   cairo_label_->SetTextColor(nux::color::White);
   cairo_label_->SetAcceptKeyboardEvent(false);
 
-  nux::BaseTexture* arrow;
-  arrow = dash::Style::Instance().GetGroupUnexpandIcon();
-  expand_icon_ = new IconTexture(arrow,
-                                 arrow->GetWidth(),
-                                 arrow->GetHeight());
+  expand_icon_ = new IconTexture(Style::Instance().GetGroupUnexpandIcon());
   expand_icon_->SetOpacity(EXPAND_DEFAULT_ICON_OPACITY);
-  expand_icon_->SetMinimumSize(arrow->GetWidth(), arrow->GetHeight());
+  expand_icon_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
   expand_icon_->SetVisible(true);
+
   arrow_layout_  = new nux::VLayout();
-  arrow_top_space_ = new nux::SpaceLayout(2, 2, 11, 11);
-  arrow_bottom_space_ = new nux::SpaceLayout(2, 2, 9, 9);
-  arrow_layout_->AddView(arrow_top_space_, 0, nux::MINOR_POSITION_CENTER);
   arrow_layout_->AddView(expand_icon_, 0, nux::MINOR_POSITION_CENTER);
-  arrow_layout_->AddView(arrow_bottom_space_, 0, nux::MINOR_POSITION_CENTER);
 
   expander_layout_->AddView(cairo_label_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   expander_layout_->AddView(arrow_layout_, 0, nux::MINOR_POSITION_CENTER);
@@ -208,8 +187,25 @@
   cairo_label_->mouse_click.connect(mouse_expand);
   expand_icon_->mouse_click.connect(mouse_expand);
 
+  UpdateLayoutSizes();
+}
+
+void FilterExpanderLabel::UpdateLayoutSizes()
+{
+  auto& style = dash::Style::Instance();
+
+  layout_->SetLeftAndRightPadding(style.GetFilterBarLeftPadding().CP(scale), style.GetFilterBarRightPadding().CP(scale));
+  top_bar_layout_->SetTopAndBottomPadding(style.GetFilterHighlightPadding().CP(scale));
+  expander_layout_->SetSpaceBetweenChildren(EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN.CP(scale));
+
+  auto const& tex = expand_icon_->texture();
+  expand_icon_->SetMinMaxSize(RawPixel(tex->GetWidth()).CP(scale), RawPixel(tex->GetHeight()).CP(scale));
+
+  arrow_layout_->SetLeftAndRightPadding(ARROW_HORIZONTAL_PADDING.CP(scale));
+  arrow_layout_->SetTopAndBottomPadding(ARROW_TOP_PADDING.CP(scale), ARROW_BOTTOM_PADDING.CP(scale));
+
   QueueRelayout();
-  NeedRedraw();
+  QueueDraw();
 }
 
 void FilterExpanderLabel::DoExpandChange(bool change)
@@ -220,6 +216,9 @@
   else
     expand_icon_->SetTexture(style.GetGroupExpandIcon());
 
+  auto const& tex = expand_icon_->texture();
+  expand_icon_->SetMinMaxSize(RawPixel(tex->GetWidth()).CP(scale), RawPixel(tex->GetHeight()).CP(scale));
+
   if (change and contents_ and !contents_->IsChildOf(layout_))
   {
     layout_->AddLayout(contents_.GetPointer(), 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL, 100.0f, nux::LayoutPosition(1));
@@ -277,7 +276,7 @@
         graphics::ClearGeometry(right_hand_contents_->GetGeometry());
 
       if (expanded())
-        ClearRedirectedRenderChildArea();            
+        ClearRedirectedRenderChildArea();
     }
 
     if (focus_layer_ && ShouldBeHighlighted())
@@ -295,7 +294,7 @@
 
   if (IsFullRedraw())
   {
-    nux::GetPainter().PopPaintLayerStack();      
+    nux::GetPainter().PopPaintLayerStack();
   }
   else if (pushed_paint_layers > 0)
   {

=== modified file 'dash/FilterExpanderLabel.h'
--- dash/FilterExpanderLabel.h	2014-03-20 04:05:39 +0000
+++ dash/FilterExpanderLabel.h	2014-07-10 12:35:22 +0000
@@ -80,21 +80,18 @@
 
 private:
   void BuildLayout();
+  void UpdateLayoutSizes();
   void DoExpandChange(bool change);
   bool ShouldBeHighlighted();
   void UpdateScale(double scale);
 
-  nux::LinearLayout* layout_;
+  nux::VLayout* layout_;
   nux::LinearLayout* top_bar_layout_;
   nux::View* expander_view_;
   nux::LinearLayout* expander_layout_;
   nux::View* right_hand_contents_;
   StaticCairoText* cairo_label_;
-  std::string raw_label_;
-  std::string label_;
   nux::VLayout* arrow_layout_;
-  nux::SpaceLayout* arrow_top_space_;
-  nux::SpaceLayout* arrow_bottom_space_;
   IconTexture* expand_icon_;
 
   nux::ObjectPtr<nux::Layout> contents_;

=== modified file 'dash/FilterGenreWidget.cpp'
--- dash/FilterGenreWidget.cpp	2013-04-18 12:13:21 +0000
+++ dash/FilterGenreWidget.cpp	2014-07-10 12:35:22 +0000
@@ -35,6 +35,11 @@
 {
 namespace dash
 {
+namespace
+{
+const RawPixel CHILDREN_SPACE = 12_em;
+const RawPixel CHILDREN_SPACE_SMALLER = 10_em;
+}
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterGenre);
 
@@ -42,33 +47,41 @@
 : FilterExpanderLabel(_("Categories"), NUX_FILE_LINE_PARAM)
 , all_button_(nullptr)
 {
-  dash::Style& style = dash::Style::Instance();
-
   InitTheme();
 
-
   genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
   genre_layout_->ForceChildrenSize(true);
   genre_layout_->MatchContentSize(true);
-  genre_layout_->SetTopAndBottomPadding(style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding(), style.GetFilterHighlightPadding());
   genre_layout_->EnablePartialVisibility(false);
 
+  UpdateSize(columns);
+  SetContents(genre_layout_);
+
+  scale.changed.connect([this, columns] (double scale) {
+    if (all_button_) all_button_->scale = scale;
+
+    for (auto* button : buttons_)
+      button->scale = scale;
+
+    UpdateSize(columns);
+  });
+}
+
+void FilterGenre::UpdateSize(int columns)
+{
+  auto& style = dash::Style::Instance();
+  genre_layout_->SetTopAndBottomPadding(style.GetSpaceBetweenFilterWidgets().CP(scale) - style.GetFilterHighlightPadding().CP(scale), style.GetFilterHighlightPadding().CP(scale));
+
   if (columns == 3)
   {
-    genre_layout_->SetChildrenSize((style.GetFilterBarWidth() - 12 * 2) / 3, style.GetFilterButtonHeight());
-    genre_layout_->SetSpaceBetweenChildren (12, 12);
+    genre_layout_->SetChildrenSize((style.GetFilterBarWidth().CP(scale) - CHILDREN_SPACE.CP(scale) * 2) / 3, style.GetFilterButtonHeight().CP(scale));
+    genre_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale), CHILDREN_SPACE.CP(scale));
   }
   else
   {
-    genre_layout_->SetChildrenSize((style.GetFilterBarWidth() - 10 ) / 2, style.GetFilterButtonHeight());
-    genre_layout_->SetSpaceBetweenChildren (10, 12);
+    genre_layout_->SetChildrenSize((style.GetFilterBarWidth().CP(scale) - CHILDREN_SPACE_SMALLER.CP(scale)) / 2, style.GetFilterButtonHeight().CP(scale));
+    genre_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE_SMALLER.CP(scale), CHILDREN_SPACE.CP(scale));
   }
-
-  SetContents(genre_layout_);
-}
-
-FilterGenre::~FilterGenre()
-{
 }
 
 void FilterGenre::SetFilter(Filter::Ptr const& filter)
@@ -81,11 +94,14 @@
     all_button_ = show_all_button ? new FilterAllButton(NUX_TRACKER_LOCATION) : nullptr;
     SetRightHandView(all_button_);
     if (all_button_)
+    {
+      all_button_->scale = scale();
       all_button_->SetFilter(filter_);
+    }
   };
   show_button_func(filter_->show_all_button);
   filter_->show_all_button.changed.connect(show_button_func);
-  
+
   expanded = !filter_->collapsed();
 
   filter_->option_added.connect(sigc::mem_fun(this, &FilterGenre::OnOptionAdded));
@@ -106,6 +122,7 @@
   std::string label(escape.Value());
 
   FilterGenreButton* button = new FilterGenreButton(label, NUX_TRACKER_LOCATION);
+  button->scale = scale();
   button->SetFilter(new_filter);
   genre_layout_->AddView(button, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   buttons_.push_back(button);
@@ -121,7 +138,7 @@
     {
       genre_layout_->RemoveChildObject(*it);
       buttons_.erase(it);
-      
+
       QueueRelayout();
       break;
     }

=== modified file 'dash/FilterGenreWidget.h'
--- dash/FilterGenreWidget.h	2012-11-27 23:16:06 +0000
+++ dash/FilterGenreWidget.h	2014-07-10 12:35:22 +0000
@@ -46,7 +46,6 @@
   NUX_DECLARE_OBJECT_TYPE(FilterGenre, FilterExpanderLabel);
 public:
   FilterGenre(int columns, NUX_FILE_LINE_PROTO);
-  virtual ~FilterGenre();
 
   void SetFilter(Filter::Ptr const& filter);
   std::string GetFilterType();
@@ -59,6 +58,7 @@
 private:
   void OnOptionAdded(FilterOption::Ptr const& new_filter);
   void OnOptionRemoved(FilterOption::Ptr const& removed_filter);
+  void UpdateSize(int columns);
 
   nux::GridHLayout* genre_layout_;
   FilterAllButton* all_button_;

=== modified file 'dash/FilterMultiRangeButton.cpp'
--- dash/FilterMultiRangeButton.cpp	2013-11-14 03:00:29 +0000
+++ dash/FilterMultiRangeButton.cpp	2014-07-10 12:35:22 +0000
@@ -33,29 +33,18 @@
 
 namespace
 {
-const int kFontSizePx = 10;
-
-const int kLayoutPadLeftRight = 4;
-const int kLayoutPadtopBottom = 2;
+const int FONT_SIZE_PX = 10;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterMultiRangeButton);
 
 FilterMultiRangeButton::FilterMultiRangeButton(NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , theme_init_(false)
   , has_arrow_(MultiRangeArrow::NONE)
   , side_(MultiRangeSide::CENTER)
 {
-  Init();
-}
-
-FilterMultiRangeButton::~FilterMultiRangeButton()
-{
-}
-
-void FilterMultiRangeButton::Init()
-{
   InitTheme();
   // Controlled by parent widget
   SetAcceptKeyNavFocusOnMouseDown(false);
@@ -64,6 +53,8 @@
   state_change.connect(sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
   key_nav_focus_change.connect([this](nux::Area*, bool, nux::KeyNavDirection) { QueueDraw(); });
   key_nav_focus_activate.connect([this](nux::Area* area) { Active() ? Deactivate() : Activate(); });
+
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &FilterMultiRangeButton::InitTheme)));
 }
 
 void FilterMultiRangeButton::OnActivated(nux::Area* area)
@@ -133,27 +124,26 @@
 
 void FilterMultiRangeButton::InitTheme()
 {
-  if (!active_[MapKey(MultiRangeArrow::LEFT, MultiRangeSide::LEFT)])
+  nux::Geometry const& geo = GetGeometry();
+
+  std::vector<MultiRangeSide> sides = {MultiRangeSide::LEFT, MultiRangeSide::RIGHT, MultiRangeSide::CENTER};
+  std::vector<MultiRangeArrow> arrows = {MultiRangeArrow::LEFT, MultiRangeArrow::RIGHT, MultiRangeArrow::BOTH, MultiRangeArrow::NONE};
+
+  for (auto arrow : arrows)
   {
-    nux::Geometry const& geo = GetGeometry();
-
-    std::vector<MultiRangeSide> sides = {MultiRangeSide::LEFT, MultiRangeSide::RIGHT, MultiRangeSide::CENTER};
-    std::vector<MultiRangeArrow> arrows = {MultiRangeArrow::LEFT, MultiRangeArrow::RIGHT, MultiRangeArrow::BOTH, MultiRangeArrow::NONE};
-
-    for (auto arrow : arrows)
+    for (auto side : sides)
     {
-      for (auto side : sides)
-      {
-        active_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED, arrow, side)));
-        normal_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL, arrow, side)));
-        prelight_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT, arrow, side)));
-        focus_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawFocusOverlay), arrow, side)));
-      }
+      active_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED, arrow, side)));
+      normal_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL, arrow, side)));
+      prelight_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT, arrow, side)));
+      focus_[MapKey(arrow, side)].reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterMultiRangeButton::RedrawFocusOverlay), arrow, side)));
     }
   }
 
-  SetMinimumHeight(dash::Style::Instance().GetFilterButtonHeight() + 3);
+  SetMinimumHeight(Style::Instance().GetFilterButtonHeight().CP(scale) + (3_em).CP(scale));
   theme_init_ = true;
+
+  QueueDraw();
 }
 
 void FilterMultiRangeButton::RedrawTheme(nux::Geometry const& geom,
@@ -187,8 +177,9 @@
   else
     segment = Segment::RIGHT;
 
-  Style::Instance().MultiRangeSegment(cr, faked_state, name, kFontSizePx, arrow, segment);
-  NeedRedraw();
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
+  Style::Instance().MultiRangeSegment(cr, faked_state, name, FONT_SIZE_PX, arrow, segment);
+  QueueDraw();
 }
 
 void FilterMultiRangeButton::RedrawFocusOverlay(nux::Geometry const& geom,
@@ -214,6 +205,7 @@
   else
     segment = Segment::RIGHT;
 
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
   Style::Instance().MultiRangeFocusOverlay(cr, arrow, segment);
   QueueDraw();
 }

=== modified file 'dash/FilterMultiRangeButton.h'
--- dash/FilterMultiRangeButton.h	2013-11-08 15:05:51 +0000
+++ dash/FilterMultiRangeButton.h	2014-07-10 12:35:22 +0000
@@ -54,8 +54,9 @@
 {
   NUX_DECLARE_OBJECT_TYPE(FilterMultiRangeButton, nux::ToggleButton);
 public:
-  FilterMultiRangeButton (NUX_FILE_LINE_PROTO);
-  virtual ~FilterMultiRangeButton();
+  FilterMultiRangeButton(NUX_FILE_LINE_PROTO);
+
+  nux::Property<double> scale;
 
   void SetFilter(FilterOption::Ptr const& filter);
   FilterOption::Ptr GetFilter();
@@ -69,7 +70,6 @@
 
 private:
   void InitTheme();
-  void Init();
 
   void RedrawTheme(nux::Geometry const& geom,
                    cairo_t* cr,

=== modified file 'dash/FilterMultiRangeWidget.cpp'
--- dash/FilterMultiRangeWidget.cpp	2013-04-17 15:10:39 +0000
+++ dash/FilterMultiRangeWidget.cpp	2014-07-10 12:35:22 +0000
@@ -64,6 +64,13 @@
   mouse_up.connect(sigc::mem_fun(this, &FilterMultiRangeWidget::RecvMouseUp));
 
   mouse_drag.connect(sigc::mem_fun(this, &FilterMultiRangeWidget::RecvMouseDrag));
+
+  scale.changed.connect([this] (double scale) {
+    if (all_button_) all_button_->scale = scale;
+
+    for (auto const& button : buttons_)
+      button->scale = scale;
+  });
 }
 
 void FilterMultiRangeWidget::SetFilter(Filter::Ptr const& filter)
@@ -83,11 +90,14 @@
     all_button_ = show_all_button ? new FilterAllButton(NUX_TRACKER_LOCATION) : nullptr;
     SetRightHandView(all_button_);
     if (all_button_)
+    {
+      all_button_->scale = scale();
       all_button_->SetFilter(filter_);
+    }
   };
   show_button_func(filter_->show_all_button);
   filter_->show_all_button.changed.connect(show_button_func);
-  
+
   expanded = !filter_->collapsed();
 
   filter_->option_added.connect(sigc::mem_fun(this, &FilterMultiRangeWidget::OnOptionAdded));
@@ -151,6 +161,7 @@
 void FilterMultiRangeWidget::OnOptionAdded(FilterOption::Ptr const& new_filter)
 {
   FilterMultiRangeButtonPtr button(new FilterMultiRangeButton(NUX_TRACKER_LOCATION));
+  button->scale = scale();
   button->SetFilter(new_filter);
   layout_->AddView(button.GetPointer());
   buttons_.push_back(button);

=== modified file 'dash/FilterRatingsButton.cpp'
--- dash/FilterRatingsButton.cpp	2013-11-14 03:00:29 +0000
+++ dash/FilterRatingsButton.cpp	2014-07-10 12:35:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Canonical Ltd.
+ * Copyright 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3, as
@@ -15,66 +15,39 @@
  * License version 3 along with this program.  If not, see
  * <http://www.gnu.org/licenses/>
  *
- * Authored by: Gordon Allott <[e-mail]>
+ * Authored by: Marco Trevisan <[e-mail]>
  *
  */
 
-#include <math.h>
-
-#include <Nux/Nux.h>
-#include <NuxCore/Logger.h>
-
-#include "unity-shared/DashStyle.h"
 #include "FilterRatingsButton.h"
 
 namespace
 {
-const int star_size = 28;
-const int star_gap  = 10;
-const int num_stars = 5;
+const int STAR_SIZE = 28;
+const int STAR_GAP  = 10;
 }
 
 namespace unity
 {
 namespace dash
 {
-  
+
 NUX_IMPLEMENT_OBJECT_TYPE(FilterRatingsButton);
 
 FilterRatingsButton::FilterRatingsButton(NUX_FILE_LINE_DECL)
-  : nux::ToggleButton(NUX_FILE_LINE_PARAM)
-  , focused_star_(-1)
-{
-  SetAcceptKeyNavFocusOnMouseDown(false);
-  SetAcceptKeyNavFocusOnMouseEnter(true);
-
-  mouse_up.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseUp));
-  mouse_move.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseMove));
-  mouse_drag.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseDrag));
-
-  key_nav_focus_change.connect([this](nux::Area* area, bool has_focus, nux::KeyNavDirection direction)
-  {
-    if (has_focus)
-      focused_star_ = 0;
-    else if (!has_focus)
-      focused_star_ = -1;
-
-    QueueDraw();
-  });
-
-  key_nav_focus_activate.connect([this](nux::Area*) { filter_->rating = static_cast<float>(focused_star_+1)/num_stars; });
-  key_down.connect(sigc::mem_fun(this, &FilterRatingsButton::OnKeyDown));
-}
-
-FilterRatingsButton::~FilterRatingsButton()
-{
-}
+  : RatingsButton(STAR_SIZE, STAR_GAP, NUX_FILE_LINE_PARAM)
+{}
 
 void FilterRatingsButton::SetFilter(Filter::Ptr const& filter)
 {
   filter_ = std::static_pointer_cast<RatingsFilter>(filter);
-  filter_->rating.changed.connect(sigc::mem_fun(this, &FilterRatingsButton::OnRatingsChanged));
-  NeedRedraw();
+  filter_->rating.changed.connect(sigc::mem_fun(this, &FilterRatingsButton::SetRating));
+  QueueDraw();
+}
+
+RatingsFilter::Ptr FilterRatingsButton::GetFilter() const
+{
+  return filter_;
 }
 
 std::string FilterRatingsButton::GetFilterType()
@@ -82,188 +55,22 @@
   return "FilterRatingsButton";
 }
 
-void FilterRatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
-{
-  int rating = 0;
-  if (filter_ && filter_->filtering)
-    rating = static_cast<int>(filter_->rating * num_stars);
-  // FIXME: 9/26/2011
-  // We should probably support an API for saying whether the ratings
-  // should or shouldn't support half stars...but our only consumer at
-  // the moment is the applications scope which according to design
-  // (Bug #839759) shouldn't. So for now just force rounding.
-  //    int total_half_stars = rating % 2;
-  //    int total_full_stars = rating / 2;
-  int total_full_stars = rating;
-
-  nux::Geometry const& geo = GetGeometry();
-  nux::Geometry geo_star(geo);
-  geo_star.width = star_size;
-
-  gPainter.PaintBackground(GfxContext, geo);
-  // set up our texture mode
-  nux::TexCoordXForm texxform;
-  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
-  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-
-  // clear what is behind us
-  unsigned int alpha = 0, src = 0, dest = 0;
-
-  GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
-  GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-  nux::Color col = nux::color::Black;
-  col.alpha = 0;
-  GfxContext.QRP_Color(geo.x,
-                       geo.y,
-                       geo.width,
-                       geo.height,
-                       col);
-
-  for (int index = 0; index < num_stars; ++index)
-  {
-    Style& style = Style::Instance();
-    nux::BaseTexture* texture = style.GetStarSelectedIcon();
-    if (index < total_full_stars)
-    {
-      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-        texture = style.GetStarSelectedIcon();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-        texture = style.GetStarSelectedIcon();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-        texture = style.GetStarSelectedIcon();
-    }
-    else
-    {
-      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-        texture = style.GetStarDeselectedIcon();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-        texture = style.GetStarDeselectedIcon();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-        texture = style.GetStarDeselectedIcon();
-    }
-
-    GfxContext.QRP_1Tex(geo_star.x,
-                        geo_star.y,
-                        geo_star.width,
-                        geo_star.height,
-                        texture->GetDeviceTexture(),
-                        texxform,
-                        nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-
-    if (focused_star_ == index)
-    {
-      GfxContext.QRP_1Tex(geo_star.x,
-                          geo_star.y,
-                          geo_star.width,
-                          geo_star.height,
-                          style.GetStarHighlightIcon()->GetDeviceTexture(),
-                          texxform,
-                          nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
-    }
-
-    geo_star.x += geo_star.width + star_gap;
-
-  }
-
-  GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
-
-}
-
-static void _UpdateRatingToMouse(RatingsFilter::Ptr filter, int x)
-{
-  int width = 180;
-  float new_rating = (static_cast<float>(x) / width);
-
-  // FIXME: change to * 2 once we decide to support also half-stars
-  new_rating = ceil((num_stars * 1) * new_rating) / (num_stars * 1);
-  new_rating = (new_rating > 1) ? 1 : ((new_rating < 0) ? 0 : new_rating);
-
-  if (filter)
-    filter->rating = new_rating;
-}
-
-void FilterRatingsButton::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
-{
-  _UpdateRatingToMouse(filter_, x);
-}
-
-void FilterRatingsButton::RecvMouseDrag(int x, int y, int dx, int dy,
-                                        unsigned long button_flags,
-                                        unsigned long key_flags)
-{
-  _UpdateRatingToMouse(filter_, x);
-}
-
-void FilterRatingsButton::OnRatingsChanged(int rating)
-{
-  NeedRedraw();
-}
-
-void FilterRatingsButton::RecvMouseMove(int x, int y, int dx, int dy,
-                                        unsigned long button_flags,
-                                        unsigned long key_flags)
-{
-  int width = 180;
-  focused_star_ = std::max(0, std::min(static_cast<int>(ceil((static_cast<float>(x) / width) * num_stars) - 1), num_stars - 1));
-
-  if (!HasKeyFocus())
-    nux::GetWindowCompositor().SetKeyFocusArea(this);
-
-  QueueDraw();
-}
-
-
-bool FilterRatingsButton::InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character)
-{
-  nux::KeyNavDirection direction = nux::KEY_NAV_NONE;
-
-  switch (keysym)
-  {
-    case NUX_VK_LEFT:
-      direction = nux::KeyNavDirection::KEY_NAV_LEFT;
-      break;
-    case NUX_VK_RIGHT:
-      direction = nux::KeyNavDirection::KEY_NAV_RIGHT;
-      break;
-    default:
-      direction = nux::KeyNavDirection::KEY_NAV_NONE;
-      break;
-  }
-
-  if (direction == nux::KeyNavDirection::KEY_NAV_NONE)
-    return false;
-  else if (direction == nux::KEY_NAV_LEFT && (focused_star_ <= 0))
-    return false;
-  else if (direction == nux::KEY_NAV_RIGHT && (focused_star_ >= num_stars - 1))
-    return false;
-  else
-   return true;
-}
-
-
-void FilterRatingsButton::OnKeyDown(unsigned long event_type, unsigned long event_keysym,
-                                    unsigned long event_state, const TCHAR* character,
-                                    unsigned short key_repeat_count)
-{
-  switch (event_keysym)
-  {
-    case NUX_VK_LEFT:
-      --focused_star_;
-      break;
-    case NUX_VK_RIGHT:
-      ++focused_star_;
-      break;
-    default:
-      return;
-  }
-
-  QueueDraw();
-}
-
-bool FilterRatingsButton::AcceptKeyNavFocus()
-{
-  return true;
+std::string FilterRatingsButton::GetName() const
+{
+  return "FilterRatingsButton";
+}
+
+void FilterRatingsButton::SetRating(float rating)
+{
+  if (filter_)
+    filter_->rating = rating;
+
+  QueueDraw();
+}
+
+float FilterRatingsButton::GetRating() const
+{
+  return (filter_ && filter_->filtering) ? filter_->rating : 0;
 }
 
 } // namespace dash

=== modified file 'dash/FilterRatingsButton.h'
--- dash/FilterRatingsButton.h	2012-12-13 09:19:34 +0000
+++ dash/FilterRatingsButton.h	2014-07-10 12:35:22 +0000
@@ -25,46 +25,33 @@
 #include <memory>
 
 #include <Nux/Nux.h>
-#include <Nux/ToggleButton.h>
-#include <Nux/CairoWrapper.h>
 #include <UnityCore/RatingsFilter.h>
+#include "unity-shared/RatingsButton.h"
 
 namespace unity
 {
 namespace dash
 {
 
-class FilterRatingsButton : public nux::ToggleButton
+class FilterRatingsButton : public RatingsButton
 {
-  NUX_DECLARE_OBJECT_TYPE(FilterRatingsButton, nux::ToggleButton);
+  NUX_DECLARE_OBJECT_TYPE(FilterRatingsButton, RatingsButton);
 public:
   FilterRatingsButton(NUX_FILE_LINE_PROTO);
-  virtual ~FilterRatingsButton();
 
   void SetFilter(Filter::Ptr const& filter);
-  RatingsFilter::Ptr GetFilter();
+  RatingsFilter::Ptr GetFilter() const;
   std::string GetFilterType();
 
 protected:
-  virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  // Introspectable methods
+  std::string GetName() const;
 
-  // Key-nav
-  virtual bool AcceptKeyNavFocus();
-  virtual bool InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character);
+  void SetRating(float rating) override;
+  float GetRating() const override;
 
 private:
-  void OnKeyDown(unsigned long event_type, unsigned long event_keysym,
-                 unsigned long event_state, const TCHAR* character,
-                 unsigned short key_repeat_count);
-
-  void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-  void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-  void OnRatingsChanged(int rating);
-
   dash::RatingsFilter::Ptr filter_;
-  int focused_star_;
-
 };
 
 } // namespace dash

=== modified file 'dash/FilterRatingsWidget.cpp'
--- dash/FilterRatingsWidget.cpp	2013-03-19 18:22:11 +0000
+++ dash/FilterRatingsWidget.cpp	2014-07-10 12:35:22 +0000
@@ -33,15 +33,14 @@
 #include "FilterRatingsButton.h"
 #include "FilterRatingsWidget.h"
 
-namespace
-{
-const int star_size      = 28;
-}
-
 namespace unity
 {
 namespace dash
 {
+namespace
+{
+const RawPixel STAR_SIZE = 28_em;
+}
 
 NUX_IMPLEMENT_OBJECT_TYPE(FilterRatingsWidget);
 
@@ -49,22 +48,30 @@
 : FilterExpanderLabel(_("Rating"), NUX_FILE_LINE_PARAM)
 , all_button_(nullptr)
 {
-  dash::Style& style = dash::Style::Instance();
-  const int top_padding    = style.GetSpaceBetweenFilterWidgets() - style.GetFilterHighlightPadding() - 1; // -1 (PNGs have an 1px top padding)
-  const int bottom_padding = style.GetFilterHighlightPadding();
-
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout->SetTopAndBottomPadding(top_padding, bottom_padding);
   ratings_ = new FilterRatingsButton(NUX_TRACKER_LOCATION);
-  ratings_->SetMinimumHeight(star_size);
 
   layout->AddView(ratings_);
 
+  UpdateSize();
   SetContents(layout);
+
+  scale.changed.connect([this] (double scale) {
+    if (all_button_) all_button_->scale = scale;
+    UpdateSize();
+  });
 }
 
-FilterRatingsWidget::~FilterRatingsWidget()
+void FilterRatingsWidget::UpdateSize()
 {
+  dash::Style& style = dash::Style::Instance();
+  int top_padding = style.GetSpaceBetweenFilterWidgets().CP(scale) - style.GetFilterHighlightPadding().CP(scale) - (1_em).CP(scale); // -1 (PNGs have an 1px top padding)
+  int bottom_padding = style.GetFilterHighlightPadding().CP(scale);
+  static_cast<nux::VLayout*>(GetLayout())->SetTopAndBottomPadding(top_padding, bottom_padding);
+
+  ratings_->scale = scale();
+  ratings_->SetMinimumHeight(STAR_SIZE.CP(scale));
+  ratings_->ApplyMinHeight();
 }
 
 void FilterRatingsWidget::SetFilter(Filter::Ptr const& filter)
@@ -77,7 +84,10 @@
     all_button_ = show_all_button ? new FilterAllButton(NUX_TRACKER_LOCATION) : nullptr;
     SetRightHandView(all_button_);
     if (all_button_)
+    {
+      all_button_->scale = scale();
       all_button_->SetFilter(filter_);
+    }
   };
   show_button_func(filter_->show_all_button);
   filter_->show_all_button.changed.connect(show_button_func);

=== modified file 'dash/FilterRatingsWidget.h'
--- dash/FilterRatingsWidget.h	2012-11-27 23:16:06 +0000
+++ dash/FilterRatingsWidget.h	2014-07-10 12:35:22 +0000
@@ -45,7 +45,6 @@
   NUX_DECLARE_OBJECT_TYPE(FilterRatingsWidget, FilterExpanderLabel);
 public:
   FilterRatingsWidget(NUX_FILE_LINE_PROTO);
-  virtual ~FilterRatingsWidget();
 
   void SetFilter(Filter::Ptr const& filter);
   std::string GetFilterType();
@@ -54,6 +53,8 @@
   void ClearRedirectedRenderChildArea();
 
 private:
+  void UpdateSize();
+
   FilterAllButton* all_button_;
   FilterRatingsButton* ratings_;
   RatingsFilter::Ptr filter_;

=== modified file 'dash/ScopeBar.cpp'
--- dash/ScopeBar.cpp	2014-07-10 12:35:22 +0000
+++ dash/ScopeBar.cpp	2014-07-10 12:35:22 +0000
@@ -70,6 +70,9 @@
 
   for (auto icon : icons_)
     icon->scale = scale;
+
+  QueueDraw();
+  QueueRelayout();
 }
 
 void ScopeBar::SetupLayout()

=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2014-07-10 12:35:22 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2014-07-10 12:35:22 +0000
@@ -29,6 +29,7 @@
 #include "unity-shared/RatingsButton.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/DashStyle.h"
 #include "PreviewRatingsWidget.h"
 
 namespace unity
@@ -41,8 +42,8 @@
 namespace
 {
   const RawPixel CHILDREN_SPACE = 3_em;
-  const RawPixel RATINGS_SIZE = 18_em;
-  const RawPixel RATINGS_GAP = 2_em;
+  const int RATINGS_SIZE = 18;
+  const int RATINGS_GAP = 2;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(PreviewRatingsWidget);
@@ -58,9 +59,10 @@
 
   auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
-  ratings_ = new RatingsButton(RATINGS_SIZE.CP(scale), RATINGS_GAP.CP(scale));
+  ratings_ = new RatingsButton(RATINGS_SIZE, RATINGS_GAP);
   ratings_->SetEditable(false);
   ratings_->mouse_click.connect(on_mouse_down);
+  ratings_->scale = scale();
   layout_->AddView(ratings_);
 
   reviews_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
@@ -77,10 +79,6 @@
   scale.changed.connect(sigc::mem_fun(this, &PreviewRatingsWidget::UpdateScale));
 }
 
-PreviewRatingsWidget::~PreviewRatingsWidget()
-{
-}
-
 void PreviewRatingsWidget::SetRating(float rating)
 {
   ratings_->SetRating(rating);
@@ -128,19 +126,10 @@
 
 void PreviewRatingsWidget::UpdateScale(double scale)
 {
-  if (reviews_)
-    reviews_->SetScale(scale);
-
-  if (ratings_)
-  {
-    ratings_->star_size_ = RATINGS_SIZE.CP(scale);
-    ratings_->star_gap_ = RATINGS_GAP.CP(scale);
-  }
-
+  reviews_->SetScale(scale);
+  ratings_->scale = scale;
   preview_container_.scale = scale;
-
-  if (layout_)
-    layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   QueueRelayout();
   QueueDraw();

=== modified file 'dash/previews/PreviewRatingsWidget.h'
--- dash/previews/PreviewRatingsWidget.h	2014-07-10 12:35:22 +0000
+++ dash/previews/PreviewRatingsWidget.h	2014-07-10 12:35:22 +0000
@@ -45,7 +45,6 @@
   NUX_DECLARE_OBJECT_TYPE(PreviewRatingsWidget, nux::View);
 public:
   PreviewRatingsWidget(NUX_FILE_LINE_PROTO);
-  virtual ~PreviewRatingsWidget();
 
   void SetRating(float rating);
   float GetRating() const;

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2014-02-20 19:43:52 +0000
+++ hud/HudView.cpp	2014-07-10 12:35:22 +0000
@@ -367,8 +367,6 @@
 
 void View::SetupViews()
 {
-  dash::Style& style = dash::Style::Instance();
-
   nux::VLayout* super_layout = new nux::VLayout();
   layout_ = new nux::HLayout();
   {
@@ -388,8 +386,6 @@
 
       // add the search bar to the composite
       search_bar_ = new unity::SearchBar(true);
-      search_bar_->SetMinimumHeight(style.GetSearchBarHeight());
-      search_bar_->SetMaximumHeight(style.GetSearchBarHeight());
       search_bar_->search_hint = _("Type your command");
       search_bar_->live_search_reached.connect(sigc::mem_fun(this, &View::OnSearchChanged));
       AddChild(search_bar_.GetPointer());

=== modified file 'unity-shared/RatingsButton.cpp'
--- unity-shared/RatingsButton.cpp	2014-06-16 09:16:53 +0000
+++ unity-shared/RatingsButton.cpp	2014-07-10 12:35:22 +0000
@@ -29,13 +29,14 @@
 
 namespace
 {
-const int num_stars = 5;
+const int NUM_STARS = 5;
 }
 
 namespace unity
 {
 RatingsButton::RatingsButton(int star_size, int star_gap, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , star_size_(star_size)
   , star_gap_(star_gap)
   , editable_(true)
@@ -58,12 +59,11 @@
 
     QueueDraw();
   });
-  key_nav_focus_activate.connect([this](nux::Area*) { SetRating(static_cast<float>(focused_star_+1)/num_stars); });
+
+  key_nav_focus_activate.connect([this](nux::Area*) { SetRating(static_cast<float>(focused_star_+1)/NUM_STARS); });
   key_down.connect(sigc::mem_fun(this, &RatingsButton::OnKeyDown));
-}
 
-RatingsButton::~RatingsButton()
-{
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &RatingsButton::QueueDraw)));
 }
 
 void RatingsButton::SetEditable(bool editable)
@@ -76,7 +76,7 @@
 
 void RatingsButton::SetRating(float rating)
 {
-  rating_  = rating;
+  rating_ = rating;
   QueueDraw();
 }
 
@@ -87,7 +87,7 @@
 
 void RatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
-  int rating =  static_cast<int>(rating_ * num_stars);
+  int rating =  static_cast<int>(GetRating() * NUM_STARS);
   // FIXME: 9/26/2011
   // We should probably support an API for saying whether the ratings
   // should or shouldn't support half stars...but our only consumer at
@@ -99,8 +99,8 @@
 
   nux::Geometry const& geo = GetGeometry();
   nux::Geometry geo_star(geo);
-  geo_star.width = star_size_;
-  geo_star.height = star_size_;
+  geo_star.width = star_size_.CP(scale);
+  geo_star.height = star_size_.CP(scale);
 
   gPainter.PaintBackground(GfxContext, geo);
   // set up our texture mode
@@ -123,7 +123,7 @@
                        geo.height,
                        col);
 
-  for (int index = 0; index < num_stars; ++index)
+  for (int index = 0; index < NUM_STARS; ++index)
   {
     dash::Style& style = dash::Style::Instance();
     nux::BaseTexture* texture = style.GetStarSelectedIcon();
@@ -165,7 +165,7 @@
                           nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
     }
 
-    geo_star.x += geo_star.width + star_gap_;
+    geo_star.x += geo_star.width + star_gap_.CP(scale);
 
   }
 
@@ -175,11 +175,11 @@
 
 void RatingsButton::UpdateRatingToMouse(int x)
 {
-  int width = num_stars*star_size_ + (num_stars-1)*star_gap_;
+  int width = NUM_STARS*star_size_.CP(scale) + (NUM_STARS-1)*star_gap_.CP(scale);
   float new_rating = (static_cast<float>(x) / width);
 
   // FIXME: change to * 2 once we decide to support also half-stars
-  new_rating = ceil((num_stars * 1) * new_rating) / (num_stars * 1);
+  new_rating = ceil((NUM_STARS * 1) * new_rating) / (NUM_STARS * 1);
   new_rating = (new_rating > 1) ? 1 : ((new_rating < 0) ? 0 : new_rating);
 
   SetRating(new_rating);
@@ -210,8 +210,8 @@
   if (!editable_)
     return;
 
-  int width = num_stars*star_size_+ (num_stars-1)*star_gap_;
-  focused_star_ = std::max(0, std::min(static_cast<int>(ceil((static_cast<float>(x) / width) * num_stars) - 1), num_stars - 1));
+  int width = NUM_STARS*star_size_.CP(scale)+ (NUM_STARS-1)*star_gap_.CP(scale);
+  focused_star_ = std::max(0, std::min(static_cast<int>(ceil((static_cast<float>(x) / width) * NUM_STARS) - 1), NUM_STARS - 1));
 
   if (!HasKeyFocus())
     nux::GetWindowCompositor().SetKeyFocusArea(this);
@@ -240,7 +240,7 @@
     return false;
   else if (direction == nux::KEY_NAV_LEFT && (focused_star_ <= 0))
     return false;
-  else if (direction == nux::KEY_NAV_RIGHT && (focused_star_ >= num_stars - 1))
+  else if (direction == nux::KEY_NAV_RIGHT && (focused_star_ >= NUM_STARS - 1))
     return false;
   else
    return true;
@@ -283,7 +283,7 @@
 {
   introspection
     .add(GetAbsoluteGeometry())
-    .add("rating", rating_)
+    .add("rating", GetRating())
     .add("focused-star", focused_star_)
     .add("editable", editable_);
 }

=== modified file 'unity-shared/RatingsButton.h'
--- unity-shared/RatingsButton.h	2014-06-16 09:16:53 +0000
+++ unity-shared/RatingsButton.h	2014-07-10 12:35:22 +0000
@@ -27,6 +27,7 @@
 #include <Nux/Nux.h>
 #include <Nux/ToggleButton.h>
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/RawPixel.h"
 
 namespace unity
 {
@@ -35,15 +36,13 @@
 {
 public:
   RatingsButton(int star_size, int star_gap, NUX_FILE_LINE_PROTO);
-  virtual ~RatingsButton();
+
+  nux::Property<double> scale;
 
   void SetEditable(bool editable);
   virtual void SetRating(float rating);
   virtual float GetRating() const;
 
-  int star_size_;
-  int star_gap_;
-
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
@@ -65,8 +64,9 @@
   void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
   void UpdateRatingToMouse(int x);
 
-
 protected:
+  RawPixel star_size_;
+  RawPixel star_gap_;
   bool editable_;
   float rating_;
   int focused_star_;

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-07-10 12:35:22 +0000
+++ unity-shared/SearchBar.cpp	2014-07-10 12:35:22 +0000
@@ -62,6 +62,8 @@
 const RawPixel BOT_ARROW_MIN_HEIGHT = 8_em;
 const RawPixel BOT_ARROW_MAX_HEIGHT = 8_em;
 
+const RawPixel FILTER_HORIZONTAL_MARGIN = 8_em;
+
 // Fonts
 const std::string HINT_LABEL_FONT_SIZE = "20px";
 const std::string HINT_LABEL_FONT_STYLE = "Italic";
@@ -195,19 +197,12 @@
     show_filters_->SetScale(scale);
     show_filters_->SetLines(-1);
 
-    nux::BaseTexture* arrow;
-    arrow = style.GetGroupExpandIcon();
-    expand_icon_ = new IconTexture(arrow,
-                                   arrow->GetWidth(),
-                                   arrow->GetHeight());
+    expand_icon_ = new IconTexture(style.GetGroupExpandIcon());
     expand_icon_->SetOpacity(DEFAULT_ICON_OPACITY);
-    expand_icon_->SetMinimumSize(arrow->GetWidth(), arrow->GetHeight());
+    expand_icon_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
     expand_icon_->SetVisible(false);
 
     filter_layout_ = new nux::HLayout();
-    filter_layout_->SetHorizontalInternalMargin(8);
-    filter_layout_->SetLeftAndRightPadding(style.GetFilterResultsHighlightLeftPadding(),
-                                           style.GetFilterResultsHighlightRightPadding());
     filter_layout_->SetContentDistribution(nux::MAJOR_POSITION_END);
     filter_layout_->AddView(show_filters_, 0, nux::MINOR_POSITION_CENTER);
 
@@ -233,14 +228,6 @@
     expander_view_->SetLayout(filter_layout_);
     layout_->AddView(expander_view_, 0, nux::MINOR_POSITION_END, nux::MINOR_SIZE_FULL);
 
-    int width = style.GetFilterBarWidth() +
-                style.GetFilterResultsHighlightLeftPadding() +
-                style.GetFilterResultsHighlightRightPadding();
-
-    expander_view_->SetMaximumWidth(width);
-    expander_view_->SetMinimumWidth(width);
-    show_filters_->SetMaximumWidth(style.GetFilterBarWidth() - arrow_layout_->GetBaseWidth() - 8);
-
     // Lambda functions
     auto mouse_expand = [this](int, int, unsigned long, unsigned long)
     {
@@ -291,6 +278,8 @@
 
 void SearchBar::UpdateSearchBarSize()
 {
+  auto& style = dash::Style::Instance();
+
   layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING.CP(scale()),
                                   SEARCH_ENTRY_RIGHT_BORDER.CP(scale()));
   layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT.CP(scale()));
@@ -313,6 +302,21 @@
                                         BOT_ARROW_MIN_HEIGHT.CP(scale()));
     arrow_bottom_space_->SetMaximumSize(ARROW_MAX_WIDTH.CP(scale()),
                                         BOT_ARROW_MAX_HEIGHT.CP(scale()));
+
+    int highlight_left_padding = style.GetFilterResultsHighlightLeftPadding().CP(scale);
+    int highlight_right_padding = style.GetFilterResultsHighlightRightPadding().CP(scale);
+    int filter_bar_width = style.GetFilterBarWidth().CP(scale);
+
+    filter_layout_->SetHorizontalInternalMargin(FILTER_HORIZONTAL_MARGIN.CP(scale));
+    filter_layout_->SetLeftAndRightPadding(highlight_left_padding, highlight_right_padding);
+    show_filters_->SetMaximumWidth(filter_bar_width - arrow_layout_->GetBaseWidth() - (8_em).CP(scale));
+
+    int width = filter_bar_width + highlight_right_padding + highlight_right_padding;
+    expander_view_->SetMaximumWidth(width);
+    expander_view_->SetMinimumWidth(width);
+
+    auto const& arrow = expand_icon_->texture();
+    expand_icon_->SetMinMaxSize(RawPixel(arrow->GetWidth()).CP(scale), RawPixel(arrow->GetHeight()).CP(scale));
   }
 
   // Based on the Font size, the MinHeight is changing in TextEntry. From there the
@@ -324,6 +328,10 @@
   pango_entry_->SetMaximumHeight(entry_min);
   layered_layout_->SetMinimumHeight(entry_min);
   layered_layout_->SetMaximumHeight(entry_min);
+
+  int search_bar_height = style.GetSearchBarHeight().CP(scale);
+  SetMinimumHeight(search_bar_height);
+  SetMaximumHeight(search_bar_height);
 }
 
 void SearchBar::UpdateScale(double scale)
@@ -333,7 +341,7 @@
   hint_->SetScale(scale);
   spinner_->scale = scale;
 
-  if (show_filters_)
+  if (show_filter_hint_)
     show_filters_->SetScale(scale);
 
   UpdateSearchBarSize();
@@ -371,11 +379,7 @@
 
 void SearchBar::OnSearchHintChanged()
 {
-  gchar* tmp = g_markup_escape_text(search_hint().c_str(), -1);
-
-  hint_->SetText(tmp);
-
-  g_free(tmp);
+  hint_->SetText(glib::String(g_markup_escape_text(search_hint().c_str(), -1)).Str());
 }
 
 void SearchBar::OnSearchChanged(nux::TextEntry* text_entry)
@@ -422,6 +426,9 @@
       expand_icon_->SetTexture(style.GetGroupUnexpandIcon());
     else
       expand_icon_->SetTexture(style.GetGroupExpandIcon());
+
+    auto const& arrow = expand_icon_->texture();
+    expand_icon_->SetMinMaxSize(RawPixel(arrow->GetWidth()).CP(scale), RawPixel(arrow->GetHeight()).CP(scale));
   }
 }
 

=== modified file 'unity-shared/SpreadFilter.cpp'
--- unity-shared/SpreadFilter.cpp	2014-04-01 17:13:29 +0000
+++ unity-shared/SpreadFilter.cpp	2014-07-10 12:35:22 +0000
@@ -38,7 +38,6 @@
 const RawPixel OFFSET_X = 10_em;
 const RawPixel OFFSET_Y = 15_em;
 const RawPixel WIDTH = 620_em;
-const RawPixel HEIGHT = 42_em;
 
 // For some reason std::to_lower or boost::to_lower_copy doesn't seem to handle well utf8
 std::string casefold_copy(std::string const& str)
@@ -58,7 +57,8 @@
   auto const& cv = settings.em(monitor);
 
   search_bar_ = SearchBar::Ptr(new SearchBar());
-  search_bar_->SetMinMaxSize(WIDTH.CP(cv), HEIGHT.CP(cv));
+  search_bar_->SetMinimumWidth(WIDTH.CP(cv));
+  search_bar_->SetMaximumWidth(WIDTH.CP(cv));
   search_bar_->scale = cv->DPIScale();
   search_bar_->live_search_wait = DEFAULT_SEARCH_WAIT;
   text.SetGetterFunction([this] { return search_bar_->search_string(); });