Merge lp:~hikiko/unity/unity.scale-track into lp:unity

[Eleni Maria Stea]

Scaled tracks, navigator, fixed bugs in all previews

Scaled tracks, navigator, fixed bugs in all previews

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3851. By Eleni Maria Stea on 2014-07-04

fixed problems in SocialPreview

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3852. By Eleni Maria Stea on 2014-07-07

merged music preview changes
(removed unnecessary check in DashView)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3853. By Eleni Maria Stea on 2014-07-07

merged marco's fix for social previews:
lp:~3v1n0/unity/previews-scaling-improved

3854. By Eleni Maria Stea on 2014-07-07

fixed accidentally introduced compile error

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3855. By Eleni Maria Stea on 2014-07-07

merged fix for lp:~3v1n0/unity/previews-scaling-improved

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3856. By Eleni Maria Stea on 2014-07-07

more fixes

3857. By Eleni Maria Stea on 2014-07-07

patched UnitySettings

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

There were some issues here as well, as shown in comments.

BTW I've fixed them all in the shared branch lp:~unity-team/unity/previews-scaling-final which contains a lot of other fixes for the dash scaling.

[lp:~hikiko/unity/unity.scale-track]

3858. By Eleni Maria Stea on 2014-07-08

added fixes (local merge)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~hikiko/unity/unity.scale-track]

3859. By Eleni Maria Stea on 2014-07-08

reverted revno 3857 changes

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-07-08 09:48:09 +0000
+++ dash/DashView.cpp	2014-07-08 09:48:09 +0000
@@ -57,6 +57,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 +114,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 +132,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 +146,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 +160,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()
@@ -238,7 +241,7 @@
       preview_container_->SetParentObject(this);
     }
     preview_container_->Preview(model, previews::Navigation::NONE); // no swipe left or right
-    preview_container_->scale = cv_->DPIScale();
+    preview_container_->scale = scale();
     preview_container_->SetGeometry(scopes_layout_->GetGeometry());
     preview_displaying_ = true;
 
@@ -263,12 +266,9 @@
   }
   else
   {
-    if (preview_container_)
-    {
-      // got a new preview whilst already displaying, we probably clicked a navigation button.
-      preview_container_->Preview(model, preview_navigation_mode_); // TODO
-      preview_container_->scale = cv_->DPIScale();
-    }
+    // 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))
@@ -470,10 +470,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  */
@@ -551,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));
@@ -580,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_)
@@ -591,7 +591,9 @@
   scope_bar_->scale = scale;
 
   if (preview_container_)
-    preview_container_->scale = cv_->DPIScale();
+    preview_container_->scale = scale;
+
+  Relayout();
 }
 
 void DashView::UpdateDashViewSize()
@@ -605,14 +607,14 @@
   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(v_separator_size.CP(scale), 0);
+  layout_->SetTopAndBottomPadding(h_separator_size.CP(scale), 0);
+
+  content_layout_->SetTopAndBottomPadding(view_top_padding.CP(scale), 0);
+
+  search_bar_layout_->SetLeftAndRightPadding(search_bar_left_padding.CP(scale), 0);
+  search_bar_->SetMinimumHeight(search_bar_height.CP(scale));
+  search_bar_->SetMaximumHeight(search_bar_height.CP(scale));
 }
 
 void DashView::SetupUBusConnections()
@@ -641,18 +643,18 @@
   scopes_layout_->SetMaximumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(cv_)));
+                                                top_padding.CP(scale)));
 
   scopes_layout_->SetMinimumHeight (std::max(0, content_geo_.height -
                                                 search_bar_->GetGeometry().height -
                                                 scope_bar_->GetGeometry().height -
-                                                top_padding.CP(cv_)));
+                                                top_padding.CP(scale)));
 
   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.SetDefaultNColumns(floorf((content_geo_.width - (32_em).CP(scale)) / tile_width.CP(scale)));
 
   ubus_manager_.SendMessage(UBUS_DASH_SIZE_CHANGED, g_variant_new("(ii)", content_geo_.width, content_geo_.height));
 
@@ -679,27 +681,27 @@
   RawPixel const category_icon_size = style.GetCategoryIconSize();
   RawPixel const group_top_padding  = style.GetPlacesGroupResultTopPadding();
 
-  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 = (group_top_space.CP(scale) + category_icon_size.CP(scale) +
+                         group_top_padding.CP(scale) + tile_height.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)
+  while ((width += tile_width.CP(scale)) < half)
     ;
 
   RawPixel const v_separator_size   = style.GetVSeparatorSize();
   RawPixel const group_left_padding = style.GetPlacesGroupResultLeftPadding();
 
-  width = std::max(width, tile_width.CP(cv_) * DASH_TILE_HORIZONTAL_COUNT);
-  width += v_separator_size.CP(cv_);
-  width += group_left_padding.CP(cv_) + DASH_RESULT_RIGHT_PAD.CP(cv_);
+  width = std::max(width, tile_width.CP(scale) * DASH_TILE_HORIZONTAL_COUNT);
+  width += v_separator_size.CP(scale);
+  width += group_left_padding.CP(scale) + DASH_RESULT_RIGHT_PAD.CP(scale);
 
   RawPixel const h_separator_size = style.GetHSeparatorSize();
   RawPixel const top_padding      = style.GetDashViewTopPadding();
 
-  height = h_separator_size.CP(cv_);
-  height += top_padding.CP(cv_);
+  height = h_separator_size.CP(scale);
+  height += top_padding.CP(scale);
   height += search_bar_->GetGeometry().height;
   height += category_height * DASH_DEFAULT_CATEGORY_COUNT; // adding three categories
   height += scope_bar_->GetGeometry().height;
@@ -813,7 +815,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);
 
@@ -837,7 +839,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
       (
@@ -855,7 +857,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);
 
@@ -879,7 +881,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
       (
@@ -913,8 +915,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;
@@ -1146,8 +1148,8 @@
     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  += right_title_width.CP(scale);
+    geo.height += bottom_title_width.CP(scale);
   }
 }
 
@@ -1289,7 +1291,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));
 
@@ -1528,8 +1530,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", right_title_width.CP(scale))
+               .add("bottom-border-height", bottom_title_width.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-07-08 09:48:09 +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/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2014-03-20 04:05:39 +0000
+++ dash/PlacesGroup.cpp	2014-07-08 09:48:09 +0000
@@ -133,8 +133,6 @@
   SetAcceptKeyNavFocusOnMouseEnter(false);
   scale.changed.connect(sigc::mem_fun(this, &PlacesGroup::UpdateScale));
 
-  nux::BaseTexture* arrow = _style.GetGroupExpandIcon();
-
   _background = _style.GetCategoryBackground();
   _background_nofilters = _style.GetCategoryBackgroundNoFilters();
 
@@ -189,11 +187,11 @@
   _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);
 
@@ -231,6 +229,7 @@
    _space_layout->SetMaximumSize(top_space, top_space);
 
   _header_layout->SetSpaceBetweenChildren(SPACE_BETWEEN_CHILDREN.CP(scale()));
+  _header_layout->SetLeftAndRightPadding(RawPixel(_style.GetCategoryHeaderLeftPadding()).CP(scale), 0);
 
   _icon->SetMinMaxSize(icon_size.CP(scale()), icon_size.CP(scale()));
 
@@ -244,12 +243,15 @@
   RawPixel const icon_size = _style.GetCategoryIconSize();
 
   _name->SetScale(scale);
+  auto const& name_extents = _name->GetTextExtents();
+  _name->SetMinMaxSize(name_extents.width, name_extents.height);
   _expand_label->SetScale(scale);
 
   _icon->SetSize(icon_size.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 +281,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 +311,7 @@
 void
 PlacesGroup::SetIcon(std::string const& path_to_emblem)
 {
-  _icon->SetByIconName(path_to_emblem, _style.GetCategoryIconSize());
+  _icon->SetByIconName(path_to_emblem, RawPixel(_style.GetCategoryIconSize()).CP(scale));
 }
 
 void
@@ -462,7 +463,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 +596,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/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2014-02-28 23:32:05 +0000
+++ dash/StandaloneDash.cpp	2014-07-08 09:48:09 +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)
@@ -102,9 +105,25 @@
   unity::dash::Style dash_style;
   unity::panel::Style panel_style;
 
-  TestRunner *test_runner = new TestRunner ();
+  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);
   wt = nux::CreateGUIThread(TEXT("Unity Dash"),
-                            WIDTH, HEIGHT,
+                            WIDTH.CP(scale), HEIGHT.CP(scale),
                             0,
                             &TestRunner::InitWindowThread,
                             test_runner);

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/ActionButton.cpp	2014-07-08 09:48:09 +0000
@@ -87,22 +87,19 @@
 
 void ActionButton::InitTheme()
 {
-  if (!cr_active_)
-  {
-    nux::Geometry const& geo = GetGeometry();
+  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)));
-  }
+  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_)
   {
@@ -195,11 +192,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);
 }
 
@@ -316,8 +315,7 @@
 
 void ActionButton::UpdateScale(double scale)
 {
-  SetMinimumHeight(MIN_BUTTON_HEIGHT.CP(scale));
-  SetMinimumWidth(MIN_BUTTON_WIDTH.CP(scale));
+  InitTheme();
 
   if (image_)
   {

=== modified file 'dash/previews/ActionLink.h'
--- dash/previews/ActionLink.h	2014-07-08 09:48:09 +0000
+++ dash/previews/ActionLink.h	2014-07-08 09:48:09 +0000
@@ -47,7 +47,6 @@
   nux::RWProperty<StaticCairoText::AlignState> text_aligment;
   nux::RWProperty<StaticCairoText::UnderlineState> underline_state;
   nux::RWProperty<std::string> font_hint;
-
   nux::Property<double> scale;
 
   void Activate() {}

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/ApplicationPreview.cpp	2014-07-08 09:48:09 +0000
@@ -145,6 +145,7 @@
   /////////////////////
   // Image
   image_ = new CoverArt();
+  image_->scale = scale();
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
   /////////////////////
@@ -153,7 +154,7 @@
     // App Data Panel
     full_data_layout_ = new nux::VLayout();
     full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
-    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN);
+    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
 
       /////////////////////
       // Main App Info
@@ -174,6 +175,7 @@
         if (app_preview_model->rating >= 0) {
           app_rating_ = new PreviewRatingsWidget();
           AddChild(app_rating_.GetPointer());
+          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);
@@ -196,6 +198,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);
         title_subtitle_layout_->AddView(title_.GetPointer(), 1);
@@ -206,6 +209,7 @@
           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);
         }
@@ -219,6 +223,7 @@
           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);
         }
@@ -231,6 +236,7 @@
           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);
         }
@@ -241,6 +247,7 @@
           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);
         }
@@ -262,7 +269,7 @@
       app_info->mouse_click.connect(on_mouse_down);
 
       app_info_layout_ = new nux::VLayout();
-      app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN);
+      app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN.CP(scale));
       app_info->SetLayout(app_info_layout_);
 
       if (!preview_model_->description.Get().empty())
@@ -279,7 +286,7 @@
 
       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());
@@ -289,15 +296,15 @@
       /////////////////////
       // 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_->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);
 
@@ -314,7 +321,9 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  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));
 
@@ -330,16 +339,19 @@
   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().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale)), style.GetActionButtonHeight().CP(scale));
-  }
+    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_)
@@ -359,9 +371,9 @@
 
   if (app_rating_)
   {
-    app_rating_->scale = scale;
     app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
     app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
+    app_rating_->scale = scale;
   }
 
   if (image_data_layout_)
@@ -382,13 +394,17 @@
   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));
-
-  Preview::UpdateScale(scale);
 }
 
 } // namespace previews

=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/GenericPreview.cpp	2014-07-08 09:48:09 +0000
@@ -241,10 +241,11 @@
   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().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale)), style.GetActionButtonHeight().CP(scale));
-  }
+    button->SetMinMaxSize(button_w, button_h);
 
   Preview::PreLayoutManagement();
 }

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/MusicPreview.cpp	2014-07-08 09:48:09 +0000
@@ -162,8 +162,8 @@
 
       /////////////////////
       // 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());
@@ -171,7 +171,7 @@
       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())
       {
@@ -181,7 +181,7 @@
         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);
       }
 
       /////////////////////
@@ -192,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);
       }
@@ -238,7 +239,7 @@
         previews::Style& style = dash::previews::Style::Instance();
         nux::HLayout* actions_layout = new nux::HLayout();
         icon_layout_ = new nux::VLayout();
-        icon_layout_->SetLeftAndRightPadding(ICON_LEFT_RIGHT_PADDING);
+        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,
@@ -264,7 +265,7 @@
       if (hints_layout) hint_actions_layout->AddView(hints_layout, 1);
       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);
@@ -321,9 +322,15 @@
 {
   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);
@@ -342,6 +349,9 @@
     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));
 

=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2014-07-08 09:48:09 +0000
+++ dash/previews/MusicPreview.h	2014-07-08 09:48:09 +0000
@@ -68,6 +68,7 @@
   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	2014-07-08 09:48:09 +0000
+++ dash/previews/PaymentPreview.cpp	2014-07-08 09:48:09 +0000
@@ -197,9 +197,7 @@
 , header_layout_(nullptr)
 , body_layout_(nullptr)
 , footer_layout_(nullptr)
-{
-  UpdateScale(scale);
-}
+{}
 
 std::string PaymentPreview::GetName() const
 {
@@ -371,6 +369,7 @@
 
   full_data_layout_->AddLayout(overlay_layout_.GetPointer());
 
+  UpdateScale(scale);
   SetLayout(full_data_layout_.GetPointer());
 }
 

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/Preview.cpp	2014-07-08 09:48:09 +0000
@@ -101,7 +101,7 @@
 
 Preview::Preview(dash::Preview::Ptr preview_model)
   : View(NUX_TRACKER_LOCATION)
-  , scale(1.0)
+  , scale(1.0f)
   , preview_model_(preview_model)
   , tab_iterator_(new TabIterator())
   , full_data_layout_(nullptr)
@@ -110,7 +110,6 @@
   , subtitle_(nullptr)
   , preview_container_(new PreviewContainer)
 {
-  preview_container_->scale = scale();
   scale.changed.connect(sigc::mem_fun(this, &Preview::UpdateScale));
 }
 
@@ -303,12 +302,10 @@
 
   for (nux::AbstractButton* button : action_buttons_)
   {
-    ActionButton* bn = dynamic_cast<ActionButton*>(button);
-    if (bn)
+    if (ActionButton* bn = dynamic_cast<ActionButton*>(button))
       bn->scale = scale;
 
-    ActionLink* link = dynamic_cast<ActionLink*>(button);
-    if (link)
+    if (ActionLink* link = dynamic_cast<ActionLink*>(button))
       link->scale = scale;
   }
 

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/PreviewContainer.cpp	2014-07-08 09:48:09 +0000
@@ -23,7 +23,6 @@
 #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"
@@ -436,7 +435,7 @@
 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(); });
@@ -477,29 +476,33 @@
 
   nux::VLayout* layout = new nux::VLayout();
   SetLayout(layout);
-  layout->AddLayout(new nux::SpaceLayout(0,0,style.GetPreviewTopPadding(),style.GetPreviewTopPadding()));
+
+  space_layout_ = new nux::SpaceLayout(0,0,style.GetPreviewTopPadding().CP(scale),style.GetPreviewTopPadding().CP(scale));
+  layout->AddLayout(space_layout_);
 
   layout_content_ = new nux::HLayout();
-  layout_content_->SetSpaceBetweenChildren(CHILDREN_SPACE);
+  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);
@@ -511,7 +514,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_++;
 
@@ -553,7 +556,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())
   {
@@ -614,7 +617,7 @@
 bool PreviewContainer::QueueAnimation()
 {
   animation_timer_.reset();
-  
+
   timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
   float progress = GetSwipeAnimationProgress(current);
@@ -711,7 +714,7 @@
 
 nux::Geometry PreviewContainer::GetLayoutGeometry() const
 {
-  return layout_content_->GetAbsoluteGeometry();  
+  return layout_content_->GetAbsoluteGeometry();
 }
 
 void PreviewContainer::UpdateScale(double scale)
@@ -724,6 +727,9 @@
     preview_layout_->SetMinMaxSize(style.GetPreviewWidth().CP(scale), style.GetPreviewHeight().CP(scale));
   }
 
+  if (space_layout_)
+    space_layout_->SetPadding(0,0,style.GetPreviewTopPadding().CP(scale),style.GetPreviewTopPadding().CP(scale));
+
   if (layout_content_)
     layout_content_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
@@ -731,13 +737,18 @@
   {
     nav_left_->SetMinimumWidth(style.GetNavigatorWidth().CP(scale));
     nav_left_->SetMaximumWidth(style.GetNavigatorWidth().CP(scale));
+    nav_left_->scale = scale;
   }
 
   if (nav_right_)
   {
     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	2014-07-08 09:48:09 +0000
+++ dash/previews/PreviewContainer.h	2014-07-08 09:48:09 +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"
@@ -116,7 +117,9 @@
   struct timespec  last_progress_time_;
   float navigation_progress_speed_;
   int navigation_count_;
-  
+
+  nux::SpaceLayout* space_layout_;
+
   glib::Source::UniquePtr animation_timer_;
   friend class PreviewContent;
 };

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2014-07-08 09:48:09 +0000
@@ -198,10 +198,10 @@
   {
     nux::Geometry const& geo = GetGeometry();
     info_names_layout_->SetMaximumWidth(info_names_layout_->GetContentWidth());
-    int max_width = geo.width - info_names_layout_->GetWidth() - LAYOUT_SPACING.CP(scale) -1;
+    int max_width = std::max(0, geo.width - info_names_layout_->GetWidth() - LAYOUT_SPACING.CP(scale) -1);
 
     for (auto value : info_values_layout_->GetChildren())
-      value->SetMaximumWidth(max_width > 0 ? max_width : 0);
+      value->SetMaximumWidth(max_width);
   }
 
   View::PreLayoutManagement();

=== modified file 'dash/previews/PreviewNavigator.cpp'
--- dash/previews/PreviewNavigator.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewNavigator.cpp	2014-07-08 09:48:09 +0000
@@ -40,12 +40,16 @@
 
 PreviewNavigator::PreviewNavigator(Orientation direction, NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , direction_(direction)
   , texture_(nullptr)
   , visual_state_(VisualState::NORMAL)
 {
   SetupViews();
   UpdateTexture();
+
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &PreviewNavigator::UpdateScale));
 }
 
 void PreviewNavigator::SetEnabled(bool enabled)
@@ -97,7 +101,7 @@
 void PreviewNavigator::SetupViews()
 {
   previews::Style& style = dash::previews::Style::Instance();
-  
+
   if (direction_ == Orientation::LEFT || direction_ == Orientation::RIGHT)
   {
     nux::VLayout* vlayout = new nux::VLayout();
@@ -107,9 +111,9 @@
     layout_ = hlayout;
 
     if (direction_ == Orientation::LEFT)
-      texture_ = new IconTexture(Style::Instance().GetNavLeftIcon(), style.GetNavigatorIconSize(), style.GetNavigatorIconSize());
-    else 
-      texture_ = new IconTexture(Style::Instance().GetNavRightIcon(), style.GetNavigatorIconSize(), style.GetNavigatorIconSize());
+      texture_ = new IconTexture(Style::Instance().GetNavLeftIcon(), style.GetNavigatorIconSize().CP(scale), style.GetNavigatorIconSize().CP(scale));
+    else
+      texture_ = new IconTexture(Style::Instance().GetNavRightIcon(), style.GetNavigatorIconSize().CP(scale), style.GetNavigatorIconSize().CP(scale));
     texture_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
 
     vlayout->AddSpace(0,1);
@@ -138,7 +142,7 @@
   if (texture_)
   {
     AddChild(texture_);
-    layout_->AddView(texture_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);    
+    layout_->AddView(texture_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
     texture_->mouse_click.connect([this](int, int, unsigned long, unsigned long) { activated.emit(); });
     texture_->mouse_enter.connect(sigc::mem_fun(this, &PreviewNavigator::TexRecvMouseEnter));
@@ -179,6 +183,19 @@
   }
 }
 
+void PreviewNavigator::UpdateScale(double scale)
+{
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (texture_)
+  {
+    int icon_size = style.GetNavigatorIconSize().CP(scale);
+    texture_->SetMinMaxSize(icon_size, icon_size);
+  }
+
+  QueueRelayout();
+  QueueDraw();
+}
 
 } // namespace previews
 } // namespace dash

=== modified file 'dash/previews/PreviewNavigator.h'
--- dash/previews/PreviewNavigator.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PreviewNavigator.h	2014-07-08 09:48:09 +0000
@@ -43,7 +43,7 @@
 {
   NUX_DECLARE_OBJECT_TYPE(PreviewNavigator, nux::View);
 public:
-  typedef nux::ObjectPtr<PreviewNavigator> Ptr;  
+  typedef nux::ObjectPtr<PreviewNavigator> Ptr;
   PreviewNavigator(Orientation direction, NUX_FILE_LINE_PROTO);
 
   void SetEnabled(bool enabled);
@@ -53,9 +53,11 @@
   void AddProperties(debug::IntrospectionData&);
 
   sigc::signal<void> activated;
-  
+
   virtual bool AcceptKeyNavFocus() { return false; }
 
+  nux::Property<double> scale;
+
 private:
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
@@ -66,6 +68,7 @@
   void UpdateTexture();
 
   void SetupViews();
+  void UpdateScale(double scale);
 
 private:
   const Orientation direction_;
@@ -77,11 +80,12 @@
     NORMAL,
     ACTIVE
   };
-  VisualState visual_state_; 
+  VisualState visual_state_;
+
 };
 
 } // namespace previews
 } // namespace dash
 } // namespace unity
 
-#endif // PREVIEWNAVIGATOR_H
\ No newline at end of file
+#endif // PREVIEWNAVIGATOR_H

=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2014-07-08 09:48:09 +0000
@@ -62,7 +62,7 @@
   ratings_->SetEditable(false);
   ratings_->mouse_click.connect(on_mouse_down);
   layout_->AddView(ratings_);
-  
+
   reviews_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   reviews_->SetFont(style.user_rating_font());
   reviews_->SetScale(scale);
@@ -73,6 +73,7 @@
 
   SetLayout(layout_);
 
+  UpdateScale(scale);
   scale.changed.connect(sigc::mem_fun(this, &PreviewRatingsWidget::UpdateScale));
 }
 
@@ -132,7 +133,7 @@
 
   if (ratings_)
   {
-    ratings_->star_gap_ = RATINGS_SIZE.CP(scale);
+    ratings_->star_size_ = RATINGS_SIZE.CP(scale);
     ratings_->star_gap_ = RATINGS_GAP.CP(scale);
   }
 

=== modified file 'dash/previews/PreviewRatingsWidget.h'
--- dash/previews/PreviewRatingsWidget.h	2014-07-08 09:48:09 +0000
+++ dash/previews/PreviewRatingsWidget.h	2014-07-08 09:48:09 +0000
@@ -59,7 +59,7 @@
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
-  
+
   virtual bool AcceptKeyNavFocus() { return false; }
 
   // From debug::Introspectable

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreview.cpp	2014-07-08 09:48:09 +0000
@@ -73,6 +73,7 @@
 : Preview(preview_model)
 , image_data_layout_(nullptr)
 , main_social_info_(nullptr)
+, comments_layout_(nullptr)
 , social_content_layout_(nullptr)
 , social_data_layout_(nullptr)
 , social_info_layout_(nullptr)
@@ -148,7 +149,9 @@
     content_ = new SocialPreviewContent(social_preview_model->description, NUX_TRACKER_LOCATION);
     content_->request_close().connect([this]() { preview_container_->request_close.emit(); });
     social_content_layout_->AddView(content_.GetPointer(), 1);
-  } else {
+  }
+  else
+  {
     image_ = new CoverArt();
     AddChild(image_.GetPointer());
     UpdateCoverArtImage(image_.GetPointer());
@@ -172,7 +175,7 @@
         // Icon Layout
         icon_layout_ = new nux::VLayout();
         icon_layout_->SetSpaceBetweenChildren(ICON_CHILDREN_SPACE.CP(scale));
-        avatar_ = new IconTexture(social_preview_model->avatar.Get().RawPtr() ? g_icon_to_string(social_preview_model->avatar.Get().RawPtr()) : "", MIN(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale)));
+        avatar_ = new IconTexture(social_preview_model->avatar() ? g_icon_to_string(social_preview_model->avatar()) : "", MIN(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale)));
         AddChild(avatar_.GetPointer());
         avatar_->SetMinMaxSize(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale));
         avatar_->mouse_click.connect(on_mouse_down);
@@ -231,24 +234,25 @@
       // Comments/Replies
       if (!social_preview_model->GetComments().empty())
       {
-        nux::HLayout* comments_layout = new nux::HLayout();
-        comments_layout->SetSpaceBetweenChildren(12);
+        comments_layout_ = new nux::HLayout();
+        comments_layout_->SetSpaceBetweenChildren(SOCIAL_INFO_CHILDREN_SPACE.CP(scale));
         std::string tmp_comments_hint = _("Comments");
         tmp_comments_hint += ":";
 
         comments_hint_ = new StaticCairoText(tmp_comments_hint, true, NUX_TRACKER_LOCATION);
         AddChild(comments_hint_.GetPointer());
         comments_hint_->SetLines(-1);
+        comments_hint_->SetScale(scale);
         comments_hint_->SetFont(style.info_hint_bold_font().c_str());
         comments_hint_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
         comments_hint_->mouse_click.connect(on_mouse_down);
-        comments_layout->AddView(comments_hint_.GetPointer(), 0, nux::MINOR_POSITION_START);
+        comments_layout_->AddView(comments_hint_.GetPointer(), 0, nux::MINOR_POSITION_START);
 
         comments_ = new SocialPreviewComments(preview_model_, NUX_TRACKER_LOCATION);
         AddChild(comments_.GetPointer());
         comments_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        comments_layout->AddView(comments_.GetPointer());
-        social_info_layout_->AddView(comments_layout, 0);
+        comments_layout_->AddView(comments_.GetPointer());
+        social_info_layout_->AddView(comments_layout_, 0);
       }
 
       /////////////////////
@@ -276,28 +280,33 @@
 void SocialPreview::PreLayoutManagement()
 {
   nux::Geometry geo = GetGeometry();
-
   previews::Style& style = dash::previews::Style::Instance();
 
   nux::Geometry geo_content(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_content.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_content.width = std::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_content.width < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_content.width = std::max(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
+
   if (content_) { content_->SetMinMaxSize(geo_content.width, geo_content.height); }
   if (image_) { image_->SetMinMaxSize(geo_content.width, geo_content.height); }
 
-  int details_width = std::max(0, geo.width - geo_content.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
-  int top_social_info_max_width = std::max(0, details_width - style.GetAppIconAreaWidth() - style.GetSpaceBetweenIconAndDetails());
+  int details_width = std::max(0, content_width - geo_content.width);
+  int top_social_info_max_width = std::max(0, details_width - style.GetAppIconAreaWidth().CP(scale) - style.GetSpaceBetweenIconAndDetails().CP(scale));
 
   if (title_) { title_->SetMaximumWidth(top_social_info_max_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(top_social_info_max_width); }
   if (comments_) { comments_->SetMaximumWidth(top_social_info_max_width); }
-  if (comments_hint_) { comments_hint_->SetMinimumWidth(style.GetInfoHintNameMinimumWidth()); }
+  if (comments_hint_) { comments_hint_->SetMinimumWidth(style.GetInfoHintNameMinimumWidth().CP(scale)); }
+
+  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(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
-  }
+    button->SetMinMaxSize(button_w, button_h);
 
   Preview::PreLayoutManagement();
 }
@@ -344,6 +353,12 @@
 
   if (comments_)
     comments_->scale = scale;
+
+  if (comments_layout_)
+    comments_layout_->SetSpaceBetweenChildren(SOCIAL_INFO_CHILDREN_SPACE.CP(scale));
+
+  if (comments_hint_)
+    comments_hint_->SetScale(scale);
 }
 
 } // namespace previews

=== modified file 'dash/previews/SocialPreview.h'
--- dash/previews/SocialPreview.h	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreview.h	2014-07-08 09:48:09 +0000
@@ -64,6 +64,7 @@
 
   nux::HLayout* image_data_layout_;
   nux::HLayout* main_social_info_;
+  nux::HLayout* comments_layout_;
   nux::VLayout* social_content_layout_;
   nux::VLayout* social_data_layout_;
   nux::VLayout* social_info_layout_;

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreviewComments.cpp	2014-07-08 09:48:09 +0000
@@ -50,19 +50,9 @@
 : View(NUX_FILE_LINE_PARAM)
 , scale(1.0)
 , preview_model_(preview_model)
-, layout_(nullptr)
-, name_layout_(nullptr)
-, comment_name_(nullptr)
-, comment_time_(nullptr)
-, comment_value_(nullptr)
 {
   SetupViews();
-  UpdateScale(scale);
-  scale.changed.connect(sigc::mem_fun(this, &SocialPreviewComments::UpdateScale));
-}
-
-SocialPreviewComments::~SocialPreviewComments()
-{
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &SocialPreviewComments::SetupViews)));
 }
 
 void SocialPreviewComments::Draw(nux::GraphicsEngine& gfx_engine, bool force_draw)
@@ -94,21 +84,17 @@
   nux::Geometry const& geo = GetGeometry();
 
   int comment_width = 0;
+  int minimum_detail_width = style.GetDetailsPanelMinimumWidth().CP(scale);
+
   for (Comment const& comment : comments_)
   {
-    int width = style.GetDetailsPanelMinimumWidth().CP(scale);
+    int width = minimum_detail_width;
+
     if (comment.first)
-    {
-      width = comment.first->GetTextExtents().width;
-
-      if (width < style.GetDetailsPanelMinimumWidth().CP(scale))
-        width = style.GetDetailsPanelMinimumWidth().CP(scale);
-    }
+      width = std::max(minimum_detail_width, comment.first->GetTextExtents().width);
 
     if (comment_width < width)
-    {
       comment_width = width;
-    }
   }
 
   int comment_value_width = MAX(0, geo.width - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale));
@@ -138,58 +124,59 @@
 
   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); };
 
-  layout_ = new nux::VLayout();
-  layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  nux::VLayout* layout = new nux::VLayout();
+  layout->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   for (dash::SocialPreview::CommentPtr comment : social_preview_model->GetComments())
   {
-    name_layout_ = new nux::HLayout();
-    name_layout_->SetSpaceBetweenChildren(LAYOUT_SPACING.CP(scale));
+    nux::HLayout* name_layout = new nux::HLayout();
+    name_layout->SetSpaceBetweenChildren(LAYOUT_SPACING.CP(scale));
 
+    StaticCairoTextPtr comment_name;
     if (!comment->display_name.empty())
     {
-      comment_name_ = new StaticCairoText(comment->display_name, true, NUX_TRACKER_LOCATION);
-      comment_name_->SetFont(style.info_hint_bold_font());
-      comment_name_->SetLines(-1);
-      comment_name_->SetScale(scale);
-      comment_name_->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
-      comment_name_->mouse_click.connect(on_mouse_down);
-      name_layout_->AddView(comment_name_.GetPointer(), 0, nux::MINOR_POSITION_START);
+      comment_name = new StaticCairoText(comment->display_name, true, NUX_TRACKER_LOCATION);
+      comment_name->SetFont(style.info_hint_bold_font());
+      comment_name->SetLines(-1);
+      comment_name->SetScale(scale);
+      comment_name->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+      comment_name->mouse_click.connect(on_mouse_down);
+      name_layout->AddView(comment_name.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
 
+    StaticCairoTextPtr comment_time;
     if (!comment->time.empty())
     {
-      comment_time_ = new StaticCairoText(comment->time, true, NUX_TRACKER_LOCATION);
-      comment_time_->SetFont(style.info_hint_font());
-      comment_time_->SetLines(-1);
-      comment_time_->SetScale(scale);
-      comment_time_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
-      comment_time_->mouse_click.connect(on_mouse_down);
-      name_layout_->AddView(comment_time_.GetPointer(), 0, nux::MINOR_POSITION_START);
+      comment_time = new StaticCairoText(comment->time, true, NUX_TRACKER_LOCATION);
+      comment_time->SetFont(style.info_hint_font());
+      comment_time->SetLines(-1);
+      comment_time->SetScale(scale);
+      comment_time->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+      comment_time->mouse_click.connect(on_mouse_down);
+      name_layout->AddView(comment_time.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
 
-
     nux::HLayout* comment_layout = new nux::HLayout();
-    comment_layout->SetSpaceBetweenChildren(LAYOUT_SPACING);
-
-    comment_value_ = new StaticCairoText(comment->content, false, NUX_TRACKER_LOCATION);
-
-    comment_value_->SetFont(style.info_hint_font());
-    comment_value_->SetLines(-7);
-    comment_value_->SetScale(scale);
-    comment_value_->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
-    comment_value_->mouse_click.connect(on_mouse_down);
-    comment_layout->AddView(comment_value_.GetPointer(), 1, nux::MINOR_POSITION_START);
-
-    Comment comment_views(comment_name_, comment_value_);
+    comment_layout->SetSpaceBetweenChildren(LAYOUT_SPACING.CP(scale));
+
+    StaticCairoTextPtr comment_value(new StaticCairoText(comment->content, false, NUX_TRACKER_LOCATION));
+
+    comment_value->SetFont(style.info_hint_font());
+    comment_value->SetLines(-7);
+    comment_value->SetScale(scale);
+    comment_value->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+    comment_value->mouse_click.connect(on_mouse_down);
+    comment_layout->AddView(comment_value.GetPointer(), 1, nux::MINOR_POSITION_START);
+
+    Comment comment_views(comment_name, comment_value);
     comments_.push_back(comment_views);
 
-    layout_->AddLayout(name_layout_, 0);
-    layout_->AddLayout(comment_layout, 1);
+    layout->AddLayout(name_layout, 0);
+    layout->AddLayout(comment_layout, 1);
   }
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(layout_);
+  SetLayout(layout);
 }
 
 std::string SocialPreviewComments::GetName() const
@@ -202,24 +189,6 @@
   introspection.add(GetAbsoluteGeometry());
 }
 
-void SocialPreviewComments::UpdateScale(double scale)
-{
-  if (comment_name_)
-    comment_name_->SetScale(scale);
-
-  if (comment_time_)
-    comment_time_->SetScale(scale);
-
-  if (comment_value_)
-    comment_value_->SetScale(scale);
-
-  if (layout_)
-    layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
-
-  if (name_layout_)
-    name_layout_->SetSpaceBetweenChildren(LAYOUT_SPACING.CP(scale));
-}
-
 }
 }
 }

=== modified file 'dash/previews/SocialPreviewComments.h'
--- dash/previews/SocialPreviewComments.h	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreviewComments.h	2014-07-08 09:48:09 +0000
@@ -46,14 +46,11 @@
 
   SocialPreviewComments(dash::Preview::Ptr preview_model, NUX_FILE_LINE_PROTO);
 
-  virtual ~SocialPreviewComments();
+  nux::Property<double> scale;
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
-  nux::Property<double> scale;
-
 protected:
-
   typedef nux::ObjectPtr<StaticCairoText> StaticCairoTextPtr;
   typedef std::pair<StaticCairoTextPtr, StaticCairoTextPtr> Comment;
   std::list<Comment> comments_;
@@ -72,19 +69,7 @@
   virtual void AddProperties(debug::IntrospectionData&);
 
 private:
-  void UpdateScale(double scale);
-
-  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
-
   PreviewContainer preview_container_;
-
-  nux::VLayout* layout_;
-  nux::HLayout* name_layout_;
-
-  StaticCairoTextPtr comment_name_;
-  StaticCairoTextPtr comment_time_;
-  StaticCairoTextPtr comment_value_;
-
 };
 
 }

=== modified file 'dash/previews/SocialPreviewContent.cpp'
--- dash/previews/SocialPreviewContent.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreviewContent.cpp	2014-07-08 09:48:09 +0000
@@ -41,14 +41,14 @@
 const RawPixel BUBBLE_WIDTH = 300_em;
 const RawPixel BUBBLE_HEIGHT = 250_em;
 const RawPixel TAIL_HEIGHT = 50_em;
-const RawPixel TAIL_POS_FROM_RIGHT = 60_em;
+const int TAIL_POS_FROM_RIGHT = 60;
 const RawPixel TEXT_LINE_SPACING = 5_em;
 }
 
 inline nux::Geometry GetBubbleGeometry(nux::Geometry const& geo, double scale)
 {
-  int width = MIN(BUBBLE_WIDTH.CP(scale), geo.width);
-  int height = MIN(BUBBLE_HEIGHT.CP(scale) + TAIL_HEIGHT.CP(scale), geo.height);
+  int width = std::min(BUBBLE_WIDTH.CP(scale), geo.width);
+  int height = std::min(BUBBLE_HEIGHT.CP(scale) + TAIL_HEIGHT.CP(scale), geo.height);
 
   return nux::Geometry(geo.x + (geo.width - width)/2, geo.y + (geo.height - height)/2, width, height);
 }
@@ -66,10 +66,6 @@
   scale.changed.connect(sigc::mem_fun(this, &SocialPreviewContent::UpdateScale));
 }
 
-SocialPreviewContent::~SocialPreviewContent()
-{
-}
-
 void SocialPreviewContent::SetText(std::string const& text)
 {
   std::stringstream ss;
@@ -151,7 +147,8 @@
 
   SetLayout(layout);
 
-  cr_bubble_.reset(new nux::CairoWrapper(GetGeometry(), sigc::bind(sigc::mem_fun(this, &SocialPreviewContent::RedrawBubble), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  nux::Geometry bubble_geo = GetGeometry();
+  cr_bubble_.reset(new nux::CairoWrapper(bubble_geo, sigc::bind(sigc::mem_fun(this, &SocialPreviewContent::RedrawBubble), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
 }
 
 void SocialPreviewContent::UpdateBaloonTexture()
@@ -170,7 +167,7 @@
 
   // center text
   text_->SetBaseX(geo_cr.x + geo_cr.width/2 - geo_text.width/2);
-  text_->SetBaseY(geo_cr.y + geo_cr.height/2 - geo_text.height/2 - TAIL_HEIGHT/2);
+  text_->SetBaseY(geo_cr.y + geo_cr.height/2 - geo_text.height/2 - TAIL_HEIGHT.CP(scale)/2);
 
   if (geo_cr.width > 0 && geo_cr.height > 0)
   {
@@ -180,8 +177,9 @@
 
 void SocialPreviewContent::RedrawBubble(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)
 {
-  double width = std::max(0, cairo_image_surface_get_width(cairo_get_target(cr)));
-  double height = std::max(0, cairo_image_surface_get_height(cairo_get_target(cr)) - TAIL_HEIGHT);
+  auto* surface = cairo_get_target(cr);
+  double width = std::max(0.0, cairo_image_surface_get_width(surface) / scale());
+  double height = std::max(0.0, cairo_image_surface_get_height(surface) / scale() - TAIL_HEIGHT);
 
   double tailPosition = width - TAIL_POS_FROM_RIGHT - TAIL_HEIGHT;
   if (width > 0 && height > 0)
@@ -227,11 +225,14 @@
                    double   tailPosition,
                    double   tailWidth)
 {
+  auto* surface = cairo_get_target(cr);
+
   // sanity check
   if (cairo_status(cr) != CAIRO_STATUS_SUCCESS &&
-      cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
+      cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_IMAGE)
     return;
 
+  cairo_surface_set_device_scale(surface, scale(), scale());
   cairo_set_line_width(cr, line_width);
 
   bool odd = line_width != double((int)line_width);
@@ -323,6 +324,8 @@
 {
   if (text_)
     text_->SetScale(scale);
+
+  UpdateBaloonTexture();
 }
 
 }

=== modified file 'dash/previews/SocialPreviewContent.h'
--- dash/previews/SocialPreviewContent.h	2014-07-08 09:48:09 +0000
+++ dash/previews/SocialPreviewContent.h	2014-07-08 09:48:09 +0000
@@ -46,14 +46,13 @@
   NUX_DECLARE_OBJECT_TYPE(SocialPreviewContent, nux::View);
 
   SocialPreviewContent(std::string const& text, NUX_FILE_LINE_PROTO);
-  virtual ~SocialPreviewContent();
+
+  nux::Property<double> scale;
 
   void SetText(std::string const& text);
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
-  nux::Property<double> scale;
-
 protected:
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);

=== modified file 'dash/previews/StandaloneMusicPaymentPreview.cpp'
--- dash/previews/StandaloneMusicPaymentPreview.cpp	2014-07-08 09:48:09 +0000
+++ dash/previews/StandaloneMusicPaymentPreview.cpp	2013-11-18 18:13:59 +0000
@@ -147,7 +147,6 @@
 void TestRunner::Init ()
 {
   container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
-//  container_->scale = 1.62;
   container_->request_close.connect([this]() { exit(0); });
   container_->DisableNavButton(previews::Navigation::BOTH);
 
@@ -190,8 +189,7 @@
               glib::StealRef());
 
   dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
-  if (container_)
-    container_->Preview(preview_model, previews::Navigation::LEFT);
+  container_->Preview(preview_model, previews::Navigation::LEFT);
 }
 
 void TestRunner::InitWindowThread(nux::NThread* thread, void* InitData)

=== modified file 'dash/previews/StandaloneSocialPreview.cpp'
--- dash/previews/StandaloneSocialPreview.cpp	2013-11-18 18:13:59 +0000
+++ dash/previews/StandaloneSocialPreview.cpp	2014-07-08 09:48:09 +0000
@@ -158,6 +158,7 @@
 
   glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/sunflower.jpg", NULL));
   glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/6/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/icons/unity-icon-theme/places/svg/service-twitter.svg", NULL));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
 
@@ -169,7 +170,7 @@
   unity_protocol_preview_set_subtitle(proto_obj, subtitle);
   unity_protocol_preview_set_description(proto_obj, description);
   unity_protocol_preview_add_action(proto_obj, "view", "View", iconHint2, 0);
-  unity_protocol_preview_add_action(proto_obj, "retweet", "Retweet", nullptr, 0);
+  unity_protocol_preview_add_action(proto_obj, "retweet", "Retweet", iconHint3, 0);
   unity_protocol_social_preview_add_comment(UNITY_PROTOCOL_SOCIAL_PREVIEW(proto_obj.RawPtr()), "comment",  "Stacy", "Lorem ipsum dolor sit amet, id eruditi referrentur cum, et est enim persequeris. Munere docendi intellegebat pro id, nam no delenit facilisis similique, ut usu eros aliquando. Electram postulant accusamus ut ius, cum ad impedit facilis mediocrem. At cum tamquam.", "13 minutes ago");
   unity_protocol_social_preview_add_comment(UNITY_PROTOCOL_SOCIAL_PREVIEW(proto_obj.RawPtr()), "comment",  "Jeremy", "This is a comment", "4 hours ago");
   unity_protocol_social_preview_add_comment(UNITY_PROTOCOL_SOCIAL_PREVIEW(proto_obj.RawPtr()), "comment",  "Stacy", "This is a comment", "4 hours ago");
@@ -180,7 +181,6 @@
 
   dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
   container_->Preview(preview_model, previews::Navigation::RIGHT);
-
 }
 
 void TestRunner::NavRight()

=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/Track.cpp	2014-07-08 09:48:09 +0000
@@ -37,6 +37,13 @@
 namespace previews
 {
 
+DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
+namespace
+{
+const RawPixel LAYOUT_SPACING = 6_em;
+const RawPixel TITLE_PADDING = 3_em;
+}
+
 class TmpView : public nux::View
 {
 public:
@@ -54,12 +61,6 @@
 
 };
 
-DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
-namespace
-{
-const int layout_spacing = 6;
-}
-
 NUX_IMPLEMENT_OBJECT_TYPE(Track);
 
 class TrackProgressLayer : public nux::AbstractPaintLayer
@@ -126,12 +127,15 @@
 
 Track::Track(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , play_state_(PlayerState::STOPPED)
   , progress_(0.0)
   , mouse_over_(false)
 {
   SetupBackground();
   SetupViews();
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &Track::UpdateScale));
 }
 
 std::string Track::GetName() const
@@ -202,23 +206,25 @@
   layout->SetLeftAndRightPadding(0,0);
 
   nux::BaseTexture* tex_play = style.GetPlayIcon();
-  IconTexture* status_play = new IconTexture(tex_play, style.GetStatusIconSize(), style.GetStatusIconSize());
-  status_play->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
+  status_play_ = new IconTexture(tex_play, style.GetStatusIconSize().CP(scale), style.GetStatusIconSize().CP(scale));
+  status_play_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
 
   nux::BaseTexture* tex_pause = style.GetPauseIcon();
-  IconTexture* status_pause = new IconTexture(tex_pause, style.GetStatusIconSize(), style.GetStatusIconSize());
-  status_pause->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
+  status_pause_ = new IconTexture(tex_pause, style.GetStatusIconSize().CP(scale), style.GetStatusIconSize().CP(scale));
+  status_pause_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
 
   track_number_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   track_number_->SetTextAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   track_number_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   track_number_->SetLines(-1);
+  track_number_->SetScale(scale);
   track_number_->SetFont(style.track_font());
 
   title_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   title_->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
   title_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   title_->SetLines(-1);
+  title_->SetScale(scale);
   title_->SetFont(style.track_font());
 
   duration_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
@@ -226,6 +232,7 @@
   duration_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
   duration_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   duration_->SetLines(-1);
+  duration_->SetScale(scale);
   duration_->SetFont(style.track_font());
   duration_->SetMaximumWidth(style.GetMusicDurationWidth());
   duration_->SetMaximumWidth(style.GetMusicDurationWidth());
@@ -234,13 +241,13 @@
   status_play_layout_ = new TmpView();
   status_play_layout_->SetLayout(new nux::HLayout());
   status_play_layout_->GetLayout()->AddSpace(0, 1);
-  status_play_layout_->GetLayout()->AddView(status_play, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  status_play_layout_->GetLayout()->AddView(status_play_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   status_play_layout_->GetLayout()->AddSpace(0, 1);
 
   status_pause_layout_ = new TmpView();
   status_pause_layout_->SetLayout(new nux::HLayout());
   status_pause_layout_->GetLayout()->AddSpace(0, 1);
-  status_pause_layout_->GetLayout()->AddView(status_pause, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  status_pause_layout_->GetLayout()->AddView(status_pause_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   status_pause_layout_->GetLayout()->AddSpace(0, 1);
 
   track_number_layout_ = new TmpView();
@@ -256,7 +263,7 @@
   track_status_layout_->SetActiveLayer(track_number_layout_);
 
   title_layout_ = new nux::HLayout();
-  title_layout_->SetLeftAndRightPadding(3);
+  title_layout_->SetLeftAndRightPadding(TITLE_PADDING.CP(scale));
   title_layout_->AddView(title_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   title_layout_->AddSpace(0, 0);
 
@@ -316,7 +323,7 @@
     progress_layer_->SetGeometry(geo_progress);
     nux::GetPainter().RenderSinglePaintLayer(gfx_engine, progress_layer_->GetGeometry(), progress_layer_.get());
   }
-  
+
   gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
 }
 
@@ -435,12 +442,44 @@
   track_status_layout_->SetMinimumWidth(geo.height);
   track_status_layout_->SetMaximumWidth(geo.height);
 
-  const int max_width = std::max(GetGeometry().width - geo.height - style.GetMusicDurationWidth() - layout_spacing*2, 0);
+  const int max_width = std::max(GetGeometry().width - geo.height - style.GetMusicDurationWidth().CP(scale) - LAYOUT_SPACING.CP(scale)*2, 0);
   title_->SetMaximumWidth(max_width);
 
   View::PreLayoutManagement();
 }
 
+void Track::UpdateScale(double scale)
+{
+  if (track_number_)
+    track_number_->SetScale(scale);
+
+  if (title_)
+    title_->SetScale(scale);
+
+  if (duration_)
+    duration_->SetScale(scale);
+
+  if (title_layout_)
+    title_layout_->SetLeftAndRightPadding(TITLE_PADDING.CP(scale));
+
+  previews::Style& style = previews::Style::Instance();
+
+  if (status_play_)
+  {
+    status_play_->SetSize(style.GetStatusIconSize().CP(scale));
+    status_play_->ReLoadIcon();
+  }
+
+  if (status_pause_)
+  {
+    status_pause_->SetSize(style.GetStatusIconSize().CP(scale));
+    status_pause_->ReLoadIcon();
+  }
+
+  QueueRelayout();
+  QueueDraw();
+}
+
 } // namespace previews
 } // namespace dash
 } // namesapce unity

=== modified file 'dash/previews/Track.h'
--- dash/previews/Track.h	2013-09-19 16:44:03 +0000
+++ dash/previews/Track.h	2014-07-08 09:48:09 +0000
@@ -55,18 +55,20 @@
 
   void Update(dash::Track const& track_row);
 
+  nux::Property<double> scale;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
   virtual void PreLayoutManagement();
   virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
- 
+
   // From debug::Introspectable
   std::string GetName() const;
   void AddProperties(debug::IntrospectionData&);
-  
+
   virtual bool AcceptKeyNavFocus() { return false; }
-  
+
   void SetupBackground();
   void SetupViews();
 
@@ -97,9 +99,14 @@
   nux::View* status_pause_layout_;
   nux::View* track_number_layout_;
   nux::LayeredLayout* track_status_layout_;
+  IconTexture* status_play_;
+  IconTexture* status_pause_;
 
   bool mouse_over_;
   connection::Wrapper player_connection_;
+
+private:
+  void UpdateScale(double scale);
 };
 
 }

=== modified file 'dash/previews/Tracks.cpp'
--- dash/previews/Tracks.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/Tracks.cpp	2014-07-08 09:48:09 +0000
@@ -34,12 +34,19 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 1_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.music.tracks");
 
 NUX_IMPLEMENT_OBJECT_TYPE(Tracks);
 
 Tracks::Tracks(dash::Tracks::Ptr tracks, NUX_FILE_LINE_DECL)
   : ScrollView(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , tracks_(tracks)
 {
   SetupViews();
@@ -54,6 +61,8 @@
     for (std::size_t i = 0; i < tracks_->count.Get(); ++i)
       OnTrackAdded(tracks_->RowAtIndex(i));
   }
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &Tracks::UpdateScale));
 }
 
 std::string Tracks::GetName() const
@@ -72,8 +81,8 @@
   SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
   EnableHorizontalScrollBar(false);
   layout_ = new nux::VLayout();
-  layout_->SetPadding(0, previews::Style::Instance().GetDetailsRightMargin(), 0, 0);
-  layout_->SetSpaceBetweenChildren(1);
+  layout_->SetPadding(0, previews::Style::Instance().GetDetailsRightMargin().CP(scale), 0, 0);
+  layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
   SetLayout(layout_);
 }
 
@@ -84,6 +93,7 @@
     return;
 
   pos->second->Update(track_row);
+  pos->second->scale = scale();
 }
 
 void Tracks::OnTrackAdded(dash::Track const& track_row)
@@ -100,8 +110,9 @@
   AddChild(track_view.GetPointer());
 
   track_view->Update(track_row);
-  track_view->SetMinimumHeight(style.GetTrackHeight());
-  track_view->SetMaximumHeight(style.GetTrackHeight());
+  track_view->SetMinimumHeight(style.GetTrackHeight().CP(scale));
+  track_view->SetMaximumHeight(style.GetTrackHeight().CP(scale));
+  track_view->scale = scale();
   layout_->AddView(track_view.GetPointer(), 0);
 
   m_tracks[track_uri] = track_view;
@@ -111,7 +122,7 @@
 void Tracks::OnTrackRemoved(dash::Track const& track_row)
 {
   LOG_TRACE(logger) << "OnTrackRemoved for " << track_row.title.Get();
-  
+
   auto pos = m_tracks.find(track_row.uri.Get());
   if (pos == m_tracks.end())
     return;
@@ -121,6 +132,26 @@
   ComputeContentSize();
 }
 
+void Tracks::UpdateScale(double scale)
+{
+  previews::Style& style = dash::previews::Style::Instance();
+
+  for (std::map<std::string, previews::Track::Ptr>::iterator it = m_tracks.begin(); it != m_tracks.end(); ++it)
+  {
+    it->second->scale = scale;
+    it->second->SetMinimumHeight(style.GetTrackHeight().CP(scale));
+    it->second->SetMaximumHeight(style.GetTrackHeight().CP(scale));
+    it->second->SetMinimumWidth(style.GetTrackHeight().CP(scale));
+    it->second->SetMaximumWidth(style.GetTrackHeight().CP(scale));
+  }
+
+  if (layout_)
+  {
+    layout_->SetPadding(0, previews::Style::Instance().GetDetailsRightMargin().CP(scale), 0, 0);
+    layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+  }
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/Tracks.h'
--- dash/previews/Tracks.h	2013-09-19 16:44:03 +0000
+++ dash/previews/Tracks.h	2014-07-08 09:48:09 +0000
@@ -52,6 +52,8 @@
 
   Tracks(dash::Tracks::Ptr tracks, NUX_FILE_LINE_PROTO);
 
+  nux::Property<double> scale;
+
 protected:
   virtual bool AcceptKeyNavFocus() { return false; }
 
@@ -71,6 +73,9 @@
   nux::VLayout* layout_;
   std::map<std::string, previews::Track::Ptr> m_tracks;
   connection::Manager sig_conn_;
+
+private:
+  void UpdateScale(double scale);
 };
 
 }

=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2014-07-08 09:48:09 +0000
+++ unity-shared/CoverArt.cpp	2014-07-08 09:48:09 +0000
@@ -453,6 +453,7 @@
   overlay_text_->SetTextAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   overlay_text_->SetFont("Ubuntu 14");
   overlay_text_->SetLines(-3);
+  overlay_text_->SetScale(scale);
   overlay_text_->SetText(_("No Image Available"));
 
   dash::Style& style = dash::Style::Instance();

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2014-03-21 04:06:28 +0000
+++ unity-shared/DashStyle.cpp	2014-07-08 09:48:09 +0000
@@ -92,6 +92,16 @@
   }
 }
 
+template <typename T>
+inline void get_actual_cairo_size(cairo_t* cr, T* width, T* height)
+{
+  double w_scale, h_scale;
+  auto* surface = cairo_get_target(cr);
+  cairo_surface_get_device_scale(surface, &w_scale, &h_scale);
+  *width = cairo_image_surface_get_width(surface) / w_scale;
+  *height = cairo_image_surface_get_height(surface) / h_scale;
+}
+
 class LazyLoadTexture
 {
 public:
@@ -682,9 +692,8 @@
   cairo_surface_flush(surface);
 
   pixels = cairo_image_surface_get_data(surface);
-  width  = cairo_image_surface_get_width(surface);
-  height = cairo_image_surface_get_height(surface);
   format = cairo_image_surface_get_format(surface);
+  get_actual_cairo_size(cr, &width, &height);
 
   switch (format)
   {
@@ -782,8 +791,8 @@
 {
   double x  = 0.0;
   double y  = 0.0;
-  double w  = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h  = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
   /*double xt = 0.0;
     double yt = 0.0;*/
 
@@ -830,8 +839,11 @@
 {
   double x  = 2.0;
   double y  = 2.0;
-  double w  = cairo_image_surface_get_width(cairo_get_target(cr)) - 4.0;
-  double h  = cairo_image_surface_get_height(cairo_get_target(cr)) - 4.0;
+  
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
+  w -= 4.0;
+  h -= 4.0;
 
   // - these absolute values are the "cost" of getting only a SVG from design
   // and not a generic formular how to approximate the curve-shape, thus
@@ -1212,8 +1224,10 @@
 {
   double   x  = 0.0;
   double   y  = 2.0;
-  double   w  = cairo_image_surface_get_width(cairo_get_target(cr));
-  double   h  = cairo_image_surface_get_height(cairo_get_target(cr)) - 4.0;
+
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
+  h -= 4.0;
 
   // - these absolute values are the "cost" of getting only a SVG from design
   // and not a generic formular how to approximate the curve-shape, thus
@@ -1446,9 +1460,7 @@
   gchar*                fontName    = NULL;
   //double                horizMargin = 10.0;
 
-  w = cairo_image_surface_get_width(cairo_get_target(cr));
-  h = cairo_image_surface_get_height(cairo_get_target(cr));
-
+  get_actual_cairo_size(cr, &w, &h);
   w -= 2 * horizMargin;
 
   if (!screen)
@@ -1577,6 +1589,8 @@
   const unsigned char* data       = NULL;
   int                  width      = 0;
   int                  height     = 0;
+  double               w_scale    = 0;
+  double               h_scale    = 0;
   int                  stride     = 0;
   unsigned char*       buffer     = NULL;
   cairo_surface_t*     surface    = NULL;
@@ -1586,9 +1600,9 @@
   // aquire info about image-surface
   target = cairo_get_target(cr);
   data   = cairo_image_surface_get_data(target);
-  width  = cairo_image_surface_get_width(target);
-  height = cairo_image_surface_get_height(target);
   stride = cairo_image_surface_get_stride(target);
+  get_actual_cairo_size(cr, &width, &height);
+  cairo_surface_get_device_scale(target, &w_scale, &h_scale);
   cairo_format_t format = cairo_image_surface_get_format(target);
 
   // get buffer
@@ -1621,6 +1635,7 @@
   }
 
   // blur and blend overlay onto initial image-surface
+  cairo_surface_set_device_scale(surface, w_scale, h_scale);
   Blur(blurred_cr, blurSize);
   cairo_set_source_surface(cr, surface, 0.0, 0.0);
   old = SetBlendMode(cr, mode);
@@ -1649,8 +1664,8 @@
    garnish = GetButtonGarnishSize();
 
   //ButtonOutlinePath(cr, true);
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
 
   cairo_set_line_width(cr, pimpl->button_label_border_size_[state]);
 
@@ -1743,8 +1758,8 @@
   if (zeromargin == false)
     garnish = GetButtonGarnishSize();
 
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
 
   double x = garnish;
   double y = garnish;
@@ -1854,8 +1869,8 @@
   if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
     return false;
 
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
 
   nux::Color color(nux::color::White);
   color.alpha = alpha;
@@ -1891,10 +1906,11 @@
     return false;
 
   //ButtonOutlinePathSegment(cr, segment);
-  double   x  = 0.0;
-  double   y  = 2.0;
-  double   w  = cairo_image_surface_get_width(cairo_get_target(cr));
-  double   h  = cairo_image_surface_get_height(cairo_get_target(cr)) - 4.0;
+  double x  = 0.0;
+  double y  = 2.0;
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
+  h -= 4.0;
 
 	if (segment == Segment::LEFT)
 	{
@@ -1969,8 +1985,9 @@
 
   double   x  = 0.0;
   double   y  = 2.0;
-  double   w  = cairo_image_surface_get_width(cairo_get_target(cr));
-  double   h  = cairo_image_surface_get_height(cairo_get_target(cr)) - 4.0;
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
+  h -= 4.0;
 
   if (segment == Segment::LEFT)
   {
@@ -2062,8 +2079,8 @@
   if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
     return false;
 
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
   double x = w / 2.0;
   double y = 2.0;
 
@@ -2090,8 +2107,8 @@
   if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
     return false;
 
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
+  double w, h;
+  get_actual_cairo_size(cr, &w, &h);
   double x = 2.0;
   double y = h / 2.0;
 

=== modified file 'unity-shared/IconTexture.cpp'
--- unity-shared/IconTexture.cpp	2014-03-01 22:51:41 +0000
+++ unity-shared/IconTexture.cpp	2014-07-08 09:48:09 +0000
@@ -226,22 +226,18 @@
     if (_draw_mode == DrawMode::STRETCH_WITH_ASPECT)
     {
       nux::Geometry imageDest = geo;
-      
-      float geo_apsect = float(geo.GetWidth()) / geo.GetHeight();
+
+      float geo_apsect = float(geo.width) / geo.width;
       float image_aspect = float(_texture_cached->GetWidth()) / _texture_cached->GetHeight();
 
       if (image_aspect > geo_apsect)
       {
         imageDest.SetHeight(float(imageDest.GetWidth()) / image_aspect);
-      } 
+      }
       if (image_aspect < geo_apsect)
       {
         imageDest.SetWidth(image_aspect * imageDest.GetHeight());
       }
-      else
-      {
-        imageDest = nux::Geometry(0, 0, _texture_cached->GetWidth(), _texture_cached->GetHeight());
-      }
 
       texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_SCALE_COORD);
       texxform.SetWrap(nux::TEXWRAP_CLAMP_TO_BORDER, nux::TEXWRAP_CLAMP_TO_BORDER);