Merge lp:~unity-team/unity/prepare-7.2.3-SRU into lp:unity/7.2

[Christopher Townsend]

Prepare fixes for upstream micro-release 7.2.3.

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

I think it would be nice to include in this revision also the other hidpi branches that have been approved recently or that are about to be finished, so that we can just make one trusty landing with all the HiDPI fixes at once.

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-07-01 15:24:59 +0000
+++ UnityCore/GnomeSessionManager.cpp	2014-08-06 16:03:19 +0000
@@ -91,6 +91,11 @@
   shell_object_ = shell_server_.GetObject(shell::DBUS_INTERFACE);
   shell_object_->SetMethodsCallsHandler(sigc::mem_fun(this, &Impl::OnShellMethodCall));
 
+  manager_->is_locked = false;
+  manager_->is_locked.changed.connect([this] (bool locked) {
+    locked ? manager_->locked.emit() : manager_->unlocked.emit();
+  });
+
   {
     const char* session_id = test_mode_ ? "id0" : g_getenv("XDG_SESSION_ID");
 
@@ -421,21 +426,13 @@
 {
   EnsureCancelPendingAction();
 
+  if (!manager_->CanLock())
+  {
+    manager_->ScreenSaverActivate();
+    return;
+  }
+
   // FIXME (andy) we should ask gnome-session to emit the logind signal
-  glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
-
-  if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()))
-  {
-    manager_->ScreenSaverActivate();
-    return;
-  }
-  else if (manager_->UserName().find("guest-") == 0)
-  {
-    LOG_INFO(logger) << "Impossible to lock a guest session";
-    manager_->ScreenSaverActivate();
-    return;
-  }
-
   prompt ? manager_->prompt_lock_requested.emit() : manager_->lock_requested.emit();
 }
 
@@ -454,6 +451,39 @@
   });
 }
 
+bool GnomeManager::Impl::HasInhibitors()
+{
+  glib::Error error;
+  glib::Object<GDBusConnection> bus(g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error));
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to get the session bus, to fetch the inhibitors: " << error;
+    return false;
+  }
+
+  enum class Inhibited : unsigned
+  {
+    LOGOUT = 1,
+    USER_SWITCH = 2,
+    SUSPEND = 4,
+    IDLE_SET = 8
+  };
+
+  glib::Variant inhibitors(g_dbus_connection_call_sync(bus, test_mode_ ? testing::DBUS_NAME.c_str() : "org.gnome.SessionManager",
+                                                       "/org/gnome/SessionManager", "org.gnome.SessionManager",
+                                                       "IsInhibited", g_variant_new("(u)", Inhibited::LOGOUT), nullptr,
+                                                       G_DBUS_CALL_FLAGS_NONE, 500, nullptr, &error));
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to get the inhibitors: " << error;
+    return false;
+  }
+
+  return inhibitors.GetBool();
+}
+
 // Public implementation
 
 GnomeManager::GnomeManager()
@@ -617,6 +647,19 @@
   });
 }
 
+bool GnomeManager::CanLock() const
+{
+  glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
+
+  if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()) ||
+      UserName().find("guest-") == 0 || is_locked())
+  {
+    return false;
+  }
+
+  return true;
+}
+
 bool GnomeManager::CanShutdown() const
 {
   return impl_->can_shutdown_;
@@ -632,6 +675,11 @@
   return impl_->can_hibernate_;
 }
 
+bool GnomeManager::HasInhibitors() const
+{
+  return impl_->HasInhibitors();
+}
+
 void GnomeManager::CancelAction()
 {
   impl_->CancelAction();
 
=== modified file 'UnityCore/GnomeSessionManager.h'
--- UnityCore/GnomeSessionManager.h	2014-04-10 04:47:58 +0000
+++ UnityCore/GnomeSessionManager.h	2014-08-06 16:03:19 +0000
@@ -47,9 +47,11 @@
   void Suspend();
   void Hibernate();
 
+  bool CanLock() const;
   bool CanShutdown() const;
   bool CanSuspend() const;
   bool CanHibernate() const;
+  bool HasInhibitors() const;
 
   void CancelAction();
 
 
=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2014-07-01 15:24:59 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2014-08-06 16:03:19 +0000
@@ -51,6 +51,7 @@
   void ConfirmShutdown();
   void CancelAction();
   void ClosedDialog();
+  bool HasInhibitors();
   void EnsureCancelPendingAction();
   void LockScreen(bool prompt);
 
 
=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2014-07-01 15:24:59 +0000
+++ UnityCore/SessionManager.h	2014-08-06 16:03:19 +0000
@@ -39,6 +39,7 @@
   virtual ~Manager() = default;
 
   nux::ROProperty<bool> have_other_open_sessions;
+  nux::Property<bool> is_locked;
 
   virtual std::string RealName() const = 0;
   virtual std::string UserName() const = 0;
@@ -54,9 +55,11 @@
   virtual void Suspend() = 0;
   virtual void Hibernate() = 0;
 
+  virtual bool CanLock() const = 0;
   virtual bool CanShutdown() const = 0;
   virtual bool CanSuspend() const = 0;
   virtual bool CanHibernate() const = 0;
+  virtual bool HasInhibitors() const = 0;
 
   virtual void CancelAction() = 0;
 
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-06-23 19:42:24 +0000
+++ dash/DashController.cpp	2014-08-06 16:03:19 +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-04-25 02:42:01 +0000
+++ dash/DashView.cpp	2014-08-06 16:03:19 +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"
@@ -57,6 +56,8 @@
 
 const RawPixel DASH_RESULT_RIGHT_PAD = 35_em;
 const RawPixel PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET = 10_em;
+const RawPixel PREVIEW_CONTAINER_TRIANGLE_WIDTH = 14_em;
+const RawPixel PREVIEW_CONTAINER_TRIANGLE_HEIGHT = 12_em;
 
 const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 1000;
 }
@@ -112,6 +113,7 @@
 
 DashView::DashView(Scopes::Ptr const& scopes, ApplicationStarter::Ptr const& application_starter)
   : nux::View(NUX_TRACKER_LOCATION)
+  , scale(Settings::Instance().em()->DPIScale())
   , scopes_(scopes)
   , application_starter_(application_starter)
   , preview_container_(nullptr)
@@ -129,7 +131,6 @@
   , animate_preview_container_value_(0.0)
   , animate_preview_value_(0.0)
   , overlay_window_buttons_(new OverlayWindowButtons())
-  , cv_(Settings::Instance().em())
   , monitor_(0)
 {
   renderer_.SetOwner(this);
@@ -144,7 +145,6 @@
 
   mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
   preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));
-  Relayout();
 
   if (scopes_)
   {
@@ -159,6 +159,8 @@
   });
 
   unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &DashView::OnDPIChanged));
+  scale.changed.connect(sigc::mem_fun(this, &DashView::UpdateScale));
+  UpdateScale(scale());
 }
 
 DashView::~DashView()
@@ -232,13 +234,13 @@
 
     if (!preview_container_)
     {
-      preview_container_ = previews::PreviewContainer::Ptr(new previews::PreviewContainer());
+      preview_container_ = new previews::PreviewContainer();
       preview_container_->SetRedirectRenderingToTexture(true);
       AddChild(preview_container_.GetPointer());
       preview_container_->SetParentObject(this);
     }
     preview_container_->Preview(model, previews::Navigation::NONE); // no swipe left or right
-
+    preview_container_->scale = scale();
     preview_container_->SetGeometry(scopes_layout_->GetGeometry());
     preview_displaying_ = true;
 
@@ -265,6 +267,7 @@
   {
     // got a new preview whilst already displaying, we probably clicked a navigation button.
     preview_container_->Preview(model, preview_navigation_mode_); // TODO
+    preview_container_->scale = scale();
   }
 
   if (G_LIKELY(preview_state_machine_.left_results() > 0 && preview_state_machine_.right_results() > 0))
@@ -466,10 +469,7 @@
   if (monitor_ != monitor)
   {
     monitor_ = monitor;
-    cv_ = Settings::Instance().em(monitor_);
-
-    OnDPIChanged();
-    Relayout();
+    scale = Settings::Instance().em(monitor_)->DPIScale();
   }
 
   /* Give the scopes a chance to prep data before we map them  */
@@ -492,6 +492,7 @@
 
   overlay_window_buttons_->Show();
 
+  renderer_.scale = scale();
   renderer_.UpdateBlurBackgroundSize(content_geo_, GetRenderAbsoluteGeometry(), false);
   renderer_.AboutToShow();
 }
@@ -499,7 +500,7 @@
 void DashView::AboutToHide()
 {
   if (BackgroundEffectHelper::blur_type == BLUR_STATIC)
-  { 
+  {
     content_geo_ = {0, 0, 0, 0};
     renderer_.UpdateBlurBackgroundSize(content_geo_, GetRenderAbsoluteGeometry(), false);
   }
@@ -547,7 +548,7 @@
   content_layout_->AddLayout(search_bar_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   search_bar_ = new SearchBar(true);
-  search_bar_->scale = cv_->DPIScale();
+  search_bar_->scale = scale();
   AddChild(search_bar_);
   search_bar_->activated.connect(sigc::mem_fun(this, &DashView::OnEntryActivated));
   search_bar_->search_changed.connect(sigc::mem_fun(this, &DashView::OnSearchChanged));
@@ -576,8 +577,11 @@
 
 void DashView::OnDPIChanged()
 {
-  double scale = cv_->DPIScale();
+  scale = Settings::Instance().em(monitor_)->DPIScale();
+}
 
+void DashView::UpdateScale(double scale)
+{
   UpdateDashViewSize();
 
   for (auto& scope : scope_views_)
@@ -585,27 +589,23 @@
 
   search_bar_->scale = scale;
   scope_bar_->scale = scale;
+  renderer_.scale = scale;
+
+  if (preview_container_)
+    preview_container_->scale = scale;
+
+  Relayout();
 }
 
 void DashView::UpdateDashViewSize()
 {
   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(cv_), 0);
-  layout_->SetTopAndBottomPadding(h_separator_size.CP(cv_), 0);
-
-  content_layout_->SetTopAndBottomPadding(view_top_padding.CP(cv_), 0);
-
-  search_bar_layout_->SetLeftAndRightPadding(search_bar_left_padding.CP(cv_), 0);
-  search_bar_->SetMinimumHeight(search_bar_height.CP(cv_));
-  search_bar_->SetMaximumHeight(search_bar_height.CP(cv_));
+  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);
 }
 
 void DashView::SetupUBusConnections()
@@ -626,7 +626,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
@@ -634,18 +634,17 @@
   scopes_layout_->SetMaximumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(cv_)));
+                                                top_padding));
 
   scopes_layout_->SetMinimumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(cv_)));
+                                                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 - cv_->CP(32)) / tile_width.CP(cv_)));
+  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));
 
@@ -666,33 +665,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(cv_) + category_icon_size.CP(cv_) +
-                         group_top_padding.CP(cv_) + tile_height.CP(cv_));
+  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(cv_)) < half)
-    ;
-
-  RawPixel const v_separator_size   = style.GetVSeparatorSize();
-  RawPixel const group_left_padding = style.GetPlacesGroupResultLeftPadding();
-
-  width = std::max(width, tile_width.CP(cv_) * DASH_TILE_HORIZONTAL_COUNT);
-  width += v_separator_size.CP(cv_);
-  width += group_left_padding.CP(cv_) + DASH_RESULT_RIGHT_PAD.CP(cv_);
-
-  RawPixel const h_separator_size = style.GetHSeparatorSize();
-  RawPixel const top_padding      = style.GetDashViewTopPadding();
-
-  height = h_separator_size.CP(cv_);
-  height += top_padding.CP(cv_);
+  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;
@@ -806,7 +796,7 @@
     texxform.voffset = (scope_bar_->GetY() - content_view_->GetY())/(float)content_view_->GetHeight();
 
     int start_y = scope_bar_->GetY();
-    int final_y = geo_layout.y + geo_layout.height + PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(cv_);
+    int final_y = geo_layout.y + geo_layout.height + PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(scale);
 
     int scope_y = (1.0f - animate_split_value_) * start_y + (animate_split_value_ * final_y);
 
@@ -830,7 +820,7 @@
       texxform.voffset = (search_bar_->GetY() - content_view_->GetY())/(float)content_view_->GetHeight();
 
       start_y = search_bar_->GetY();
-      final_y = geo_layout.y - search_bar_->GetHeight() - PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(cv_);
+      final_y = geo_layout.y - search_bar_->GetHeight() - PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(scale);
 
       graphics_engine.QRP_1Tex
       (
@@ -848,7 +838,7 @@
       texxform.voffset = (search_bar_->GetY() - content_view_->GetY())/(float)content_view_->GetHeight();
 
       int start_x = active_scope_view_->filter_bar()->GetX();
-      int final_x = content_view_->GetX() + content_view_->GetWidth() + PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(cv_);
+      int final_x = content_view_->GetX() + content_view_->GetWidth() + PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(scale);
 
       int filter_x = (1.0f - animate_split_value_) * start_x + (animate_split_value_ * final_x);
 
@@ -872,7 +862,7 @@
       texxform.voffset = (search_bar_->GetY() - content_view_->GetY())/(float)content_view_->GetHeight();
 
       int start_y = search_bar_->GetY();
-      int final_y = geo_layout.y - search_bar_->GetHeight() - PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(cv_);
+      int final_y = geo_layout.y - search_bar_->GetHeight() - PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET.CP(scale);
 
       graphics_engine.QRP_1Tex
       (
@@ -906,8 +896,8 @@
   // Triangle pointed at preview item
   if (opening_column_x_ != -1)
   {
-    int final_width  = cv_->CP(14);
-    int final_height = cv_->CP(12);
+    int final_width  = PREVIEW_CONTAINER_TRIANGLE_WIDTH.CP(scale);
+    int final_height = PREVIEW_CONTAINER_TRIANGLE_HEIGHT.CP(scale);
 
     int x_center = geo_content.x + (opening_column_x_ - geo_abs.x) + opening_column_width_ / 2;
     int start_y = geo_abs_preview.y - geo_abs.y;
@@ -1136,11 +1126,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(cv_);
-    geo.height += bottom_title_width.CP(cv_);
+    geo.width  += style.GetDashRightTileWidth().CP(scale);
+    geo.height += style.GetDashBottomTileHeight().CP(scale);
   }
 }
 
@@ -1282,7 +1269,7 @@
 
   nux::ObjectPtr<ScopeView> view(new ScopeView(scope, search_bar_->show_filters()));
   AddChild(view.GetPointer());
-  view->scale = cv_->DPIScale();
+  view->scale = scale();
   view->SetVisible(false);
   view->result_activated.connect(sigc::mem_fun(this, &DashView::OnResultActivated));
 
@@ -1500,9 +1487,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();
 
@@ -1521,8 +1505,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(cv_))
-               .add("bottom-border-height", bottom_title_width.CP(cv_))
+               .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/DashView.h'
--- dash/DashView.h	2014-03-01 22:51:41 +0000
+++ dash/DashView.h	2014-08-06 16:03:19 +0000
@@ -37,7 +37,6 @@
 
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/BGHash.h"
-#include "unity-shared/EMConverter.h"
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/OverlayRenderer.h"
 #include "unity-shared/SearchBar.h"
@@ -63,6 +62,8 @@
   DashView(Scopes::Ptr const& scopes, ApplicationStarter::Ptr const& application_starter);
   ~DashView();
 
+  nux::Property<double> scale;
+
   void AboutToShow(int monitor);
   void AboutToHide();
   void Relayout();
@@ -131,6 +132,7 @@
   nux::Geometry GetRenderAbsoluteGeometry() const;
 
   void UpdateDashViewSize();
+  void UpdateScale(double scale);
   void OnDPIChanged();
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
@@ -195,7 +197,6 @@
 
   nux::ObjectPtr<OverlayWindowButtons> overlay_window_buttons_;
 
-  EMConverter::Ptr cv_;
   int monitor_;
 
   friend class TestDashView;
 
=== modified file 'dash/FilterBar.cpp'
--- dash/FilterBar.cpp	2014-03-20 04:05:39 +0000
+++ dash/FilterBar.cpp	2014-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-03-20 04:05:39 +0000
+++ dash/FilterExpanderLabel.cpp	2014-08-06 16:03:19 +0000
@@ -22,16 +22,20 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.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
@@ -72,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)
@@ -94,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));
@@ -104,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)
@@ -143,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);
@@ -209,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)
@@ -221,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));
@@ -278,7 +276,7 @@
         graphics::ClearGeometry(right_hand_contents_->GetGeometry());
 
       if (expanded())
-        ClearRedirectedRenderChildArea();            
+        ClearRedirectedRenderChildArea();
     }
 
     if (focus_layer_ && ShouldBeHighlighted())
@@ -296,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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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-08-06 16:03:19 +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/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2014-03-20 04:05:39 +0000
+++ dash/PlacesGroup.cpp	2014-08-06 16:03:19 +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"
@@ -133,10 +132,8 @@
   SetAcceptKeyNavFocusOnMouseEnter(false);
   scale.changed.connect(sigc::mem_fun(this, &PlacesGroup::UpdateScale));
 
-  nux::BaseTexture* arrow = _style.GetGroupExpandIcon();
-
-  _background = _style.GetCategoryBackground();
-  _background_nofilters = _style.GetCategoryBackgroundNoFilters();
+  _background = _style.GetCategoryBackground().GetPointer();
+  _background_nofilters = _style.GetCategoryBackgroundNoFilters().GetPointer();
 
   nux::ROPConfig rop;
   rop.Blend = true;
@@ -144,8 +141,8 @@
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
   nux::TexCoordXForm texxform;
-  _background_layer.reset(new nux::TextureLayer(_background_nofilters->GetDeviceTexture(), 
-                          texxform, 
+  _background_layer.reset(new nux::TextureLayer(_background_nofilters->GetDeviceTexture(),
+                          texxform,
                           nux::color::White,
                           false,
                           rop));
@@ -160,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);
@@ -172,6 +168,7 @@
 
   _name = new StaticCairoText("", NUX_TRACKER_LOCATION);
   _name->SetFont(NAME_LABEL_FONT);
+  _name->SetLines(-1);
   _name->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_END);
   _name->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
   _text_layout->AddView(_name, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
@@ -184,16 +181,17 @@
 
   _expand_label = new StaticCairoText("", NUX_TRACKER_LOCATION);
   _expand_label->SetFont(EXPANDER_LABEL_FONT);
+  _expand_label->SetLines(-1);
   _expand_label->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_END);
   _expand_label->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
   _expand_label->SetTextColor(kExpandDefaultTextColor);
   _expand_label_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
-  _expand_icon = new IconTexture(arrow, arrow->GetWidth(), arrow->GetHeight());
+  _expand_icon = new IconTexture(_style.GetGroupExpandIcon());
+  _expand_icon->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
   _expand_icon->SetOpacity(kExpandDefaultIconOpacity);
-  _expand_icon->SetMinimumSize(arrow->GetWidth(), arrow->GetHeight());
   _expand_icon->SetVisible(false);
-  _expand_layout->AddView(_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _expand_layout->AddView(_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
   SetLayout(_group_layout);
 
@@ -223,16 +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(_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()));
@@ -241,15 +239,16 @@
 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();
 
-  // FIXME _expand_icon, needs some work here. Not as easy as _icon
+  auto const& arrow = _expand_icon->texture();
+  _expand_icon->SetMinMaxSize(RawPixel(arrow->GetWidth()).CP(scale), RawPixel(arrow->GetHeight()).CP(scale));
 
   if (_child_view)
     _child_view->scale = scale;
@@ -279,7 +278,6 @@
 
 void
 
-// FIXME _expand_icon, needs some work here. Not as easy as _icon
 PlacesGroup::SetName(std::string const& name)
 {
   if (_cached_name != name)
@@ -310,7 +308,7 @@
 void
 PlacesGroup::SetIcon(std::string const& path_to_emblem)
 {
-  _icon->SetByIconName(path_to_emblem, _style.GetCategoryIconSize());
+  _icon->SetByIconName(path_to_emblem, _style.GetCategoryIconSize().CP(scale));
 }
 
 void
@@ -318,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);
   }
 }
 
@@ -462,7 +457,7 @@
   // only the width matters
   if (_cached_geometry.GetWidth() != geo.GetWidth())
   {
-    _focus_layer.reset(_style.FocusOverlay(geo.width - 
+    _focus_layer.reset(_style.FocusOverlay(geo.width -
                                            kHighlightLeftPadding.CP(scale()) -
                                            kHighlightRightPadding.CP(scale()),
                                            kHighlightHeight.CP(scale())));
@@ -595,6 +590,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));
+
   expanded.emit(this);
 }
 
 
=== modified file 'dash/ResultRendererHorizontalTile.cpp'
--- dash/ResultRendererHorizontalTile.cpp	2014-03-20 05:05:21 +0000
+++ dash/ResultRendererHorizontalTile.cpp	2014-08-06 16:03:19 +0000
@@ -247,8 +247,8 @@
                                       0.0f,
                                       0.0f,
                                       CARD_VIEW_HIGHLIGHT_CORNER_RADIUS,
-                                      width,
-                                      height,
+                                      width/scale(),
+                                      height/scale(),
                                       false);
   cairo_fill(cr);
 
 
=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2014-05-03 17:57:47 +0000
+++ dash/ResultRendererTile.cpp	2014-08-06 16:03:19 +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-08-06 16:03:19 +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
@@ -71,6 +70,9 @@
 
   for (auto icon : icons_)
     icon->scale = scale;
+
+  QueueDraw();
+  QueueRelayout();
 }
 
 void ScopeBar::SetupLayout()
 
=== modified file 'dash/ScopeBarIcon.cpp'
--- dash/ScopeBarIcon.cpp	2014-03-20 21:43:02 +0000
+++ dash/ScopeBarIcon.cpp	2014-08-06 16:03:19 +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-03-20 04:05:39 +0000
+++ dash/ScopeView.cpp	2014-08-06 16:03:19 +0000
@@ -29,9 +29,8 @@
 #include "ResultRendererHorizontalTile.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
+#include "unity-shared/OverlayScrollView.h"
 #include "unity-shared/GraphicsUtils.h"
-#include "unity-shared/RawPixel.h"
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
@@ -52,16 +51,14 @@
 }
 
 // This is so we can access some protected members in scrollview.
-class ScopeScrollView: public nux::ScrollView
+class ScopeScrollView: public dash::ScrollView
 {
 public:
-  ScopeScrollView(nux::VScrollBar* scroll_bar, NUX_FILE_LINE_DECL)
-    : nux::ScrollView(NUX_FILE_LINE_PARAM)
+  ScopeScrollView(NUX_FILE_LINE_DECL)
+    : ScrollView(NUX_FILE_LINE_PARAM)
     , right_area_(nullptr)
     , up_area_(nullptr)
   {
-    SetVScrollBar(scroll_bar);
-
     OnVisibleChanged.connect([this] (nux::Area* /*area*/, bool visible) {
       if (m_horizontal_scrollbar_enable)
         _hscrollbar->SetVisible(visible);
@@ -237,8 +234,8 @@
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  scroll_view_ = new ScopeScrollView(new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION),
-                                    NUX_TRACKER_LOCATION);
+  scroll_view_ = new ScopeScrollView(NUX_TRACKER_LOCATION);
+  scroll_view_->scale = scale();
   scroll_view_->EnableVerticalScrollBar(true);
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);
@@ -250,9 +247,11 @@
   no_results_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   no_results_->SetTextColor(nux::color::White);
   no_results_->SetVisible(false);
+  no_results_->SetScale(scale);
   scroll_layout_->AddView(no_results_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
-  fscroll_view_ = new ScopeScrollView(new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION), NUX_TRACKER_LOCATION);
+  fscroll_view_ = new ScopeScrollView(NUX_TRACKER_LOCATION);
+  fscroll_view_->scale = scale();
   fscroll_view_->EnableVerticalScrollBar(true);
   fscroll_view_->EnableHorizontalScrollBar(false);
   fscroll_view_->SetVisible(false);
@@ -276,19 +275,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)
@@ -298,7 +295,10 @@
   for (auto& group : category_views_)
     group->scale = scale;
 
+  scroll_view_->scale = scale;
+  fscroll_view_->scale = scale;
   filter_bar_->scale = scale;
+  no_results_->SetScale(scale);
 }
 
 void ScopeView::SetupCategories(Categories::Ptr const& categories)
 
=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2014-03-20 04:05:39 +0000
+++ dash/ScopeView.h	2014-08-06 16:03:19 +0000
@@ -36,7 +36,6 @@
 #include "PlacesGroup.h"
 #include "ResultViewGrid.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/PlacesVScrollBar.h"
 
 namespace unity
 {
 
=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2014-02-28 23:32:05 +0000
+++ dash/StandaloneDash.cpp	2014-08-06 16:03:19 +0000
@@ -36,47 +36,50 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/ThumbnailGenerator.h"
-#include "UnityCore/GSettingsScopes.h"
+#include "unity-shared/UBusMessages.h"
+#include "unity-shared/UBusServer.h"
+#include <UnityCore/GSettingsScopes.h>
+#include <UnityCore/ScopeProxyInterface.h>
 
-#define WIDTH 1024
-#define HEIGHT 768
+const unity::RawPixel WIDTH(1024);
+const unity::RawPixel HEIGHT(768);
 
 using namespace unity::dash;
 
 class TestRunner
 {
 public:
-  TestRunner ();
-  ~TestRunner ();
+  TestRunner(std::string const& scope, double scale)
+    : scope_(scope)
+    , scale_(scale)
+  {}
 
   static void InitWindowThread (nux::NThread* thread, void* InitData);
   void Init ();
+  std::string scope_;
+  double scale_;
   nux::Layout *layout;
 };
 
-TestRunner::TestRunner ()
-{
-}
-
-TestRunner::~TestRunner ()
-{
-}
-
 void TestRunner::Init ()
 {
   layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  DashView* view = new DashView(std::make_shared<unity::dash::GSettingsScopes>(), 
+  DashView* view = new DashView(std::make_shared<unity::dash::GSettingsScopes>(),
                                 std::make_shared<unity::ApplicationStarterImp>());
+  view->scale = scale_;
   view->DisableBlur();
-  view->SetMinMaxSize(WIDTH, HEIGHT);
+  view->SetMinMaxSize(WIDTH.CP(scale_), HEIGHT.CP(scale_));
   layout->AddView (view, 1, nux::MINOR_POSITION_CENTER);
-  layout->SetMinMaxSize(WIDTH, HEIGHT);
+  layout->SetMinMaxSize(WIDTH.CP(scale_), HEIGHT.CP(scale_));
 
   view->AboutToShow(0);
 
   nux::GetWindowThread()->SetLayout (layout);
   nux::GetWindowCompositor().SetKeyFocusArea(view->default_focus());
+
+  unity::UBusServer().SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                                  g_variant_new("(sus)", scope_.c_str(), GOTO_DASH_URI, ""));
 }
 
 void TestRunner::InitWindowThread(nux::NThread* thread, void* InitData)
@@ -87,8 +90,6 @@
 
 int main(int argc, char **argv)
 {
-  nux::WindowThread* wt = NULL;
-
   gtk_init (&argc, &argv);
 
   unity::BGHash bghash;
@@ -102,17 +103,30 @@
   unity::dash::Style dash_style;
   unity::panel::Style panel_style;
 
-  TestRunner *test_runner = new TestRunner ();
-  wt = nux::CreateGUIThread(TEXT("Unity Dash"),
-                            WIDTH, HEIGHT,
-                            0,
-                            &TestRunner::InitWindowThread,
-                            test_runner);
+  double scale = 1.0;
+  unity::glib::String scope;
+  unity::glib::Error err;
+
+  GOptionEntry args_parsed[] =
+  {
+    { "scope", 's', 0, G_OPTION_ARG_STRING, &scope, "The default scope ", "S" },
+    { "scaling-factor", 'f', 0, G_OPTION_ARG_DOUBLE, &scale, "The dash scaling factor", "F" },
+    { NULL }
+  };
+
+  std::shared_ptr<GOptionContext> ctx(g_option_context_new("Standalone Dash"), g_option_context_free);
+  g_option_context_add_main_entries(ctx.get(), args_parsed, NULL);
+  if (!g_option_context_parse(ctx.get(), &argc, &argv, &err))
+    std::cerr << "Got error when parsing arguments: " << err << std::endl;
+
+  TestRunner *test_runner = new TestRunner(scope.Str(), scale);
+  std::unique_ptr<nux::WindowThread> wt(nux::CreateGUIThread(TEXT("Unity Dash"),
+                                        WIDTH.CP(scale), HEIGHT.CP(scale),
+                                        0, &TestRunner::InitWindowThread, test_runner));
 
   nux::NuxTimerTickSource tick_source;
   nux::animation::AnimationController animation_controller(tick_source);
+  wt->Run(nullptr);
 
-  wt->Run (NULL);
-  delete wt;
-  return 0;
+  return EXIT_SUCCESS;
 }
 
=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ActionButton.cpp	2014-08-06 16:03:19 +0000
@@ -26,22 +26,23 @@
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
 
+namespace unity
+{
 namespace
 {
-const int kMinButtonHeight = 34;
-const int kMinButtonWidth  = 48;
+const RawPixel MIN_BUTTON_HEIGHT = 34_em;
+const RawPixel MIN_BUTTON_WIDTH  = 48_em;
 
-const int icon_size  = 24;
+const RawPixel icon_size  = 24_em;
 }
 
-namespace unity
-{
 namespace dash
 {
 DECLARE_LOGGER(logger, "unity.dash.preview.action");
 
 ActionButton::ActionButton(std::string const& action_hint, std::string const& label, std::string const& icon_hint, NUX_FILE_LINE_DECL)
   : nux::AbstractButton(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , action_hint_(action_hint)
   , image_(nullptr)
 {
@@ -49,6 +50,7 @@
   SetAcceptKeyNavFocusOnMouseEnter(true);
   Init();
   BuildLayout(label, icon_hint, "");
+  scale.changed.connect(sigc::mem_fun(this, &ActionButton::UpdateScale));
 }
 
 ActionButton::~ActionButton()
@@ -84,22 +86,19 @@
 
 void ActionButton::InitTheme()
 {
-  if (!cr_active_)
-  {
-    nux::Geometry const& geo = GetGeometry();
-
-    cr_prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
-    cr_active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
-    cr_normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
-    cr_focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &ActionButton::RedrawFocusOverlay)));
-  }
-
-  SetMinimumHeight(kMinButtonHeight);
-  SetMinimumWidth(kMinButtonWidth);
+  nux::Geometry const& geo = GetGeometry();
+
+  cr_prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  cr_active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+  cr_normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+  cr_focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &ActionButton::RedrawFocusOverlay)));
+
+  SetMinimumHeight(MIN_BUTTON_HEIGHT.CP(scale));
+  SetMinimumWidth(MIN_BUTTON_WIDTH.CP(scale));
 }
 
 void ActionButton::SetExtraHint(std::string const& extra_hint, std::string const& font_hint)
-{  
+{
   extra_font_hint_= font_hint;
   if (extra_text_)
   {
@@ -123,13 +122,13 @@
 
     if (!icon_hint_.empty())
     {
-      image_ = new IconTexture(icon_hint, icon_size);
+      image_ = new IconTexture(icon_hint, icon_size.CP(scale));
       image_->texture_updated.connect([this](nux::ObjectPtr<nux::BaseTexture> const&)
       {
         BuildLayout(label_, icon_hint_, extra_hint_);
       });
       image_->SetInputEventSensitivity(false);
-      image_->SetMinMaxSize(icon_size, icon_size);
+      image_->SetMinMaxSize(icon_size.CP(scale), icon_size.CP(scale));
     }
   }
 
@@ -192,11 +191,13 @@
 
 void ActionButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
 {
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
   Style::Instance().Button(cr, faked_state, "", -1, Alignment::CENTER, true);
 }
 
 void ActionButton::RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr)
 {
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
   Style::Instance().ButtonFocusOverlay(cr, 0.20f);
 }
 
@@ -311,5 +312,27 @@
   return extra_hint_;
 }
 
+void ActionButton::UpdateScale(double scale)
+{
+  InitTheme();
+
+  if (image_)
+  {
+    image_->SetSize(icon_size.CP(scale));
+    image_->SetMinMaxSize(icon_size.CP(scale), icon_size.CP(scale));
+    image_->ReLoadIcon();
+  }
+
+  if (static_text_)
+    static_text_->SetScale(scale);
+
+  if (extra_text_)
+    extra_text_->SetScale(scale);
+
+  QueueRelayout();
+  QueueDraw();
+}
+
+
 } // namespace dash
 } // namespace unity
 
=== modified file 'dash/previews/ActionButton.h'
--- dash/previews/ActionButton.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ActionButton.h	2014-08-06 16:03:19 +0000
@@ -59,6 +59,8 @@
   std::string GetLabel() const;
   std::string GetExtraText() const;
 
+  nux::Property<double> scale;
+
 protected:
   virtual long ComputeContentSize();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -95,6 +97,8 @@
   nux::ObjectPtr<IconTexture> image_;
   nux::ObjectPtr<unity::StaticCairoText> static_text_;
   nux::ObjectPtr<unity::StaticCairoText> extra_text_;
+
+  void UpdateScale(double scale);
 };
 
 } // namespace dash
 
=== modified file 'dash/previews/ActionLink.cpp'
--- dash/previews/ActionLink.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ActionLink.cpp	2014-08-06 16:03:19 +0000
@@ -40,12 +40,15 @@
 
 ActionLink::ActionLink(std::string const& action_hint, std::string const& label, NUX_FILE_LINE_DECL)
   : nux::AbstractButton(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , action_hint_(action_hint)
   , aligment_(StaticCairoText::NUX_ALIGN_CENTRE)
   , underline_(StaticCairoText::NUX_UNDERLINE_SINGLE)
 {
   Init();
   BuildLayout(label);
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &ActionLink::UpdateScale));
 }
 
 std::string ActionLink::GetName() const
@@ -109,6 +112,7 @@
       static_text_ = new StaticCairoText(label_, true, NUX_TRACKER_LOCATION);
       if (!font_hint_.empty())
         static_text_->SetFont(font_hint_);
+      static_text_->SetScale(scale);
       static_text_->SetInputEventSensitivity(false);
       static_text_->SetTextAlignment(aligment_);
       static_text_->SetUnderline(underline_);
@@ -243,5 +247,14 @@
   return label_;
 }
 
+void ActionLink::UpdateScale(double scale)
+{
+  if (static_text_)
+    static_text_->SetScale(scale);
+
+  QueueRelayout();
+  QueueDraw();
+}
+
 } // namespace dash
 } // namespace unity
 
=== modified file 'dash/previews/ActionLink.h'
--- dash/previews/ActionLink.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ActionLink.h	2014-08-06 16:03:19 +0000
@@ -47,6 +47,7 @@
   nux::RWProperty<StaticCairoText::AlignState> text_aligment;
   nux::RWProperty<StaticCairoText::UnderlineState> underline_state;
   nux::RWProperty<std::string> font_hint;
+  nux::Property<double> scale;
 
   void Activate() {}
   void Deactivate() {}
@@ -90,8 +91,7 @@
   StaticCairoText::UnderlineState underline_;
 private:
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
-
-
+  void UpdateScale(double scale);
 };
 
 } // namespace dash
 
=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ApplicationPreview.cpp	2014-08-06 16:03:19 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/IconTexture.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <UnityCore/ApplicationPreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
@@ -46,23 +45,31 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel ICON_SPACE_CHILDREN = 3_em;
+  const RawPixel DATA_SPACE_CHILDREN = 16_em;
+  const RawPixel INFO_SPACE_CHILDREN = 12_em;
+  const RawPixel COPYRIGHT_SPACE_CHILDREN = 8_em;
+  const RawPixel ICON_SIZE = 72_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.application");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(ApplicationPreview);
 
 ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
+, title_subtitle_layout_(nullptr)
+, image_data_layout_(nullptr)
+, main_app_info_(nullptr)
+, icon_layout_(nullptr)
+, app_data_layout_(nullptr)
+, app_updated_copywrite_layout_(nullptr)
+, app_info_layout_(nullptr)
+, app_info_scroll_(nullptr)
+, actions_layout_(nullptr)
 {
   SetupViews();
 }
@@ -121,12 +128,13 @@
 
   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); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
   /////////////////////
   // Image
   image_ = new CoverArt();
+  image_->scale = scale();
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
   /////////////////////
@@ -134,34 +142,36 @@
     /////////////////////
     // App Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
 
       /////////////////////
       // Main App Info
-      nux::HLayout* main_app_info = new nux::HLayout();
-      main_app_info->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails());
+      main_app_info_ = new nux::HLayout();
+      main_app_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
 
         /////////////////////
         // Icon Layout
-        nux::VLayout* icon_layout = new nux::VLayout();
-        icon_layout->SetSpaceBetweenChildren(3);
-        app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", 72);
+        icon_layout_ = new nux::VLayout();
+        icon_layout_->SetSpaceBetweenChildren(ICON_SPACE_CHILDREN.CP(scale));
+        app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", ICON_SIZE.CP(scale));
         AddChild(app_icon_.GetPointer());
-        app_icon_->SetMinimumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
-        app_icon_->SetMaximumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
+        app_icon_->SetMinimumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+        app_icon_->SetMaximumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
         app_icon_->mouse_click.connect(on_mouse_down);
-        icon_layout->AddView(app_icon_.GetPointer(), 0);
+        icon_layout_->AddView(app_icon_.GetPointer(), 0);
 
-        if (app_preview_model->rating >= 0) {
+        if (app_preview_model->rating >= 0)
+        {
           app_rating_ = new PreviewRatingsWidget();
           AddChild(app_rating_.GetPointer());
-          app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight());
-          app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
+          app_rating_->scale = scale();
+          app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+          app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
           app_rating_->SetRating(app_preview_model->rating);
           app_rating_->SetReviews(app_preview_model->num_ratings);
           app_rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-          icon_layout->AddView(app_rating_.GetPointer(), 0);
+          icon_layout_->AddView(app_rating_.GetPointer(), 0);
         }
 
         /////////////////////
@@ -169,15 +179,16 @@
         /////////////////////
         // Data
 
-        nux::VLayout* app_data_layout = new nux::VLayout();
-        app_data_layout->SetSpaceBetweenChildren(16);
+        app_data_layout_ = new nux::VLayout();
+        app_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
 
         title_subtitle_layout_ = new nux::VLayout();
-        title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
+        title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
 
         title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
         AddChild(title_.GetPointer());
         title_->SetLines(-1);
+        title_->SetScale(scale);
         title_->SetFont(style.title_font().c_str());
         title_->mouse_click.connect(on_mouse_down);
         title_subtitle_layout_->AddView(title_.GetPointer(), 1);
@@ -188,12 +199,13 @@
           AddChild(subtitle_.GetPointer());
           subtitle_->SetFont(style.subtitle_size_font().c_str());
           subtitle_->SetLines(-1);
+          subtitle_->SetScale(scale);
           subtitle_->mouse_click.connect(on_mouse_down);
           title_subtitle_layout_->AddView(subtitle_.GetPointer(), 1);
         }
 
-        nux::VLayout* app_updated_copywrite_layout = new nux::VLayout();
-        app_updated_copywrite_layout->SetSpaceBetweenChildren(8);
+        app_updated_copywrite_layout_ = new nux::VLayout();
+        app_updated_copywrite_layout_->SetSpaceBetweenChildren(COPYRIGHT_SPACE_CHILDREN.CP(scale));
 
         if (!app_preview_model->license.Get().empty())
         {
@@ -201,8 +213,9 @@
           AddChild(license_.GetPointer());
           license_->SetFont(style.app_license_font().c_str());
           license_->SetLines(-1);
+          license_->SetScale(scale);
           license_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(license_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(license_.GetPointer(), 1);
         }
 
         if (!app_preview_model->last_update.Get().empty())
@@ -213,8 +226,9 @@
           last_update_ = new StaticCairoText(last_update.str(), true, NUX_TRACKER_LOCATION);
           AddChild(last_update_.GetPointer());
           last_update_->SetFont(style.app_last_update_font().c_str());
+          last_update_->SetScale(scale);
           last_update_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(last_update_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(last_update_.GetPointer(), 1);
         }
 
         if (!app_preview_model->copyright.Get().empty())
@@ -223,29 +237,32 @@
           AddChild(copywrite_.GetPointer());
           copywrite_->SetFont(style.app_copywrite_font().c_str());
           copywrite_->SetLines(-1);
+          copywrite_->SetScale(scale);
           copywrite_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(copywrite_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(copywrite_.GetPointer(), 1);
         }
 
-        app_data_layout->AddLayout(title_subtitle_layout_);
-        app_data_layout->AddLayout(app_updated_copywrite_layout);
+        app_data_layout_->AddLayout(title_subtitle_layout_);
+        app_data_layout_->AddLayout(app_updated_copywrite_layout_);
 
         // buffer space
         /////////////////////
 
-      main_app_info->AddLayout(icon_layout, 0);
-      main_app_info->AddLayout(app_data_layout, 1);
+      main_app_info_->AddLayout(icon_layout_, 0);
+      main_app_info_->AddLayout(app_data_layout_, 1);
       /////////////////////
 
       /////////////////////
       // Description
-      nux::ScrollView* app_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* app_info = new ScrollView(NUX_TRACKER_LOCATION);
+      app_info_scroll_ = app_info; 
+      app_info->scale = scale();
       app_info->EnableHorizontalScrollBar(false);
       app_info->mouse_click.connect(on_mouse_down);
 
-      nux::VLayout* app_info_layout = new nux::VLayout();
-      app_info_layout->SetSpaceBetweenChildren(12);
-      app_info->SetLayout(app_info_layout);
+      app_info_layout_ = new nux::VLayout();
+      app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN.CP(scale));
+      app_info->SetLayout(app_info_layout_);
 
       if (!preview_model_->description.Get().empty())
       {
@@ -256,36 +273,36 @@
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
         description_->mouse_click.connect(on_mouse_down);
-        app_info_layout->AddView(description_.GetPointer());
+        app_info_layout_->AddView(description_.GetPointer());
       }
 
       if (!preview_model_->GetInfoHints().empty())
       {
-        preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+        preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth().CP(scale));
         AddChild(preview_info_hints_.GetPointer());
         preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        app_info_layout->AddView(preview_info_hints_.GetPointer());
+        app_info_layout_->AddView(preview_info_hints_.GetPointer());
       }
       /////////////////////
 
       /////////////////////
       // Actions
       action_buttons_.clear();
-      nux::Layout* actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
-      actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+      actions_layout_ = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+      actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
       ///////////////////
 
-    full_data_layout_->AddLayout(main_app_info, 0);
+    full_data_layout_->AddLayout(main_app_info_, 0);
     full_data_layout_->AddView(app_info, 1);
-    full_data_layout_->AddLayout(actions_layout, 0);
+    full_data_layout_->AddLayout(actions_layout_, 0);
     /////////////////////
-  
-  image_data_layout->AddView(image_.GetPointer(), 0);
-  image_data_layout->AddLayout(full_data_layout_, 1);
+
+  image_data_layout_->AddView(image_.GetPointer(), 0);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 void ApplicationPreview::PreLayoutManagement()
@@ -296,12 +313,16 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_art.width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() - style.GetDetailsPanelMinimumWidth());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale)
+                                - style.GetDetailsLeftMargin().CP(scale)
+                                - style.GetDetailsRightMargin().CP(scale);
+  if (content_width - geo_art.width < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_art.width = std::max(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
+
   image_->SetMinMaxSize(geo_art.width, geo_art.height);
 
-  int details_width = MAX(0, geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
-  int top_app_info_max_width = MAX(0, details_width - style.GetAppIconAreaWidth() - style.GetSpaceBetweenIconAndDetails());
+  int details_width = std::max(0, content_width - geo_art.width);
+  int top_app_info_max_width = std::max(0, details_width - style.GetAppIconAreaWidth().CP(scale) - style.GetSpaceBetweenIconAndDetails().CP(scale));
 
   if (title_) { title_->SetMaximumWidth(top_app_info_max_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(top_app_info_max_width); }
@@ -310,14 +331,79 @@
   if (copywrite_) { copywrite_->SetMaximumWidth(top_app_info_max_width); }
   if (description_) { description_->SetMaximumWidth(details_width); }
 
+  int button_w = CLAMP((details_width - style.GetSpaceBetweenActions().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale));
+  int button_h = style.GetActionButtonHeight().CP(scale);
+
   for (nux::AbstractButton* button : action_buttons_)
-  {
-    button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
-  }
+    button->SetMinMaxSize(button_w, button_h);
 
   Preview::PreLayoutManagement();
 }
 
+void ApplicationPreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (app_icon_)
+  {
+    app_icon_->SetSize(ICON_SIZE.CP(scale));
+    app_icon_->SetMinimumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+    app_icon_->SetMaximumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+    app_icon_->ReLoadIcon();
+  }
+
+  if (app_info_scroll_)
+    app_info_scroll_->scale = scale;
+
+  if (license_)
+    license_->SetScale(scale);
+
+  if (last_update_)
+    last_update_->SetScale(scale);
+
+  if (copywrite_)
+    copywrite_->SetScale(scale);
+
+  if (app_rating_)
+  {
+    app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+    app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
+    app_rating_->scale = scale;
+  }
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (full_data_layout_)
+  {
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
+  }
+
+  if (main_app_info_)
+    main_app_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
+
+  if (icon_layout_)
+    icon_layout_->SetSpaceBetweenChildren(ICON_SPACE_CHILDREN.CP(scale));
+
+  if (app_data_layout_)
+    app_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
+
+  if (title_subtitle_layout_)
+    title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
+
+  if (app_info_layout_)
+    app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN.CP(scale));
+
+  if (actions_layout_)
+    actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
+
+  if (app_updated_copywrite_layout_)
+    app_updated_copywrite_layout_->SetSpaceBetweenChildren(COPYRIGHT_SPACE_CHILDREN.CP(scale));
+}
+
 } // namespace previews
 } // namespace dash
 } // namepsace unity
 
=== modified file 'dash/previews/ApplicationPreview.h'
--- dash/previews/ApplicationPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ApplicationPreview.h	2014-08-06 16:03:19 +0000
@@ -24,6 +24,7 @@
 #define APPLICATIONPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -54,9 +55,18 @@
   virtual void PreLayoutManagement();
 
   virtual void SetupViews();
+  void UpdateScale(double scale) override;
 
 protected:
   nux::VLayout* title_subtitle_layout_;
+  nux::HLayout* image_data_layout_;
+  nux::HLayout* main_app_info_;
+  nux::VLayout* icon_layout_;
+  nux::VLayout* app_data_layout_;
+  nux::VLayout* app_updated_copywrite_layout_;
+  nux::VLayout* app_info_layout_;
+  ScrollView* app_info_scroll_;
+  nux::Layout* actions_layout_;
 
   nux::ObjectPtr<IconTexture> app_icon_;
   nux::ObjectPtr<PreviewRatingsWidget> app_rating_;
 
=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/ErrorPreview.cpp	2014-08-06 16:03:19 +0000
@@ -26,7 +26,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/PlacesVScrollBar.h"
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
@@ -50,22 +49,18 @@
 {
 nux::logging::Logger logger("unity.dash.previews.ErrorPreview");
 
+const RawPixel TITLE_DATA_MAX_SIZE = 76_em;
+const RawPixel TITLE_DATA_CHILDREN_SPACE = 10_em;
+const RawPixel LINE_SPACING = 10_em;
+const RawPixel TITLE_MAX_WIDTH = 480_em;
+const RawPixel CHILDREN_SPACE = 5_em;
+const RawPixel BUTTONS_DATA_SPACE = 20_em;
+const RawPixel INTRO_SPACE = 110_em;
 }
 
 const std::string ErrorPreview::CANCEL_ACTION = "cancel";
 const std::string ErrorPreview::GO_TO_U1_ACTION = "open_u1_link";
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(ErrorPreview)
 
 ErrorPreview::ErrorPreview(dash::Preview::Ptr preview_model)
@@ -73,6 +68,9 @@
 {
   PaymentPreview::SetupBackground();
   SetupViews();
+
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &ErrorPreview::UpdateScale));
 }
 
 ErrorPreview::~ErrorPreview()
@@ -114,6 +112,7 @@
   for (dash::Preview::ActionPtr action : preview_model_->GetActions())
   {
     nux::ObjectPtr<ActionButton> button = this->CreateButton(action);
+    button->scale = scale();
     button->activate.connect(sigc::mem_fun(this, &ErrorPreview::OnActionActivated));
     buttons_map_.insert(std::make_pair(action->id, button));
   }
@@ -123,8 +122,8 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout* title_data_layout = new nux::VLayout();
-  title_data_layout->SetMaximumHeight(76);
-  title_data_layout->SetSpaceBetweenChildren(10);
+  title_data_layout->SetMaximumHeight(TITLE_DATA_MAX_SIZE.CP(scale));
+  title_data_layout->SetSpaceBetweenChildren(TITLE_DATA_CHILDREN_SPACE.CP(scale));
 
   title_ = new StaticCairoText(
           preview_model_->title.Get(), true,
@@ -133,7 +132,7 @@
   title_->SetFont(style.payment_title_font());
   title_->SetLines(-1);
   title_->SetFont(style.title_font());
-  title_->SetMaximumWidth(480);
+  title_->SetMaximumWidth(TITLE_MAX_WIDTH.CP(scale));
   title_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
   title_data_layout->AddView(title_.GetPointer(), 1);
 
@@ -151,9 +150,9 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *prize_data_layout = new nux::VLayout();
-  prize_data_layout->SetMaximumHeight(76);
-  prize_data_layout->SetSpaceBetweenChildren(5);
-  prize_data_layout->SetPadding(0, 10, 0, 0);
+  prize_data_layout->SetMaximumHeight(TITLE_DATA_MAX_SIZE.CP(scale));
+  prize_data_layout->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  prize_data_layout->SetPadding(0, TITLE_DATA_CHILDREN_SPACE.CP(scale), 0, 0);
 
   purchase_prize_ = new StaticCairoText(
           error_preview_model_->purchase_prize.Get(), true,
@@ -188,16 +187,17 @@
   nux::HLayout *intro_layout = new nux::HLayout();
   nux::VLayout *icon_layout = new nux::VLayout();
 
-  icon_layout->SetPadding(78, 10, 90, 43);
-  intro_layout->SetPadding(75, 20, 0, 0);
-  intro_layout->SetSpaceBetweenChildren(5);
+  icon_layout->SetPadding((78_em).CP(scale), (10_em).CP(scale), (90_em).CP(scale), (43_em).CP(scale));
+  intro_layout->SetPadding((75_em).CP(scale), (20_em).CP(scale), 0, 0);
+  intro_layout->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   intro_ = new StaticCairoText(
               error_preview_model_->header.Get(), true,
           NUX_TRACKER_LOCATION);
   intro_->SetFont(style.payment_intro_font().c_str());
+  intro_->SetScale(scale);
   intro_->SetLines(-3);
-  intro_->SetLineSpacing(10);
+  intro_->SetLineSpacing(LINE_SPACING.CP(scale));
   intro_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
 
   intro_layout->AddView(intro_.GetPointer());//, 0, nux::MINOR_POSITION_CENTER);
@@ -220,9 +220,9 @@
   actions_buffer_h->AddSpace(0, 1);
 
   nux::HLayout* buttons_data_layout = new TabIteratorHLayout(tab_iterator_);
-  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
 
-  buttons_data_layout->AddSpace(20, 1);
+  buttons_data_layout->AddSpace(BUTTONS_DATA_SPACE.CP(scale), 1);
   if(buttons_map_[ErrorPreview::CANCEL_ACTION].GetPointer()){
     ActionButton* button = (ActionButton*)buttons_map_[ErrorPreview::CANCEL_ACTION].GetPointer();
     buttons_data_layout->AddView(buttons_map_[ErrorPreview::CANCEL_ACTION].GetPointer(),
@@ -249,11 +249,11 @@
 
   previews::Style& style = dash::previews::Style::Instance();
 
-  int width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int width = std::max(0, geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale));
 
   if(full_data_layout_) { full_data_layout_->SetMaximumWidth(width); }
   if(header_layout_) { header_layout_->SetMaximumWidth(width); }
-  if(intro_) { intro_->SetMaximumWidth(width - 110); }
+  if(intro_) { intro_->SetMaximumWidth(width - INTRO_SPACE.CP(scale)); }
   if(footer_layout_) { footer_layout_->SetMaximumWidth(width); }
 
   Preview::PreLayoutManagement();
@@ -274,6 +274,33 @@
   PaymentPreview::SetupViews();
 }
 
+void ErrorPreview::UpdateScale(double scale)
+{
+  if (intro_)
+    intro_->SetScale(scale);
+
+  if (purchase_hint_)
+    purchase_hint_->SetScale(scale);
+  if (purchase_prize_)
+    purchase_prize_->SetScale(scale);
+  if (purchase_type_)
+    purchase_type_->SetScale(scale);
+
+  if (warning_texture_)
+  {
+    previews::Style& style = dash::previews::Style::Instance();
+    RawPixel width(style.GetWarningIcon()->GetWidth());
+    RawPixel height(style.GetWarningIcon()->GetHeight());
+
+    warning_texture_->SetSize(std::max(width, height).CP(scale));
+    warning_texture_->ReLoadIcon();
+  }
+
+  if (title_)
+    title_->SetMaximumWidth(TITLE_MAX_WIDTH.CP(scale));
+
+  Preview::UpdateScale(scale);
+}
 
 }
 }
 
=== modified file 'dash/previews/ErrorPreview.h'
--- dash/previews/ErrorPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ErrorPreview.h	2014-08-06 16:03:19 +0000
@@ -94,6 +94,8 @@
   void PreLayoutManagement();
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale);
+
   // content elements
   nux::ObjectPtr<CoverArt> image_;
   nux::ObjectPtr<StaticCairoText> intro_;
 
=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/GenericPreview.cpp	2014-08-06 16:03:19 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
@@ -40,25 +39,28 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 12_em;
+  const RawPixel FULL_CHILDREN_SPACE = 16_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.generic");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(GenericPreview);
 
 GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
+, image_data_layout_(nullptr)
+, preview_info_layout_(nullptr)
+, preview_info_scroll_(nullptr)
+, preview_data_layout_(nullptr)
+, actions_layout_(nullptr)
 {
   SetupViews();
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &GenericPreview::UpdateScale));
 }
 
 GenericPreview::~GenericPreview()
@@ -72,7 +74,7 @@
   gfx_engine.PushClippingRectangle(base);
   nux::GetPainter().PaintBackground(gfx_engine, base);
 
-  gfx_engine.PopClippingRectangle(); 
+  gfx_engine.PopClippingRectangle();
 }
 
 void GenericPreview::DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
@@ -113,8 +115,8 @@
 
   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); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
   /////////////////////
   // Image
@@ -126,21 +128,22 @@
     /////////////////////
     // Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0,
+        style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(FULL_CHILDREN_SPACE.CP(scale));
 
       /////////////////////
       // Data
 
-      nux::VLayout* preview_data_layout = new nux::VLayout();
-      preview_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
+      preview_data_layout_ = new nux::VLayout();
+      preview_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
 
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       AddChild(title_.GetPointer());
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
       title_->mouse_click.connect(on_mouse_down);
-      preview_data_layout->AddView(title_.GetPointer(), 1);
+      preview_data_layout_->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
@@ -149,19 +152,21 @@
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         subtitle_->mouse_click.connect(on_mouse_down);
-        preview_data_layout->AddView(subtitle_.GetPointer(), 1);
+        preview_data_layout_->AddView(subtitle_.GetPointer(), 1);
       }
       /////////////////////
 
       /////////////////////
       // Description
-      nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* preview_info = new ScrollView(NUX_TRACKER_LOCATION);
+      preview_info_scroll_ = preview_info;
+      preview_info->scale = scale();
       preview_info->EnableHorizontalScrollBar(false);
       preview_info->mouse_click.connect(on_mouse_down);
 
-      nux::VLayout* preview_info_layout = new nux::VLayout();
-      preview_info_layout->SetSpaceBetweenChildren(12);
-      preview_info->SetLayout(preview_info_layout);
+      preview_info_layout_ = new nux::VLayout();
+      preview_info_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+      preview_info->SetLayout(preview_info_layout_);
 
       if (!preview_model_->description.Get().empty())
       {
@@ -172,37 +177,37 @@
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
         description_->mouse_click.connect(on_mouse_down);
-        preview_info_layout->AddView(description_.GetPointer());
+        preview_info_layout_->AddView(description_.GetPointer());
       }
 
       if (!preview_model_->GetInfoHints().empty())
       {
-        preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+        preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth().CP(scale));
         AddChild(preview_info_hints_.GetPointer());
         preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        preview_info_layout->AddView(preview_info_hints_.GetPointer());
+        preview_info_layout_->AddView(preview_info_hints_.GetPointer());
       }
       /////////////////////
 
       /////////////////////
       // Actions
       action_buttons_.clear();
-      nux::Layout* actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
-      actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+      actions_layout_ = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+      actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
       ///////////////////
 
-    full_data_layout_->AddLayout(preview_data_layout, 0);
+    full_data_layout_->AddLayout(preview_data_layout_, 0);
     full_data_layout_->AddView(preview_info, 1);
-    full_data_layout_->AddView(actions_layout, 0);
+    full_data_layout_->AddView(actions_layout_, 0);
     /////////////////////
   
-  image_data_layout->AddView(image_.GetPointer(), 0);
+  image_data_layout_->AddView(image_.GetPointer(), 0);
 
-  image_data_layout->AddLayout(full_data_layout_, 1);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 void GenericPreview::PreLayoutManagement()
@@ -213,24 +218,63 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_art.width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() - style.GetDetailsPanelMinimumWidth());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale)
+                                - style.GetDetailsLeftMargin().CP(scale)
+                                - style.GetDetailsRightMargin().CP(scale);
+
+  if (content_width - geo_art.width < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_art.width = std::max(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
+
   image_->SetMinMaxSize(geo_art.width, geo_art.height);
-
-  int details_width = MAX(0, geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int details_width = std::max(0, content_width - geo_art.width);
 
   if (title_) { title_->SetMaximumWidth(details_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(details_width); }
   if (description_) { description_->SetMaximumWidth(details_width); }
 
+  int button_w = CLAMP((details_width - style.GetSpaceBetweenActions().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale));
+  int button_h = style.GetActionButtonHeight().CP(scale);
+
   for (nux::AbstractButton* button : action_buttons_)
-  {
-    button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
-  }
+    button->SetMinMaxSize(button_w, button_h);
 
   Preview::PreLayoutManagement();
 }
 
+void GenericPreview::UpdateScale(double scale)
+{
+  if (image_)
+    image_->scale = scale;
+
+  if (preview_info_scroll_)
+    preview_info_scroll_->scale = scale;
+
+  if (preview_info_hints_)
+    preview_info_hints_->scale = scale;
+
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (full_data_layout_)
+  {
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(FULL_CHILDREN_SPACE.CP(scale));
+  }
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (preview_info_layout_)
+    preview_info_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+
+  if (preview_data_layout_)
+    preview_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
+
+  if (actions_layout_)
+    actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
+
+  Preview::UpdateScale(scale);
+}
+
 
 }
 }
 
=== modified file 'dash/previews/GenericPreview.h'
--- dash/previews/GenericPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/GenericPreview.h	2014-08-06 16:03:19 +0000
@@ -23,8 +23,9 @@
 #ifndef GENERICPREVIEW_H
 #define GENERICPREVIEW_H
 
+#include <UnityCore/GenericPreview.h>
 #include "Preview.h"
-#include <UnityCore/GenericPreview.h>
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -52,6 +53,13 @@
   virtual void PreLayoutManagement();
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale);
+
+  nux::HLayout* image_data_layout_;
+  nux::VLayout* preview_info_layout_;
+  ScrollView* preview_info_scroll_;
+  nux::VLayout* preview_data_layout_;
+  nux::Layout* actions_layout_;
 };
 
 }
 
=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/MoviePreview.cpp	2014-08-06 16:03:19 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <UnityCore/MoviePreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
@@ -41,23 +40,23 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 16_em;
+  const RawPixel PREVIEW_INFO_CHILDREN_SPACE = 12_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.movie");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(MoviePreview);
 
 MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
+, image_data_layout_(nullptr)
+, preview_info_layout_(nullptr)
+, preview_info_scroll_(nullptr)
+, actions_layout_(nullptr)
 {
   SetupViews();
 }
@@ -123,8 +122,8 @@
 
   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); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
   /////////////////////
   // Image
@@ -136,8 +135,8 @@
     /////////////////////
     // Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
       /////////////////////
       // Data
@@ -148,6 +147,7 @@
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       AddChild(title_.GetPointer());
       title_->SetLines(-1);
+      title_->SetScale(scale);
       title_->SetFont(style.title_font().c_str());
       title_->mouse_click.connect(on_mouse_down);
       app_data_layout->AddView(title_.GetPointer(), 1);
@@ -157,6 +157,7 @@
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
         AddChild(subtitle_.GetPointer());
         subtitle_->SetLines(-1);
+        subtitle_->SetScale(scale);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         subtitle_->mouse_click.connect(on_mouse_down);
         app_data_layout->AddView(subtitle_.GetPointer(), 1);
@@ -166,8 +167,8 @@
       if (movie_preview_model->rating >= 0) {
         rating_ = new PreviewRatingsWidget();
         AddChild(rating_.GetPointer());
-        rating_->SetMaximumHeight(style.GetRatingWidgetHeight());
-        rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
+        rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+        rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
         rating_->SetRating(movie_preview_model->rating);
         rating_->SetReviews(movie_preview_model->num_ratings);
         rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
@@ -175,20 +176,23 @@
 
       /////////////////////
       // Description
-      nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* preview_info = new ScrollView(NUX_TRACKER_LOCATION);
+      preview_info_scroll_ = preview_info;
+      preview_info->scale = scale();
       preview_info->EnableHorizontalScrollBar(false);
       preview_info->mouse_click.connect(on_mouse_down);
 
-      nux::VLayout* preview_info_layout = new nux::VLayout();
-      preview_info_layout->SetSpaceBetweenChildren(12);
-      preview_info->SetLayout(preview_info_layout);
+      preview_info_layout_ = new nux::VLayout();
+      preview_info_layout_->SetSpaceBetweenChildren(PREVIEW_INFO_CHILDREN_SPACE.CP(scale));
+      preview_info->SetLayout(preview_info_layout_);
 
       if (!preview_model_->GetInfoHints().empty())
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+        preview_info_hints_->scale = scale();
         AddChild(preview_info_hints_.GetPointer());
         preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        preview_info_layout->AddView(preview_info_hints_.GetPointer(), 0);
+        preview_info_layout_->AddView(preview_info_hints_.GetPointer(), 0);
       }
 
       if (!preview_model_->description.Get().empty())
@@ -196,34 +200,35 @@
         description_ = new StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
         AddChild(description_.GetPointer());
         description_->SetFont(style.description_font().c_str());
+        description_->SetScale(scale);
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
         description_->mouse_click.connect(on_mouse_down);
-        preview_info_layout->AddView(description_.GetPointer());
+        preview_info_layout_->AddView(description_.GetPointer());
       }
       /////////////////////
 
       /////////////////////
       // Actions
       action_buttons_.clear();
-      nux::Layout* actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
-      actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+      actions_layout_ = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+      actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
       ///////////////////
 
     full_data_layout_->AddLayout(app_data_layout, 0);
     if (rating_ != NULL)
       full_data_layout_->AddView(rating_.GetPointer(), 0);
     full_data_layout_->AddView(preview_info, 1);
-    full_data_layout_->AddView(actions_layout, 0);
+    full_data_layout_->AddView(actions_layout_, 0);
     /////////////////////
   
-  image_data_layout->AddView(image_.GetPointer(), 0);
-  image_data_layout->AddLayout(full_data_layout_, 1);
+  image_data_layout_->AddView(image_.GetPointer(), 0);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 
@@ -235,11 +240,13 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetVideoImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_art.width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() - style.GetDetailsPanelMinimumWidth());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  if (content_width - geo_art.width  < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_art.width = std::max(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
+
   image_->SetMinMaxSize(geo_art.width, geo_art.height);
 
-  int details_width = MAX(0, geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int details_width = std::max(0, geo.width - geo_art.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale));
 
   if (title_) { title_->SetMaximumWidth(details_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(details_width); }
@@ -247,12 +254,49 @@
 
   for (nux::AbstractButton* button : action_buttons_)
   {
-    button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions()) / 2, 0, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
+    button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale)), style.GetActionButtonHeight().CP(scale));
   }
 
   Preview::PreLayoutManagement();
 }
 
+void MoviePreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  if (image_)
+    image_->scale = scale;
+
+  if (preview_info_hints_)
+    preview_info_hints_->scale = scale;
+
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (full_data_layout_)
+  {
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  }
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (rating_)
+  {
+    rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+    rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
+  }
+
+  if (preview_info_scroll_)
+    preview_info_scroll_->scale = scale;
+
+  if (preview_info_layout_)
+    preview_info_layout_->SetSpaceBetweenChildren(PREVIEW_INFO_CHILDREN_SPACE);
+
+  if (actions_layout_)
+    actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity
 
=== modified file 'dash/previews/MoviePreview.h'
--- dash/previews/MoviePreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/MoviePreview.h	2014-08-06 16:03:19 +0000
@@ -24,6 +24,7 @@
 #define MOVIEPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -55,9 +56,15 @@
   virtual void OnNavigateInComplete();
 
   virtual void SetupViews();
-  
+  virtual void UpdateScale(double scale);
+
 protected:
   nux::ObjectPtr<PreviewRatingsWidget> rating_;
+
+  nux::HLayout* image_data_layout_;
+  nux::VLayout* preview_info_layout_;
+  ScrollView* preview_info_scroll_;
+  nux::Layout* actions_layout_;
 };
 
 }
 
=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPaymentPreview.cpp	2014-08-06 16:03:19 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/PlacesVScrollBar.h"
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
@@ -49,6 +48,22 @@
 {
 nux::logging::Logger logger("unity.dash.previews.payment.preview.music");
 
+const RawPixel DATA_MAX_HEIGHT = 76_em;
+const RawPixel TITLE_CHILDREN_SPACE = 10_em;
+const RawPixel PRIZE_CHILDREN_SPACE = 5_em;
+const RawPixel TITLE_MAX_WIDTH = 480_em;
+const RawPixel INTRO_MIN_HEIGHT = 50_em;
+const RawPixel FORM_MIN_HEIGHT = 107_em;
+const RawPixel FORM_PADDING = 20_em;
+const RawPixel LABELS_CHILDREN_SPACE = 18_em;
+const RawPixel PASSWORD_MIN_HEIGHT = 40_em;
+const RawPixel PASSWORD_MIN_WIDTH = 240_em;
+const RawPixel ACTIONS_CHILDREN_SPACE_MAX = 16_em;
+const RawPixel ACTIONS_CHILDREN_SPACE_MIN = 8_em;
+const RawPixel BUTTONS_SPACE = 20_em;
+const RawPixel HEADER_CHILDREN_SPACE = 10_em;
+const RawPixel HEADER_MAX_SIZE = 76_em;
+const RawPixel BODY_CHILDREN_SPACE = 20_em;
 }
 
 // static string definitions
@@ -59,17 +74,6 @@
 const std::string MusicPaymentPreview::CANCEL_PURCHASE_ACTION = "cancel_purchase";
 const std::string MusicPaymentPreview::PURCHASE_ALBUM_ACTION = "purchase_album";
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(MusicPaymentPreview)
 
 MusicPaymentPreview::MusicPaymentPreview(dash::Preview::Ptr preview_model)
@@ -77,6 +81,7 @@
 {
   SetupViews();
   PaymentPreview::SetupBackground();
+  UpdateScale(scale);
 }
 
 std::string MusicPaymentPreview::GetName() const
@@ -127,6 +132,7 @@
               || MusicPaymentPreview::FORGOT_PASSWORD_ACTION == action_id)
       {
         nux::ObjectPtr<ActionLink> link = this->CreateLink(action);
+        link->scale = scale();
         link->activate.connect(sigc::mem_fun(this,
                     &MusicPaymentPreview::OnActionLinkActivated));
 
@@ -137,6 +143,7 @@
         nux::ObjectPtr<ActionButton> button = this->CreateButton(action);
         button->activate.connect(sigc::mem_fun(this,
                     &MusicPaymentPreview::OnActionActivated));
+        button->scale = scale();
 
         buttons_map_.insert(std::make_pair(action->id, button));
       }
@@ -148,8 +155,8 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout* title_data_layout = new nux::VLayout();
-  title_data_layout->SetMaximumHeight(76);
-  title_data_layout->SetSpaceBetweenChildren(10);
+  title_data_layout->SetMaximumHeight(DATA_MAX_HEIGHT.CP(scale));
+  title_data_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
 
   title_ = new StaticCairoText(
           preview_model_->title.Get(), true,
@@ -157,8 +164,9 @@
 
   title_->SetFont(style.payment_title_font());
   title_->SetLines(-1);
+  title_->SetScale(scale);
   title_->SetFont(style.title_font());
-  title_->SetMaximumWidth(480);
+  title_->SetMaximumWidth(TITLE_MAX_WIDTH.CP(scale));
   title_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
   title_data_layout->AddView(title_.GetPointer(), 1);
 
@@ -166,6 +174,7 @@
           preview_model_->subtitle.Get(), true,
           NUX_TRACKER_LOCATION);
   subtitle_->SetLines(-1);
+  subtitle_->SetScale(scale);
   subtitle_->SetFont(style.payment_subtitle_font());
   title_data_layout->AddView(subtitle_.GetPointer(), 1);
   title_data_layout->AddSpace(1, 1);
@@ -176,14 +185,15 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *prize_data_layout = new nux::VLayout();
-  prize_data_layout->SetMaximumHeight(76);
-  prize_data_layout->SetSpaceBetweenChildren(5);
-  prize_data_layout->SetPadding(0, 10, 0, 0);
+  prize_data_layout->SetMaximumHeight(DATA_MAX_HEIGHT.CP(scale));
+  prize_data_layout->SetSpaceBetweenChildren(PRIZE_CHILDREN_SPACE.CP(scale));
+  prize_data_layout->SetPadding(0, TITLE_CHILDREN_SPACE.CP(scale), 0, 0);
 
   purchase_prize_ = new StaticCairoText(
           payment_preview_model_->purchase_prize.Get(), true,
           NUX_TRACKER_LOCATION);
   purchase_prize_->SetLines(-1);
+  purchase_prize_->SetScale(scale);
   purchase_prize_->SetFont(style.payment_prize_title_font());
   prize_data_layout->AddView(purchase_prize_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -192,6 +202,7 @@
           _("Ubuntu One best offer"),
           true, NUX_TRACKER_LOCATION);
   purchase_hint_->SetLines(-1);
+  purchase_hint_->SetScale(scale);
   purchase_hint_->SetFont(style.payment_prize_subtitle_font());
   prize_data_layout->AddView(purchase_hint_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -200,6 +211,7 @@
           payment_preview_model_->purchase_type.Get(), true,
           NUX_TRACKER_LOCATION);
   purchase_type_->SetLines(-1);
+  purchase_type_->SetScale(scale);
   purchase_type_->SetFont(style.payment_prize_subtitle_font());
   prize_data_layout->AddView(purchase_type_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -210,31 +222,30 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *body_layout = new  nux::VLayout();
-  body_layout->SetSpaceBetweenChildren(20);
+  body_layout->SetSpaceBetweenChildren(BODY_CHILDREN_SPACE.CP(scale));
 
   intro_ = new StaticCairoText(
           payment_preview_model_->header.Get(), true,
           NUX_TRACKER_LOCATION);
   intro_->SetFont(style.payment_intro_font());
-  intro_->SetLineSpacing(10);
+  intro_->SetScale(scale);
+  intro_->SetLineSpacing(TITLE_CHILDREN_SPACE.CP(scale));
   intro_->SetLines(-style.GetDescriptionLineCount());
-  intro_->SetMinimumHeight(50);
+  intro_->SetMinimumHeight(INTRO_MIN_HEIGHT.CP(scale));
 
   form_layout_ = new nux::HLayout();
-  form_layout_->SetSpaceBetweenChildren(10);
-  form_layout_->SetMinimumHeight(107);
-  form_layout_->SetLeftAndRightPadding(20);
-  form_layout_->SetTopAndBottomPadding(10);
+  form_layout_->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
+  form_layout_->SetMinimumHeight(FORM_MIN_HEIGHT.CP(scale));
+  form_layout_->SetLeftAndRightPadding(FORM_PADDING.CP(scale));
+  form_layout_->SetTopAndBottomPadding(TITLE_CHILDREN_SPACE.CP(scale));
 
   form_layout_->AddLayout(GetFormLabels(), 1, nux::MINOR_POSITION_END);
   form_layout_->AddLayout(GetFormFields(), 1, nux::MINOR_POSITION_END);
   form_layout_->AddLayout(GetFormActions(), 1, nux::MINOR_POSITION_END);
 
-
   body_layout->AddView(intro_.GetPointer(), 1);
   body_layout->AddLayout(form_layout_.GetPointer(), 1);
 
-
   return body_layout;
 }
 
@@ -244,17 +255,18 @@
   nux::VLayout *labels_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    labels_layout->SetSpaceBetweenChildren(18);
+    labels_layout->SetSpaceBetweenChildren(LABELS_CHILDREN_SPACE.CP(scale));
   }
   else
   {
-    labels_layout->SetSpaceBetweenChildren(10);
+    labels_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
   }
 
   email_label_ = new StaticCairoText(
           _("Ubuntu One email:"), true,
           NUX_TRACKER_LOCATION);
   email_label_->SetLines(-1);
+  email_label_->SetScale(scale);
   email_label_->SetFont(style.payment_form_labels_font());
   labels_layout->AddView(email_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
@@ -262,6 +274,7 @@
           _("Payment method:"), true,
           NUX_TRACKER_LOCATION);
   payment_label_->SetLines(-1);
+  payment_label_->SetScale(scale);
   payment_label_->SetFont(style.payment_form_labels_font());
   labels_layout->AddView(payment_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
@@ -269,8 +282,9 @@
           _("Ubuntu One password:"), true,
           NUX_TRACKER_LOCATION);
   password_label_->SetLines(-1);
+  password_label_->SetScale(scale);
   password_label_->SetFont(style.payment_form_labels_font());
-  password_label_->SetMinimumHeight(40);
+  password_label_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
   labels_layout->AddView(password_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
   return labels_layout;
@@ -282,17 +296,18 @@
   nux::VLayout *fields_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    fields_layout->SetSpaceBetweenChildren(18);
+    fields_layout->SetSpaceBetweenChildren(LABELS_CHILDREN_SPACE.CP(scale));
   }
   else
   {
-    fields_layout->SetSpaceBetweenChildren(10);
+    fields_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
   }
 
   email_ = new StaticCairoText(
           payment_preview_model_->email.Get(), true,
           NUX_TRACKER_LOCATION);
   email_->SetLines(-1);
+  email_->SetScale(scale);
   email_->SetFont(style.payment_form_data_font());
   fields_layout->AddView(email_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
@@ -301,13 +316,14 @@
           payment_preview_model_->payment_method.Get(), true,
           NUX_TRACKER_LOCATION);
   payment_->SetLines(-1);
+  payment_->SetScale(scale);
   payment_->SetFont(style.payment_form_data_font());
   fields_layout->AddView(payment_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
 
   password_entry_ = new TextInput();
-  password_entry_->SetMinimumHeight(40);
-  password_entry_->SetMinimumWidth(240);
+  password_entry_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
+  password_entry_->SetMinimumWidth(PASSWORD_MIN_WIDTH.CP(scale));
   password_entry_->input_hint = _("Password");
 
   fields_layout->AddView(password_entry_.GetPointer(),
@@ -322,6 +338,7 @@
     StaticCairoText* error = new StaticCairoText(
             _("Wrong password"), true, NUX_TRACKER_LOCATION);
     error->SetLines(-1);
+    error->SetScale(scale);
     error->SetFont(style.payment_form_data_font());
     // ensure it is an error using red
     error->SetTextColor(style.payment_error_color());
@@ -337,11 +354,11 @@
   nux::VLayout *actions_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    actions_layout->SetSpaceBetweenChildren(16);
+    actions_layout->SetSpaceBetweenChildren(ACTIONS_CHILDREN_SPACE_MAX.CP(scale));
   }
   else
   {
-    actions_layout->SetSpaceBetweenChildren(8);
+    actions_layout->SetSpaceBetweenChildren(ACTIONS_CHILDREN_SPACE_MIN.CP(scale));
   }
 
   nux::ObjectPtr<StaticCairoText> empty_;
@@ -349,6 +366,7 @@
           "", true,
           NUX_TRACKER_LOCATION);
   empty_->SetLines(-1);
+  empty_->SetScale(scale);
   empty_->SetFont(style.payment_form_labels_font());
   actions_layout->AddView(empty_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
@@ -374,14 +392,14 @@
   actions_buffer_h->AddSpace(0, 1);
 
   nux::HLayout* buttons_data_layout = new nux::HLayout();
-  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
 
-  lock_texture_ = new IconTexture(style.GetLockIcon(), style.GetPaymentLockWidth(),
-          style.GetPaymentLockHeight());
+  lock_texture_ = new IconTexture(style.GetLockIcon(), style.GetPaymentLockWidth().CP(scale),
+          style.GetPaymentLockHeight().CP(scale));
   buttons_data_layout->AddView(lock_texture_.GetPointer(), 0, nux::MINOR_POSITION_CENTER,
           nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
 
-  buttons_data_layout->AddSpace(20, 1);
+  buttons_data_layout->AddSpace(BUTTONS_SPACE.CP(scale), 1);
   if(buttons_map_[MusicPaymentPreview::CANCEL_PURCHASE_ACTION].GetPointer())
     buttons_data_layout->AddView(buttons_map_[MusicPaymentPreview::CANCEL_PURCHASE_ACTION].GetPointer(),
             1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL, 100.0f,
@@ -413,7 +431,8 @@
 
   previews::Style& style = dash::previews::Style::Instance();
 
-  int width = std::max<int>(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  int width = std::max<int>(0, content_width);
 
   if(full_data_layout_) { full_data_layout_->SetMaximumWidth(width); }
   if(header_layout_) { header_layout_->SetMaximumWidth(width); }
@@ -460,6 +479,49 @@
   PaymentPreview::SetupViews();
 }
 
+void MusicPaymentPreview::UpdateScale(double scale)
+{
+  PaymentPreview::UpdateScale(scale);
+
+  if (intro_)
+    intro_->SetScale(scale);
+  if (email_label_)
+    email_label_->SetScale(scale);
+  if (payment_label_)
+    payment_label_->SetScale(scale);
+  if (payment_)
+    payment_->SetScale(scale);
+  if (password_label_)
+    password_label_->SetScale(scale);
+  if (purchase_hint_)
+    purchase_hint_->SetScale(scale);
+  if (purchase_prize_)
+    purchase_prize_->SetScale(scale);
+  if (purchase_type_)
+    purchase_type_->SetScale(scale);
+  if (change_payment_)
+    change_payment_->SetScale(scale);
+  if (error_label_)
+    error_label_->SetScale(scale);
+
+  previews::Style& style = dash::previews::Style::Instance();
+  if (lock_texture_)
+    lock_texture_->SetSize(std::max(style.GetPaymentLockWidth().CP(scale), style.GetPaymentLockHeight().CP(scale)));
+
+  if (password_entry_)
+  {
+    password_entry_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
+    password_entry_->SetMinimumWidth(PASSWORD_MIN_WIDTH.CP(scale));
+  }
+
+  if (form_layout_)
+  {
+    form_layout_->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
+    form_layout_->SetMinimumHeight(FORM_MIN_HEIGHT.CP(scale));
+    form_layout_->SetLeftAndRightPadding(FORM_PADDING.CP(scale));
+    form_layout_->SetTopAndBottomPadding(TITLE_CHILDREN_SPACE.CP(scale));
+  }
+}
 
 }
 }
 
=== modified file 'dash/previews/MusicPaymentPreview.h'
--- dash/previews/MusicPaymentPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPaymentPreview.h	2014-08-06 16:03:19 +0000
@@ -90,6 +90,7 @@
   void OnActionLinkActivated(ActionLink* link, std::string const& id);
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale) override;
 
   void PreLayoutManagement();
 
 
=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/MusicPreview.cpp	2014-08-06 16:03:19 +0000
@@ -42,14 +42,27 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 16_em;
+  const RawPixel ICON_LEFT_RIGHT_PADDING = 10_em;
+  const RawPixel WARNING_MIN_HEIGHT = 50_em;
+  const RawPixel WARNING_MAX_WIDTH = 300_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.music");
 
 NUX_IMPLEMENT_OBJECT_TYPE(MusicPreview);
 
 MusicPreview::MusicPreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
+, actions_layout_(nullptr)
+, image_data_layout_(nullptr)
+, icon_layout_(nullptr)
 {
   SetupViews();
+  UpdateScale(scale);
 }
 
 MusicPreview::~MusicPreview()
@@ -130,13 +143,13 @@
 
   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); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
   /////////////////////
   // Image
   image_ = new CoverArt();
-  
+  image_->scale = scale();
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
   /////////////////////
@@ -144,20 +157,21 @@
     /////////////////////
     // App Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
       /////////////////////
       // Music Info
-      nux::VLayout* album_data_layout = new nux::VLayout();
-      album_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
+      album_data_layout_ = new nux::VLayout();
+      album_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
 
       title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       AddChild(title_.GetPointer());
       title_->SetFont(style.title_font().c_str());
       title_->SetLines(-1);
+      title_->SetScale(scale);
       title_->mouse_click.connect(on_mouse_down);
-      album_data_layout->AddView(title_.GetPointer(), 1);
+      album_data_layout_->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
@@ -165,8 +179,9 @@
         AddChild(subtitle_.GetPointer());
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         subtitle_->SetLines(-1);
+        subtitle_->SetScale(scale);
         subtitle_->mouse_click.connect(on_mouse_down);
-        album_data_layout->AddView(subtitle_.GetPointer(), 1);
+        album_data_layout_->AddView(subtitle_.GetPointer(), 1);
       }
 
       /////////////////////
@@ -177,6 +192,7 @@
       if (tracks_model)
       {
         tracks_ = new previews::Tracks(tracks_model, NUX_TRACKER_LOCATION);
+        tracks_->scale = scale();
         AddChild(tracks_.GetPointer());
         tracks_->mouse_click.connect(on_mouse_down);
       }
@@ -187,7 +203,7 @@
       /////////////////////
       // Hints && Actions
       nux::VLayout* hints_layout = NULL;
-      nux::Layout* actions_layout = NULL;
+      actions_layout_ = NULL;
       bool has_u1_creds = HasUbuntuOneCredentials();
 
       if (has_u1_creds)
@@ -197,70 +213,72 @@
           hints_layout = new nux::VLayout();
           hints_layout->SetSpaceBetweenChildren(0);
           hints_layout->AddSpace(0, 1);
-          preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+          preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth().CP(scale));
+          preview_info_hints_->scale = scale();
           AddChild(preview_info_hints_.GetPointer());
           preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
           hints_layout->AddView(preview_info_hints_.GetPointer(), 0);
 
           // If there are actions, we use a vertical layout
           action_buttons_.clear();
-          actions_layout = BuildVerticalActionsLayout(preview_model_->GetActions(), action_buttons_);
-          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+          actions_layout_ = BuildVerticalActionsLayout(preview_model_->GetActions(), action_buttons_);
+          actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
         }
         else // otherwise we add a grid layout.
         {
           action_buttons_.clear();
-          actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+          actions_layout_ = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
           if (action_buttons_.size() < 2)
             hint_actions_layout->AddSpace(0, 1);
-          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+          actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
         }
       }
       else
       {
         // let the user know he needs to connect
         previews::Style& style = dash::previews::Style::Instance();
-	actions_layout = new nux::HLayout();
-	nux::VLayout* icon_layout = new nux::VLayout();
-  	icon_layout->SetLeftAndRightPadding(10);
+        nux::HLayout* actions_layout = new nux::HLayout();
+        icon_layout_ = new nux::VLayout();
+        icon_layout_->SetLeftAndRightPadding(ICON_LEFT_RIGHT_PADDING.CP(scale));
 
         warning_texture_ = new IconTexture(style.GetWarningIcon());
-        icon_layout->AddView(warning_texture_.GetPointer(), 0, nux::MINOR_POSITION_START,
+        icon_layout_->AddView(warning_texture_.GetPointer(), 0, nux::MINOR_POSITION_START,
           nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
-        actions_layout->AddLayout(icon_layout, 0, nux::MINOR_POSITION_CENTER);
+        actions_layout->AddLayout(icon_layout_, 0, nux::MINOR_POSITION_CENTER);
 
         warning_msg_ = new StaticCairoText(
                      no_credentials_message_, true,
                      NUX_TRACKER_LOCATION);
-  	AddChild(warning_msg_.GetPointer());
+        AddChild(warning_msg_.GetPointer());
         warning_msg_->SetFont(style.u1_warning_font().c_str());
         warning_msg_->SetLines(-2);
-        warning_msg_->SetMinimumHeight(50);
-        warning_msg_->SetMaximumWidth(300);
+        warning_msg_->SetScale(scale);
+        warning_msg_->SetMinimumHeight(WARNING_MIN_HEIGHT.CP(scale));
+        warning_msg_->SetMaximumWidth(WARNING_MAX_WIDTH.CP(scale));
 
         actions_layout->AddView(warning_msg_.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
 
       }
-     
+
         /////////////////////
 
       if (hints_layout) hint_actions_layout->AddView(hints_layout, 1);
-      hint_actions_layout->AddView(actions_layout, 0);
+      hint_actions_layout->AddView(actions_layout_, 0);
 
-    full_data_layout_->AddLayout(album_data_layout, 0);
+    full_data_layout_->AddLayout(album_data_layout_, 0);
     if (tracks_)
     {
       full_data_layout_->AddView(tracks_.GetPointer(), 1);
     }
     full_data_layout_->AddLayout(hint_actions_layout, 0);
     /////////////////////
-  
-  image_data_layout->AddView(image_.GetPointer(), 0);
-  image_data_layout->AddLayout(full_data_layout_, 1);
+
+  image_data_layout_->AddView(image_.GetPointer(), 0);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 void MusicPreview::PreLayoutManagement()
@@ -272,23 +290,23 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_art.width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() - style.GetDetailsPanelMinimumWidth());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  if (content_width - geo_art.width < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_art.width = MAX(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
   image_->SetMinMaxSize(geo_art.width, geo_art.height);
 
-  int details_width = MAX(0, geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int details_width = MAX(0, content_width - geo_art.width);
 
   if (title_) { title_->SetMaximumWidth(details_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(details_width); }
 
   for (nux::AbstractButton* button : action_buttons_)
   {
-    int action_width = CLAMP((details_width - style.GetSpaceBetweenActions()) /
-      2, 0, style.GetActionButtonMaximumWidth());
+    int action_width = CLAMP((details_width - style.GetSpaceBetweenActions().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale));
     // do not use SetMinMax because width has to be able to grow
     button->SetMinimumWidth(action_width);
-    button->SetMinimumHeight(style.GetActionButtonHeight());
-    button->SetMaximumHeight(style.GetActionButtonHeight());
+    button->SetMinimumHeight(style.GetActionButtonHeight().CP(scale));
+    button->SetMaximumHeight(style.GetActionButtonHeight().CP(scale));
   }
 
   Preview::PreLayoutManagement();
@@ -300,6 +318,47 @@
   player.Stop();
 }
 
+void MusicPreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  if (tracks_)
+    tracks_->scale = scale;
+
+  if (preview_info_hints_)
+    preview_info_hints_->scale = scale;
+
+  if (icon_layout_)
+    icon_layout_->SetLeftAndRightPadding(ICON_LEFT_RIGHT_PADDING.CP(scale));
+
+  if (warning_msg_)
+  {
+    warning_msg_->SetScale(scale);
+    warning_msg_->SetMinimumHeight(WARNING_MIN_HEIGHT.CP(scale));
+    warning_msg_->SetMaximumWidth(WARNING_MAX_WIDTH.CP(scale));
+  }
+
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (full_data_layout_)
+  {
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  }
+
+  if (album_data_layout_)
+    album_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
+
+  if (actions_layout_)
+    actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
+
+  if (icon_layout_)
+    icon_layout_->SetLeftAndRightPadding(ICON_LEFT_RIGHT_PADDING.CP(scale));
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity
 
=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPreview.h	2014-08-06 16:03:19 +0000
@@ -24,6 +24,7 @@
 #define MUSICPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 #include "unity-shared/IconTexture.h"
 
 namespace unity
@@ -53,6 +54,7 @@
   virtual void PreLayoutManagement();
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale);
 
   virtual void OnNavigateOut();
 
@@ -64,6 +66,10 @@
   nux::ObjectPtr<IconTexture> warning_texture_;
   std::string no_credentials_message_;
 
+  nux::Layout* actions_layout_;
+  nux::HLayout* image_data_layout_;
+  nux::VLayout* icon_layout_;
+  nux::VLayout* album_data_layout_;
  };
 
 }
 
=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/PaymentPreview.cpp	2014-08-06 16:03:19 +0000
@@ -23,6 +23,7 @@
 #include <NuxCore/Logger.h>
 #include "PaymentPreview.h"
 #include "unity-shared/CoverArt.h"
+#include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"
 
 namespace unity
@@ -39,6 +40,15 @@
 
 nux::logging::Logger logger("unity.dash.previews.payment.preview");
 
+const RawPixel CONTENT_DATA_CHILDREN_SPACE = 5_em;
+const RawPixel CONTENT_DATA_PADDING = 10_em;
+const RawPixel OVERLAY_LAYOUT_SPACE = 20_em;
+const RawPixel HEADER_CHILDREN_SPACE = 10_em;
+const RawPixel HEADER_MAX_SIZE = 76_em;
+const RawPixel IMAGE_MIN_MAX_SIZE = 64_em;
+const RawPixel HEADER_SPACE = 10_em;
+const RawPixel LINK_MIN_WIDTH = 178_em;
+const RawPixel LINK_MAX_HEIGHT = 34_em;
 }
 
 class OverlaySpinner : public unity::debug::Introspectable, public nux::View
@@ -47,6 +57,8 @@
 public:
   OverlaySpinner();
 
+  nux::Property<double> scale;
+
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
 
@@ -61,7 +73,7 @@
 private:
   bool OnFrameTimeout();
 
-  nux::BaseTexture* spin_;
+  nux::ObjectPtr<nux::BaseTexture> spin_;
 
   glib::Source::UniquePtr frame_timeout_;
 
@@ -72,15 +84,19 @@
 NUX_IMPLEMENT_OBJECT_TYPE(OverlaySpinner);
 
 OverlaySpinner::OverlaySpinner()
-  : nux::View(NUX_TRACKER_LOCATION),
-    rotation_(0.0f)
+  : nux::View(NUX_TRACKER_LOCATION)
+  , scale(1.0)
+  , rotation_(0.0f)
 {
-  previews::Style& style = dash::previews::Style::Instance();
-
-  spin_ = style.GetSearchSpinIcon();
+  spin_ = dash::Style::Instance().GetSearchSpinIcon(scale);
 
   rotate_.Identity();
   rotate_.Rotate_z(0.0);
+
+  scale.changed.connect([this] (double scale) {
+    spin_ = dash::Style::Instance().GetSearchSpinIcon(scale);
+    QueueDraw();
+  });
 }
 
 void OverlaySpinner::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -183,8 +199,12 @@
 : Preview(preview_model)
 , data_(nullptr)
 , full_data_layout_(nullptr)
-{
-}
+, content_data_layout_(nullptr)
+, overlay_layout_(nullptr)
+, header_layout_(nullptr)
+, body_layout_(nullptr)
+, footer_layout_(nullptr)
+{}
 
 std::string PaymentPreview::GetName() const
 {
@@ -199,18 +219,18 @@
 nux::Layout* PaymentPreview::GetHeader()
 {
   nux::HLayout* header_data_layout = new nux::HLayout();
-  header_data_layout->SetSpaceBetweenChildren(10);
-  header_data_layout->SetMaximumHeight(76);
-  header_data_layout->SetMinimumHeight(76);
+  header_data_layout->SetSpaceBetweenChildren(HEADER_CHILDREN_SPACE.CP(scale));
+  header_data_layout->SetMaximumHeight(HEADER_MAX_SIZE.CP(scale));
+  header_data_layout->SetMinimumHeight(HEADER_MAX_SIZE.CP(scale));
 
   image_ = new CoverArt();
-  image_->SetMinMaxSize(64, 64);
+  image_->SetMinMaxSize(IMAGE_MIN_MAX_SIZE.CP(scale), IMAGE_MIN_MAX_SIZE.CP(scale));
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
 
   header_data_layout->AddView(image_.GetPointer(), 0);
   header_data_layout->AddLayout(GetTitle(), 0);
-  header_data_layout->AddSpace(10, 1);
+  header_data_layout->AddSpace(HEADER_SPACE.CP(scale), 1);
   header_data_layout->AddLayout(GetPrice(), 0);
   return header_data_layout;
 }
@@ -223,8 +243,8 @@
   link = new ActionLink(action->id,
          action->display_name, NUX_TRACKER_LOCATION);
   link->font_hint.Set(style.payment_form_labels_font().c_str());
-  link->SetMinimumWidth(178);
-  link->SetMaximumHeight(34);
+  link->SetMinimumWidth(LINK_MIN_WIDTH.CP(scale));
+  link->SetMaximumHeight(LINK_MAX_HEIGHT.CP(scale));
   return link;
 }
 
@@ -239,8 +259,8 @@
            NUX_TRACKER_LOCATION);
   button->SetFont(style.action_font());
   button->SetExtraHint(action->extra_text, style.action_extra_font());
-  button->SetMinimumWidth(178);
-  button->SetMaximumHeight(34);
+  button->SetMinimumWidth(LINK_MIN_WIDTH.CP(scale));
+  button->SetMaximumHeight(LINK_MAX_HEIGHT.CP(scale));
   return button;
 }
 
@@ -327,8 +347,8 @@
 
   // layout to be used to show the info
   content_data_layout_ = new nux::VLayout();
-  content_data_layout_->SetSpaceBetweenChildren(5);
-  content_data_layout_->SetPadding(10, 10, 0, 10);
+  content_data_layout_->SetSpaceBetweenChildren(CONTENT_DATA_CHILDREN_SPACE.CP(scale));
+  content_data_layout_->SetPadding(CONTENT_DATA_PADDING.CP(scale), CONTENT_DATA_PADDING.CP(scale), 0, CONTENT_DATA_PADDING.CP(scale));
 
   header_layout_ = GetHeader();
 
@@ -344,21 +364,37 @@
 
   // layout to draw an overlay
   overlay_layout_ = new nux::VLayout();
-  StaticCairoText* calculating = new StaticCairoText(
+  calculating_ = new StaticCairoText(
                                    "Performing purchase", true,
                                    NUX_TRACKER_LOCATION);
 
   OverlaySpinner* spinner_ = new OverlaySpinner();
-  overlay_layout_->AddSpace(20, 1);
-  overlay_layout_->AddView(calculating, 0, nux::MINOR_POSITION_CENTER);
+  overlay_layout_->AddSpace(OVERLAY_LAYOUT_SPACE.CP(scale), 1);
+  overlay_layout_->AddView(calculating_, 0, nux::MINOR_POSITION_CENTER);
   overlay_layout_->AddView(spinner_, 1, nux::MINOR_POSITION_CENTER);
-  overlay_layout_->AddSpace(20, 1);
+  overlay_layout_->AddSpace(OVERLAY_LAYOUT_SPACE.CP(scale), 1);
+  scale.changed.connect([this, spinner_] (double scale) { spinner_->scale = scale; });
 
   full_data_layout_->AddLayout(overlay_layout_.GetPointer());
 
+  UpdateScale(scale);
   SetLayout(full_data_layout_.GetPointer());
 }
 
+void PaymentPreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  if (calculating_)
+    calculating_->SetScale(scale);
+
+  if (content_data_layout_)
+  {
+    content_data_layout_->SetSpaceBetweenChildren(CONTENT_DATA_CHILDREN_SPACE.CP(scale));
+    content_data_layout_->SetPadding(CONTENT_DATA_PADDING.CP(scale), CONTENT_DATA_PADDING.CP(scale), 0, CONTENT_DATA_PADDING.CP(scale));
+  }
+}
+
 }
 
 }
 
=== modified file 'dash/previews/PaymentPreview.h'
--- dash/previews/PaymentPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PaymentPreview.h	2014-08-06 16:03:19 +0000
@@ -106,6 +106,7 @@
 
   virtual void LoadActions() = 0;
   virtual void SetupViews();
+  virtual void UpdateScale(double scale) override;
   virtual void SetupBackground();
 
   nux::ObjectPtr<nux::LayeredLayout> full_data_layout_;
@@ -115,6 +116,8 @@
   nux::ObjectPtr<nux::Layout> body_layout_;
   nux::ObjectPtr<nux::Layout> footer_layout_;
 
+  StaticCairoText* calculating_;
+
   // content elements
   nux::ObjectPtr<CoverArt> image_;
 
 
=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/Preview.cpp	2014-08-06 16:03:19 +0000
@@ -38,6 +38,7 @@
 #include "MusicPaymentPreview.h"
 #include "SocialPreview.h"
 #include "PreviewInfoHintWidget.h"
+#include "ActionButton.h"
 
 namespace unity
 {
@@ -100,14 +101,16 @@
 
 Preview::Preview(dash::Preview::Ptr preview_model)
   : View(NUX_TRACKER_LOCATION)
+  , scale(1.0f)
   , preview_model_(preview_model)
   , tab_iterator_(new TabIterator())
   , full_data_layout_(nullptr)
   , image_(nullptr)
   , title_(nullptr)
   , subtitle_(nullptr)
+  , preview_container_(new PreviewContainer)
 {
-  preview_container_ = new PreviewContainer;
+  scale.changed.connect(sigc::mem_fun(this, &Preview::UpdateScale));
 }
 
 Preview::~Preview()
@@ -138,13 +141,13 @@
   previews::Style& style = dash::previews::Style::Instance();
 
   nux::VLayout* actions_layout_v = new nux::VLayout();
-  actions_layout_v->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+  actions_layout_v->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
   uint rows = actions.size() / 2 + ((actions.size() % 2 > 0) ? 1 : 0);
   uint action_iter = 0;
   for (uint i = 0; i < rows; i++)
   {
     nux::HLayout* actions_layout_h = new TabIteratorHLayout(tab_iterator_);
-    actions_layout_h->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+    actions_layout_h->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
 
     for (uint j = 0; j < 2 && action_iter < actions.size(); j++, action_iter++)
     {
@@ -172,7 +175,7 @@
   previews::Style& style = dash::previews::Style::Instance();
 
   nux::VLayout* actions_layout_v = new TabIteratorVLayout(tab_iterator_);
-  actions_layout_v->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+  actions_layout_v->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
 
   uint action_iter = 0;
   for (uint i = 0; i < actions.size(); i++)
@@ -215,7 +218,7 @@
   else
     cover_art->SetNoImageAvailable();
   cover_art->SetFont(style.no_preview_image_font());
-  
+
   cover_art->mouse_click.connect(on_mouse_down);
 }
 
@@ -279,6 +282,37 @@
   return preview_container_->request_close;
 }
 
-}
-}
-}
+void Preview::UpdateScale(double scale)
+{
+  if (image_)
+    image_->scale = scale;
+
+  if (title_)
+    title_->SetScale(scale);
+  if (subtitle_)
+    subtitle_->SetScale(scale);
+  if (description_)
+    description_->SetScale(scale);
+
+  if (preview_container_)
+    preview_container_->scale = scale;
+
+  if (preview_info_hints_)
+    preview_info_hints_->scale = scale;
+
+  for (nux::AbstractButton* button : action_buttons_)
+  {
+    if (ActionButton* bn = dynamic_cast<ActionButton*>(button))
+      bn->scale = scale;
+
+    if (ActionLink* link = dynamic_cast<ActionLink*>(button))
+      link->scale = scale;
+  }
+
+  QueueRelayout();
+  QueueDraw();
+}
+
+} // preview
+} // dash
+} // unity
 
=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/Preview.h	2014-08-06 16:03:19 +0000
@@ -74,6 +74,8 @@
                                       unsigned long special_keys_state);
   virtual nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+  nux::Property<double> scale;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {}
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {}
@@ -88,6 +90,8 @@
 
   virtual void SetupViews() = 0;
 
+  virtual void UpdateScale(double scale);
+
   nux::Layout* BuildGridActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
   nux::Layout* BuildVerticalActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
 
 
=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewContainer.cpp	2014-08-06 16:03:19 +0000
@@ -23,11 +23,11 @@
 #include "PreviewContainer.h"
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
-#include <Nux/VLayout.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/TimeUtil.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/DashStyle.h"
 #include "unity-shared/GraphicsUtils.h"
 #include "PreviewNavigator.h"
 #include <boost/math/constants/constants.hpp>
@@ -52,13 +52,15 @@
 const int PREVIEW_SPINNER_WAIT = 2000;
 
 const std::string ANIMATION_IDLE = "animation-idle";
+const RawPixel CHILDREN_SPACE = 6_em;
 }
 
 class PreviewContent : public nux::Layout, public debug::Introspectable
 {
 public:
   PreviewContent(PreviewContainer*const parent)
-  : parent_(parent)
+  : scale(1.0)
+  , parent_(parent)
   , progress_(0.0)
   , curve_progress_(0.0)
   , animating_(false)
@@ -73,9 +75,19 @@
       // Need to update the preview geometries when updating the container geo.
       UpdateAnimationProgress(progress_, curve_progress_);
     });
-    Style& style = previews::Style::Instance();
-
-    spin_= style.GetSearchSpinIcon(32);
+
+    spin_ = dash::Style::Instance().GetSearchSpinIcon(scale);
+    scale.changed.connect(sigc::mem_fun(this, &PreviewContent::UpdateScale));
+  }
+
+  void UpdateScale(double scale)
+  {
+    spin_ = dash::Style::Instance().GetSearchSpinIcon(scale);
+
+    for (auto* area : GetChildren())
+      static_cast<previews::Preview*>(area)->scale = scale;
+
+    QueueDraw();
   }
 
   // From debug::Introspectable
@@ -107,6 +119,7 @@
       AddChild(preview.GetPointer());
       AddView(preview.GetPointer());
       preview->SetVisible(false);
+      preview->scale = scale();
     }
     else
     {
@@ -355,6 +368,7 @@
   sigc::signal<void> start_navigation;
   sigc::signal<void> continue_navigation;
   sigc::signal<void> end_navigation;
+  nux::Property<double> scale;
 
 private:
   PreviewContainer*const parent_;
@@ -394,6 +408,7 @@
 
 PreviewContainer::PreviewContainer(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , preview_layout_(nullptr)
   , nav_disabled_(Navigation::NONE)
   , navigation_progress_speed_(0.0)
@@ -408,6 +423,7 @@
 
   key_down.connect(sigc::mem_fun(this, &PreviewContainer::OnKeyDown));
   mouse_click.connect(sigc::mem_fun(this, &PreviewContainer::OnMouseDown));
+  scale.changed.connect(sigc::mem_fun(this, &PreviewContainer::UpdateScale));
 }
 
 PreviewContainer::~PreviewContainer()
@@ -417,13 +433,12 @@
 void PreviewContainer::Preview(dash::Preview::Ptr preview_model, Navigation direction)
 {
   previews::Preview::Ptr preview_view = preview_model ? previews::Preview::PreviewForModel(preview_model) : previews::Preview::Ptr();
-  
+
   if (preview_view)
   {
     preview_view->request_close().connect([this]() { request_close.emit(); });
+    preview_layout_->PushPreview(preview_view, direction);
   }
-  
-  preview_layout_->PushPreview(preview_view, direction);
 }
 
 void PreviewContainer::DisableNavButton(Navigation button)
@@ -458,29 +473,32 @@
 
   nux::VLayout* layout = new nux::VLayout();
   SetLayout(layout);
-  layout->AddLayout(new nux::SpaceLayout(0,0,style.GetPreviewTopPadding(),style.GetPreviewTopPadding()));
+
+  layout->SetTopAndBottomPadding(style.GetPreviewTopPadding().CP(scale), 0);
 
   layout_content_ = new nux::HLayout();
-  layout_content_->SetSpaceBetweenChildren(6);
+  layout_content_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
   layout->AddLayout(layout_content_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
   layout_content_->AddSpace(0, 1);
   nav_left_ = new PreviewNavigator(Orientation::LEFT, NUX_TRACKER_LOCATION);
   AddChild(nav_left_);
-  nav_left_->SetMinimumWidth(style.GetNavigatorWidth());
-  nav_left_->SetMaximumWidth(style.GetNavigatorWidth());
+  nav_left_->scale = scale();
+  nav_left_->SetMinimumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_left_->SetMaximumWidth(style.GetNavigatorWidth().CP(scale));
   nav_left_->activated.connect([this]() { navigate_left.emit(); });
   layout_content_->AddView(nav_left_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
   preview_layout_ = new PreviewContent(this);
-  preview_layout_->SetMinMaxSize(style.GetPreviewWidth(), style.GetPreviewHeight());
+  preview_layout_->SetMinMaxSize(style.GetPreviewWidth().CP(scale), style.GetPreviewHeight().CP(scale));
   AddChild(preview_layout_);
   layout_content_->AddLayout(preview_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
   nav_right_ = new PreviewNavigator(Orientation::RIGHT, NUX_TRACKER_LOCATION);
   AddChild(nav_right_);
-  nav_right_->SetMinimumWidth(style.GetNavigatorWidth());
-  nav_right_->SetMaximumWidth(style.GetNavigatorWidth());
+  nav_right_->scale = scale();
+  nav_right_->SetMinimumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_right_->SetMaximumWidth(style.GetNavigatorWidth().CP(scale));
   nav_right_->activated.connect([this]() { navigate_right.emit(); });
   layout_content_->AddView(nav_right_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   layout_content_->AddSpace(0, 1);
@@ -492,7 +510,7 @@
     // reset animation clock.
     if (navigation_count_ == 0)
       clock_gettime(CLOCK_MONOTONIC, &last_progress_time_);
-  
+
     float navigation_progress_remaining = CLAMP((1.0 - preview_layout_->GetAnimationProgress()) + navigation_count_, 1.0f, 10.0f);
     navigation_count_++;
 
@@ -534,7 +552,7 @@
     gfx_engine.GetRenderStates().SetBlend(false);
     gfx_engine.QRP_Color(GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
   }
-  
+
     // rely on the compiz event loop to come back to us in a nice throttling
   if (AnimationInProgress())
   {
@@ -595,11 +613,12 @@
 bool PreviewContainer::QueueAnimation()
 {
   animation_timer_.reset();
-  
+
   timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
   float progress = GetSwipeAnimationProgress(current);
-  preview_layout_->UpdateAnimationProgress(progress, easeInOutQuart(progress)); // ease in/out.
+  if (preview_layout_)
+    preview_layout_->UpdateAnimationProgress(progress, easeInOutQuart(progress)); // ease in/out.
   last_progress_time_ = current;
 
   QueueDraw();
@@ -691,7 +710,30 @@
 
 nux::Geometry PreviewContainer::GetLayoutGeometry() const
 {
-  return layout_content_->GetAbsoluteGeometry();  
+  return layout_content_->GetAbsoluteGeometry();
+}
+
+void PreviewContainer::UpdateScale(double scale)
+{
+  previews::Style& style = previews::Style::Instance();
+
+  GetLayout()->SetTopAndBottomPadding(style.GetPreviewTopPadding().CP(scale), 0);
+
+  preview_layout_->SetMinMaxSize(style.GetPreviewWidth().CP(scale), style.GetPreviewHeight().CP(scale));
+  preview_layout_->scale = scale;
+
+  layout_content_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+
+  nav_left_->SetMinimumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_left_->SetMaximumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_left_->scale = scale;
+
+  nav_right_->SetMinimumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_right_->SetMaximumWidth(style.GetNavigatorWidth().CP(scale));
+  nav_right_->scale = scale;
+
+  QueueRelayout();
+  QueueDraw();
 }
 
 } // namespace previews
 
=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PreviewContainer.h	2014-08-06 16:03:19 +0000
@@ -25,6 +25,7 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
+#include <Nux/VLayout.h>
 #include <UnityCore/Preview.h>
 #include "Preview.h"
 #include "unity-shared/Introspectable.h"
@@ -74,6 +75,8 @@
   sigc::signal<void> navigate_right;
   sigc::signal<void> request_close;
 
+  nux::Property<double> scale;
+
   bool AcceptKeyNavFocus();
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
@@ -91,7 +94,7 @@
 
   bool InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character);
   void OnKeyDown(unsigned long event_type, unsigned long event_keysym, unsigned long event_state, const TCHAR* character, unsigned short key_repeat_count);
-  
+
 private:
   void SetupViews();
 
@@ -101,6 +104,8 @@
   bool QueueAnimation();
 
 private:
+  void UpdateScale(double scale);
+
   // View related
   nux::HLayout* layout_content_;
   PreviewNavigator* nav_left_;
@@ -112,7 +117,7 @@
   struct timespec  last_progress_time_;
   float navigation_progress_speed_;
   int navigation_count_;
-  
+
   glib::Source::UniquePtr animation_timer_;
   friend class PreviewContent;
 };
 
=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2014-08-06 16:03:19 +0000
@@ -17,6 +17,7 @@
  * <http://www.gnu.org/licenses/>
  *
  * Authored by: Nick Dedekind <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  *
  */
 
@@ -41,21 +42,23 @@
 DECLARE_LOGGER(logger, "unity.dash.preview.infohintwidget");
 namespace
 {
-const int layout_spacing = 12;
+const RawPixel LAYOUT_SPACING = 12_em;
+const RawPixel HINTS_SPACING = 6_em;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(PreviewInfoHintWidget);
 
 PreviewInfoHintWidget::PreviewInfoHintWidget(dash::Preview::Ptr preview_model, int icon_size)
 : View(NUX_TRACKER_LOCATION)
+, scale(1.0)
 , icon_size_(icon_size)
+, layout_(nullptr)
+, info_names_layout_(nullptr)
+, info_values_layout_(nullptr)
 , preview_model_(preview_model)
 {
   SetupViews();
-}
-
-PreviewInfoHintWidget::~PreviewInfoHintWidget()
-{
+  scale.changed.connect(sigc::mem_fun(this, &PreviewInfoHintWidget::UpdateScale));
 }