Merge lp:~hikiko/unity/unity.previews-text-scale into lp:unity

[Eleni Maria Stea]

scales the text of the previews

scales the text of the previews

[Eleni Maria Stea (hikiko)]

It only scales the text :)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3802
http://jenkins.qa.ubuntu.com/job/unity-ci/905/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/439

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3811
http://jenkins.qa.ubuntu.com/job/unity-ci/910/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/444

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

review: Approve (continuous-integration)

[lp:~hikiko/unity/unity.previews-text-scale]

3812. By Eleni Maria Stea on 2014-05-07

quick backup:
fixed padding - container's scaling, button text

todo:
fixes in ratings, buttons

3813. By Eleni Maria Stea on 2014-05-08

quick backup: Images, Image not found text scaled
missing: buttons, icon

3814. By Eleni Maria Stea on 2014-05-09

minor fix

3815. By Eleni Maria Stea on 2014-05-09

minor fix

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

35 + SetMinimumHeight((int)(scale * kMinButtonHeight));
36 + SetMinimumWidth((int)(scale * kMinButtonWidth));

Like everywhere else you used scale * SOME_INT, replace that using RawPixel instead as const value (if applicable), and anyway convert it using RawPixel.CP...

Where this is not convenient, use instead:
std::round(int_value * scale)

Also, don't store EMConverter::Ptr cv_ where you don't need it, or use UpdateScale.
Keep this dynamic, you can simply do something like:

BaseClass.h:
nux::Property<double> monitor;
nux::Property<double> scale;

BaseClass.cpp:
BaseClass::BaseClass() :
 : monitor(0)
 , scale(Settings::Instance().em(monitor)->DPIScale())
{
monitor.changed.connect(sigc::hide(sigc::mem_fun(this, &BaseClass::OnDPIChanged)));
Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &BaseClass::OnDPIChanged));
}

BaseClass::OnDPIChanged()
{
scale = Settings::Instance().em(monitor)->DPIScale();
}

That's all.
Then in extended classes if you need to redraw something when scale changes, you can just connect to scale.changed signal.

If you don't want to expose the monitor as property, just make sure you use the proper EMConverter in the preview, for the current dash monitor (this code doesn't seem to care about it currently).

Compare this to what we did in lp:~brandontschaefer/unity/shutdown-dialog-hi-dpi/+merge/217144 or in lp:~3v1n0/unity/dash-hidpi-cleanup/+merge/211861 for reference.

[lp:~hikiko/unity/unity.previews-text-scale]

3816. By Eleni Maria Stea on 2014-05-09

fixed icon scaling in app previews

3817. By Eleni Maria Stea on 2014-05-09

fixed more Icons

[Eleni Maria Stea (hikiko)]

@Marko: thanks a lot for the review! I will look at the branches and fix the code to use RawPixel, round etc. About the signal connector: I didn't keep it dynamic because, when the scale.changed signal is emitted there is no Preview instance, so, OnDPIChanged() is never called.

Unmerged revisions

3817. By Eleni Maria Stea on 2014-05-09

fixed more Icons

3816. By Eleni Maria Stea on 2014-05-09

fixed icon scaling in app previews

3815. By Eleni Maria Stea on 2014-05-09

minor fix

3814. By Eleni Maria Stea on 2014-05-09

minor fix

3813. By Eleni Maria Stea on 2014-05-08

quick backup: Images, Image not found text scaled
missing: buttons, icon

3812. By Eleni Maria Stea on 2014-05-07

quick backup:
fixed padding - container's scaling, button text

todo:
fixes in ratings, buttons

3811. By Eleni Maria Stea on 2014-04-30

put back empty lines - fix diff

3810. By Eleni Maria Stea on 2014-04-30

put back accidentally removed empty lines and comments to get a cleaner diff

3809. By Eleni Maria Stea on 2014-04-30

refactoring - adding scaling in all StaticCairoText

3808. By Eleni Maria Stea on 2014-04-30

scaled SocialPreviewComments text

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ActionButton.cpp	2014-05-09 14:03:42 +0000
@@ -25,6 +25,7 @@
 #include <Nux/HLayout.h>
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace
 {
@@ -44,6 +45,7 @@
   : nux::AbstractButton(NUX_FILE_LINE_PARAM)
   , action_hint_(action_hint)
   , image_(nullptr)
+  , cv_(Settings::Instance().em())
 {
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(true);
@@ -84,6 +86,8 @@
 
 void ActionButton::InitTheme()
 {
+  UpdateScale();
+
   if (!cr_active_)
   {
     nux::Geometry const& geo = GetGeometry();
@@ -94,8 +98,8 @@
     cr_focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &ActionButton::RedrawFocusOverlay)));
   }
 
-  SetMinimumHeight(kMinButtonHeight);
-  SetMinimumWidth(kMinButtonWidth);
+  SetMinimumHeight((int)(scale * kMinButtonHeight));
+  SetMinimumWidth((int)(scale * kMinButtonWidth));
 }
 
 void ActionButton::SetExtraHint(std::string const& extra_hint, std::string const& font_hint)
@@ -104,6 +108,10 @@
   if (extra_text_)
   {
     extra_text_->SetFont(extra_font_hint_);
+
+    UpdateScale();
+    extra_text_->SetScale(scale);
+
     ComputeContentSize();
     QueueDraw();
   }
@@ -112,6 +120,8 @@
 
 void ActionButton::BuildLayout(std::string const& label, std::string const& icon_hint, std::string const& extra_hint)
 {
+  UpdateScale();
+
   if (icon_hint != icon_hint_)
   {
     icon_hint_ = icon_hint;
@@ -123,13 +133,13 @@
 
     if (!icon_hint_.empty())
     {
-      image_ = new IconTexture(icon_hint, icon_size);
+      image_ = new IconTexture(icon_hint, (int)(icon_size * 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((int)(icon_size * scale), (int)(icon_size * scale));
     }
   }
 
@@ -149,6 +159,7 @@
         static_text_->SetFont(font_hint_);
       static_text_->SetInputEventSensitivity(false);
       static_text_->SetTextAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
+      static_text_->SetScale(scale);
     }
   }
 
@@ -168,14 +179,15 @@
         extra_text_->SetFont(extra_font_hint_);
       extra_text_->SetInputEventSensitivity(false);
       extra_text_->SetTextAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
+      extra_text_->SetScale(scale);
     }
   }
 
   RemoveLayout();
 
   nux::HLayout* layout = new nux::HLayout();
-  layout->SetHorizontalInternalMargin(6);
-  layout->SetPadding(2, 0, 2, 0);
+  layout->SetHorizontalInternalMargin((int)(6 * scale));
+  layout->SetPadding((int)(2 * scale), 0, (int)(2 * scale), 0);
   layout->AddSpace(0,1);
   if (image_)
     layout->AddView(image_.GetPointer(), 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
@@ -186,6 +198,7 @@
   layout->AddSpace(0,1);
   SetLayout(layout);
 
+
   ComputeContentSize();
   QueueDraw();
 }
@@ -296,6 +309,10 @@
   if (static_text_)
   {
     static_text_->SetFont(font_hint);
+
+    UpdateScale();
+    static_text_->SetScale(scale);
+
     ComputeContentSize();
     QueueDraw();
   }
@@ -311,5 +328,10 @@
   return extra_hint_;
 }
 
+void ActionButton::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // 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-05-09 14:03:42 +0000
@@ -27,6 +27,7 @@
 #include <Nux/CairoWrapper.h>
 #include <Nux/AbstractButton.h>
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 
 namespace unity
 {
@@ -59,6 +60,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 +98,9 @@
   nux::ObjectPtr<IconTexture> image_;
   nux::ObjectPtr<unity::StaticCairoText> static_text_;
   nux::ObjectPtr<unity::StaticCairoText> extra_text_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 } // namespace dash

=== modified file 'dash/previews/ActionLink.cpp'
--- dash/previews/ActionLink.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ActionLink.cpp	2014-05-09 14:03:42 +0000
@@ -25,6 +25,7 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/StaticCairoText.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace
 {
@@ -43,6 +44,7 @@
   , action_hint_(action_hint)
   , aligment_(StaticCairoText::NUX_ALIGN_CENTRE)
   , underline_(StaticCairoText::NUX_UNDERLINE_SINGLE)
+  , cv_(Settings::Instance().em())
 {
   Init();
   BuildLayout(label);
@@ -94,6 +96,7 @@
 
 void ActionLink::BuildLayout(std::string const& label)
 {
+  UpdateScale();
 
   if (label != label_)
   {
@@ -112,6 +115,7 @@
       static_text_->SetInputEventSensitivity(false);
       static_text_->SetTextAlignment(aligment_);
       static_text_->SetUnderline(underline_);
+      static_text_->SetScale(scale);
     }
   }
 
@@ -243,5 +247,10 @@
   return label_;
 }
 
+void ActionLink::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // 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-05-09 14:03:42 +0000
@@ -28,7 +28,7 @@
 #include <Nux/AbstractButton.h>
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/StaticCairoText.h"
-
+#include "unity-shared/EMConverter.h"
 
 namespace unity
 {
@@ -56,6 +56,8 @@
   std::string GetLabel() const;
   std::string GetExtraText() const;
 
+  nux::Property<double> scale;
+
 protected:
   nux::ObjectPtr<StaticCairoText> static_text_;
 
@@ -91,6 +93,8 @@
 private:
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
 
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 
 };
 

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ApplicationPreview.cpp	2014-05-09 14:03:42 +0000
@@ -119,6 +119,8 @@
 
   previews::Style& style = dash::previews::Style::Instance();
 
+  UpdateScale();
+
   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();
@@ -146,7 +148,7 @@
         // 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);
+        app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", (int)(scale * 72));
         AddChild(app_icon_.GetPointer());
         app_icon_->SetMinimumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
         app_icon_->SetMaximumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
@@ -179,6 +181,7 @@
         AddChild(title_.GetPointer());
         title_->SetLines(-1);
         title_->SetFont(style.title_font().c_str());
+        title_->SetScale(scale);
         title_->mouse_click.connect(on_mouse_down);
         title_subtitle_layout_->AddView(title_.GetPointer(), 1);
 
@@ -188,6 +191,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);
         }
@@ -201,6 +205,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);
         }
@@ -213,6 +218,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);
         }
@@ -223,6 +229,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);
         }
@@ -255,6 +262,7 @@
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->SetScale(scale);
         description_->mouse_click.connect(on_mouse_down);
         app_info_layout->AddView(description_.GetPointer());
       }

=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/ErrorPreview.cpp	2014-05-09 14:03:42 +0000
@@ -121,6 +121,8 @@
 
 nux::Layout* ErrorPreview::GetTitle()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout* title_data_layout = new nux::VLayout();
   title_data_layout->SetMaximumHeight(76);
@@ -135,6 +137,7 @@
   title_->SetFont(style.title_font());
   title_->SetMaximumWidth(480);
   title_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
+  title_->SetScale(scale);
   title_data_layout->AddView(title_.GetPointer(), 1);
 
   subtitle_ = new StaticCairoText(
@@ -142,6 +145,7 @@
           NUX_TRACKER_LOCATION);
   subtitle_->SetLines(-1);
   subtitle_->SetFont(style.payment_subtitle_font());
+  subtitle_->SetScale(scale);
   title_data_layout->AddView(subtitle_.GetPointer(), 1);
   title_data_layout->AddSpace(1, 1);
   return title_data_layout;
@@ -149,6 +153,8 @@
 
 nux::Layout* ErrorPreview::GetPrice()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *prize_data_layout = new nux::VLayout();
   prize_data_layout->SetMaximumHeight(76);
@@ -160,6 +166,7 @@
           NUX_TRACKER_LOCATION);
   purchase_prize_->SetLines(-1);
   purchase_prize_->SetFont(style.payment_prize_title_font());
+  purchase_prize_->SetScale(scale);
   prize_data_layout->AddView(purchase_prize_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
 
@@ -168,6 +175,7 @@
           true, NUX_TRACKER_LOCATION);
   purchase_hint_->SetLines(-1);
   purchase_hint_->SetFont(style.payment_prize_subtitle_font());
+  purchase_hint_->SetScale(scale);
   prize_data_layout->AddView(purchase_hint_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
 
@@ -176,6 +184,7 @@
           NUX_TRACKER_LOCATION);
   purchase_type_->SetLines(-1);
   purchase_type_->SetFont(style.payment_prize_subtitle_font());
+  purchase_type_->SetScale(scale);
   prize_data_layout->AddView(purchase_type_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
   return prize_data_layout;
@@ -183,6 +192,8 @@
 
 nux::Layout* ErrorPreview::GetBody()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::HLayout *body_layout = new nux::HLayout();
   nux::HLayout *intro_layout = new nux::HLayout();
@@ -199,6 +210,7 @@
   intro_->SetLines(-3);
   intro_->SetLineSpacing(10);
   intro_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
+  intro_->SetScale(scale);
 
   intro_layout->AddView(intro_.GetPointer());//, 0, nux::MINOR_POSITION_CENTER);
 

=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/GenericPreview.cpp	2014-05-09 14:03:42 +0000
@@ -111,6 +111,8 @@
   }
   previews::Style& style = dash::previews::Style::Instance();
 
+  UpdateScale();
+
   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();
@@ -139,6 +141,7 @@
       AddChild(title_.GetPointer());
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
+      title_->SetScale(scale);
       title_->mouse_click.connect(on_mouse_down);
       preview_data_layout->AddView(title_.GetPointer(), 1);
 
@@ -148,6 +151,7 @@
         AddChild(subtitle_.GetPointer());
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
+        subtitle_->SetScale(scale);
         subtitle_->mouse_click.connect(on_mouse_down);
         preview_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
@@ -171,6 +175,7 @@
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->SetScale(scale);
         description_->mouse_click.connect(on_mouse_down);
         preview_info_layout->AddView(description_.GetPointer());
       }
@@ -203,6 +208,7 @@
   mouse_click.connect(on_mouse_down);
 
   SetLayout(image_data_layout);
+  UpdateScale();
 }
 
 void GenericPreview::PreLayoutManagement()

=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/MoviePreview.cpp	2014-05-09 14:03:42 +0000
@@ -121,6 +121,8 @@
   }
   previews::Style& style = dash::previews::Style::Instance();
 
+  UpdateScale();
+
   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();
@@ -149,6 +151,7 @@
       AddChild(title_.GetPointer());
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
+      title_->SetScale(scale);
       title_->mouse_click.connect(on_mouse_down);
       app_data_layout->AddView(title_.GetPointer(), 1);
 
@@ -158,6 +161,7 @@
         AddChild(subtitle_.GetPointer());
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
+        subtitle_->SetScale(scale);
         subtitle_->mouse_click.connect(on_mouse_down);
         app_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
@@ -199,6 +203,7 @@
         description_->SetTextAlignment(StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
+        description_->SetScale(scale);
         description_->mouse_click.connect(on_mouse_down);
         preview_info_layout->AddView(description_.GetPointer());
       }
@@ -224,6 +229,7 @@
   mouse_click.connect(on_mouse_down);
 
   SetLayout(image_data_layout);
+  UpdateScale();
 }
 
 

=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPaymentPreview.cpp	2014-05-09 14:03:42 +0000
@@ -146,6 +146,8 @@
 
 nux::Layout* MusicPaymentPreview::GetTitle()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout* title_data_layout = new nux::VLayout();
   title_data_layout->SetMaximumHeight(76);
@@ -160,6 +162,7 @@
   title_->SetFont(style.title_font());
   title_->SetMaximumWidth(480);
   title_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
+  title_->SetScale(scale);
   title_data_layout->AddView(title_.GetPointer(), 1);
 
   subtitle_ = new StaticCairoText(
@@ -167,6 +170,7 @@
           NUX_TRACKER_LOCATION);
   subtitle_->SetLines(-1);
   subtitle_->SetFont(style.payment_subtitle_font());
+  subtitle_->SetScale(scale);
   title_data_layout->AddView(subtitle_.GetPointer(), 1);
   title_data_layout->AddSpace(1, 1);
   return title_data_layout;
@@ -174,6 +178,8 @@
 
 nux::Layout* MusicPaymentPreview::GetPrice()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *prize_data_layout = new nux::VLayout();
   prize_data_layout->SetMaximumHeight(76);
@@ -185,6 +191,7 @@
           NUX_TRACKER_LOCATION);
   purchase_prize_->SetLines(-1);
   purchase_prize_->SetFont(style.payment_prize_title_font());
+  purchase_prize_->SetScale(scale);
   prize_data_layout->AddView(purchase_prize_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
 
@@ -193,6 +200,7 @@
           true, NUX_TRACKER_LOCATION);
   purchase_hint_->SetLines(-1);
   purchase_hint_->SetFont(style.payment_prize_subtitle_font());
+  purchase_hint_->SetScale(scale);
   prize_data_layout->AddView(purchase_hint_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
 
@@ -201,6 +209,7 @@
           NUX_TRACKER_LOCATION);
   purchase_type_->SetLines(-1);
   purchase_type_->SetFont(style.payment_prize_subtitle_font());
+  purchase_type_->SetScale(scale);
   prize_data_layout->AddView(purchase_type_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
   return prize_data_layout;
@@ -208,6 +217,8 @@
 
 nux::Layout* MusicPaymentPreview::GetBody()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *body_layout = new  nux::VLayout();
   body_layout->SetSpaceBetweenChildren(20);
@@ -219,6 +230,7 @@
   intro_->SetLineSpacing(10);
   intro_->SetLines(-style.GetDescriptionLineCount());
   intro_->SetMinimumHeight(50);
+  intro_->SetScale(scale);
 
   form_layout_ = new nux::HLayout();
   form_layout_->SetSpaceBetweenChildren(10);
@@ -240,6 +252,8 @@
 
 nux::Layout* MusicPaymentPreview::GetFormLabels()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *labels_layout = new nux::VLayout();
   if (error_message_.empty())
@@ -256,6 +270,7 @@
           NUX_TRACKER_LOCATION);
   email_label_->SetLines(-1);
   email_label_->SetFont(style.payment_form_labels_font());
+  email_label_->SetScale(scale);
   labels_layout->AddView(email_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
   payment_label_ = new StaticCairoText(
@@ -263,6 +278,7 @@
           NUX_TRACKER_LOCATION);
   payment_label_->SetLines(-1);
   payment_label_->SetFont(style.payment_form_labels_font());
+  payment_label_->SetScale(scale);
   labels_layout->AddView(payment_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
   password_label_ = new StaticCairoText(
@@ -270,6 +286,7 @@
           NUX_TRACKER_LOCATION);
   password_label_->SetLines(-1);
   password_label_->SetFont(style.payment_form_labels_font());
+  password_label_->SetScale(scale);
   password_label_->SetMinimumHeight(40);
   labels_layout->AddView(password_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
@@ -278,6 +295,8 @@
 
 nux::Layout* MusicPaymentPreview::GetFormFields()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *fields_layout = new nux::VLayout();
   if (error_message_.empty())
@@ -294,6 +313,7 @@
           NUX_TRACKER_LOCATION);
   email_->SetLines(-1);
   email_->SetFont(style.payment_form_data_font());
+  email_->SetScale(scale);
   fields_layout->AddView(email_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
 
@@ -302,6 +322,7 @@
           NUX_TRACKER_LOCATION);
   payment_->SetLines(-1);
   payment_->SetFont(style.payment_form_data_font());
+  payment_->SetScale(scale);
   fields_layout->AddView(payment_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
 
@@ -325,6 +346,7 @@
     error->SetFont(style.payment_form_data_font());
     // ensure it is an error using red
     error->SetTextColor(style.payment_error_color());
+    error->SetScale(scale);
     fields_layout->AddView(error, 0, nux::MINOR_POSITION_START);
   }
 
@@ -333,6 +355,8 @@
 
 nux::Layout* MusicPaymentPreview::GetFormActions()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *actions_layout = new nux::VLayout();
   if (error_message_.empty())
@@ -350,6 +374,7 @@
           NUX_TRACKER_LOCATION);
   empty_->SetLines(-1);
   empty_->SetFont(style.payment_form_labels_font());
+  empty_->SetScale(scale);
   actions_layout->AddView(empty_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
 
@@ -369,6 +394,8 @@
 
 nux::Layout* MusicPaymentPreview::GetFooter()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   nux::HLayout* actions_buffer_h = new nux::HLayout();
   actions_buffer_h->AddSpace(0, 1);
@@ -376,8 +403,8 @@
   nux::HLayout* buttons_data_layout = new nux::HLayout();
   buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
 
-  lock_texture_ = new IconTexture(style.GetLockIcon(), style.GetPaymentLockWidth(),
-          style.GetPaymentLockHeight());
+  lock_texture_ = new IconTexture(style.GetLockIcon(), (int)(scale * style.GetPaymentLockWidth()),
+          (int)(scale * style.GetPaymentLockHeight()));
   buttons_data_layout->AddView(lock_texture_.GetPointer(), 0, nux::MINOR_POSITION_CENTER,
           nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
 

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/MusicPreview.cpp	2014-05-09 14:03:42 +0000
@@ -147,6 +147,8 @@
     full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
     full_data_layout_->SetSpaceBetweenChildren(16);
 
+    UpdateScale();
+
       /////////////////////
       // Music Info
       nux::VLayout* album_data_layout = new nux::VLayout();
@@ -156,6 +158,7 @@
       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);
 
@@ -165,6 +168,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);
         album_data_layout->AddView(subtitle_.GetPointer(), 1);
       }
@@ -235,6 +239,7 @@
   	AddChild(warning_msg_.GetPointer());
         warning_msg_->SetFont(style.u1_warning_font().c_str());
         warning_msg_->SetLines(-2);
+        warning_msg_->SetScale(scale);
         warning_msg_->SetMinimumHeight(50);
         warning_msg_->SetMaximumWidth(300);
 

=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/PaymentPreview.cpp	2014-05-09 14:03:42 +0000
@@ -323,6 +323,8 @@
 
 void PaymentPreview::SetupViews()
 {
+  UpdateScale();
+
   full_data_layout_ = new nux::LayeredLayout();
 
   // layout to be used to show the info
@@ -347,6 +349,7 @@
   StaticCairoText* calculating = new StaticCairoText(
                                    "Performing purchase", true,
                                    NUX_TRACKER_LOCATION);
+  calculating->SetScale(scale);
 
   OverlaySpinner* spinner_ = new OverlaySpinner();
   overlay_layout_->AddSpace(20, 1);

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/Preview.cpp	2014-05-09 14:03:42 +0000
@@ -24,6 +24,7 @@
 #include "TabIterator.h"
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/CoverArt.h"
+#include "unity-shared/UnitySettings.h"
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
@@ -39,6 +40,8 @@
 #include "SocialPreview.h"
 #include "PreviewInfoHintWidget.h"
 
+#define DEFAULT_SCALE 1.0
+
 namespace unity
 {
 namespace dash
@@ -100,12 +103,14 @@
 
 Preview::Preview(dash::Preview::Ptr preview_model)
   : View(NUX_TRACKER_LOCATION)
+  , scale(DEFAULT_SCALE)
   , preview_model_(preview_model)
   , tab_iterator_(new TabIterator())
   , full_data_layout_(nullptr)
   , image_(nullptr)
   , title_(nullptr)
   , subtitle_(nullptr)
+  , cv_(Settings::Instance().em())
 {
   preview_container_ = new PreviewContainer;
 }
@@ -135,6 +140,8 @@
 
 nux::Layout* Preview::BuildGridActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons)
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
 
   nux::VLayout* actions_layout_v = new nux::VLayout();
@@ -144,7 +151,7 @@
   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((int)(style.GetSpaceBetweenActions() * scale));
 
     for (uint j = 0; j < 2 && action_iter < actions.size(); j++, action_iter++)
     {
@@ -169,10 +176,12 @@
 
 nux::Layout* Preview::BuildVerticalActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons)
 {
+  UpdateScale();
+
   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((int)(style.GetSpaceBetweenActions() * scale));
 
   uint action_iter = 0;
   for (uint i = 0; i < actions.size(); i++)
@@ -279,6 +288,11 @@
   return preview_container_->request_close;
 }
 
+void Preview::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 }
 }
 }

=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/Preview.h	2014-05-09 14:03:42 +0000
@@ -29,6 +29,7 @@
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/StaticCairoText.h"
+#include "unity-shared/EMConverter.h"
 
 namespace nux
 {
@@ -74,6 +75,9 @@
                                       unsigned long special_keys_state);
   virtual nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+  virtual void UpdateScale();
+  nux::Property<double> scale;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {}
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw) {}
@@ -120,6 +124,9 @@
   // Need to declare this as a pointer to avoid a circular header
   // dependency issue between Preview.h and PreviewContainer.h
   nux::ObjectPtr<PreviewContainer> preview_container_;
+
+private:
+  EMConverter::Ptr cv_;
 };
 
 }

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewContainer.cpp	2014-05-09 14:03:42 +0000
@@ -29,6 +29,7 @@
 #include "unity-shared/TimeUtil.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/GraphicsUtils.h"
+#include "unity-shared/UnitySettings.h"
 #include "PreviewNavigator.h"
 #include <boost/math/constants/constants.hpp>
 #include "config.h"
@@ -398,6 +399,7 @@
   , nav_disabled_(Navigation::NONE)
   , navigation_progress_speed_(0.0)
   , navigation_count_(0)
+  , cv_(Settings::Instance().em())
 {
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(false);
@@ -454,33 +456,36 @@
 
 void PreviewContainer::SetupViews()
 {
+  UpdateScale();
+
   previews::Style& style = previews::Style::Instance();
 
   nux::VLayout* layout = new nux::VLayout();
   SetLayout(layout);
-  layout->AddLayout(new nux::SpaceLayout(0,0,style.GetPreviewTopPadding(),style.GetPreviewTopPadding()));
+  layout->AddLayout(new nux::SpaceLayout(0,0,(int)(style.GetPreviewTopPadding() * scale),
+      (int)(style.GetPreviewTopPadding() * scale)));
 
   layout_content_ = new nux::HLayout();
-  layout_content_->SetSpaceBetweenChildren(6);
+  layout_content_->SetSpaceBetweenChildren((int)(6 * 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_->SetMinimumWidth((int)(style.GetNavigatorWidth() * scale));
+  nav_left_->SetMaximumWidth((int)(style.GetNavigatorWidth() * 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((int)(scale * style.GetPreviewWidth()), (int)(scale * style.GetPreviewHeight()));
   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_->SetMinimumWidth((int)(style.GetNavigatorWidth() * scale));
+  nav_right_->SetMaximumWidth((int)(style.GetNavigatorWidth() * 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);
@@ -694,6 +699,11 @@
   return layout_content_->GetAbsoluteGeometry();  
 }
 
+void PreviewContainer::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PreviewContainer.h	2014-05-09 14:03:42 +0000
@@ -28,6 +28,7 @@
 #include <UnityCore/Preview.h>
 #include "Preview.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 
 #include <UnityCore/GLibSource.h>
 
@@ -85,6 +86,8 @@
 
   void OnMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
 
+  nux::Property<double> scale;
+
 protected:
   void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
@@ -115,6 +118,9 @@
   
   glib::Source::UniquePtr animation_timer_;
   friend class PreviewContent;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 } // namespace previews

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2014-05-09 14:03:42 +0000
@@ -31,6 +31,7 @@
 #include <unity-shared/StaticCairoText.h>
 #include <unity-shared/IconTexture.h>
 #include <unity-shared/PreviewStyle.h>
+#include <unity-shared/UnitySettings.h>
 
 namespace unity
 {
@@ -50,6 +51,7 @@
 : View(NUX_TRACKER_LOCATION)
 , icon_size_(icon_size)
 , preview_model_(preview_model)
+, cv_(Settings::Instance().em())
 {
   SetupViews();
 }
@@ -146,17 +148,19 @@
   RemoveLayout();
   info_hints_.clear();
 
+  UpdateScale();
+
   previews::Style& style = previews::Style::Instance();
 
   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::VLayout* layout = new nux::VLayout();
-  layout->SetSpaceBetweenChildren(6);
+  layout->SetSpaceBetweenChildren((int)(6 * scale));
 
   for (dash::Preview::InfoHintPtr info_hint : preview_model_->GetInfoHints())
   {
     nux::HLayout* hint_layout = new nux::HLayout();
-    hint_layout->SetSpaceBetweenChildren(layout_spacing);
+    hint_layout->SetSpaceBetweenChildren((int)(layout_spacing * scale));
 
     StaticCairoTextPtr info_name;
     if (!info_hint->display_name.empty())
@@ -168,6 +172,7 @@
       info_name->SetFont(style.info_hint_bold_font());
       info_name->SetLines(-1);
       info_name->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+      info_name->SetScale(scale);
       info_name->mouse_click.connect(on_mouse_down);
       hint_layout->AddView(info_name.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
     }
@@ -175,6 +180,7 @@
     StaticCairoTextPtr info_value(new StaticCairoText(StringFromVariant(info_hint->value), true, NUX_TRACKER_LOCATION));
     info_value->SetFont(style.info_hint_font());
     info_value->SetLines(-1);
+    info_value->SetScale(scale);
     info_value->mouse_click.connect(on_mouse_down);
     hint_layout->AddView(info_value.GetPointer(), 1, nux::MINOR_POSITION_CENTER);
 
@@ -192,21 +198,23 @@
 
 void PreviewInfoHintWidget::PreLayoutManagement()
 {
+  UpdateScale();
+
   previews::Style& style = previews::Style::Instance();
   nux::Geometry const& geo = GetGeometry();
   
   int info_hint_width = 0;
   for (InfoHint const& info_hint : info_hints_)
   {
-    int width = style.GetInfoHintNameMinimumWidth();
+    int width = (int)(style.GetInfoHintNameMinimumWidth() * scale);
     if (info_hint.first)
     {
-      width = info_hint.first->GetTextExtents().width;
+      width = (int)(info_hint.first->GetTextExtents().width * scale);
 
-      if (width < style.GetInfoHintNameMinimumWidth())
-        width = style.GetInfoHintNameMinimumWidth();
-      else if (width > style.GetInfoHintNameMaximumWidth())
-        width = style.GetInfoHintNameMaximumWidth();
+      if (width < (int)(style.GetInfoHintNameMinimumWidth() * scale))
+        width = (int)(style.GetInfoHintNameMinimumWidth() * scale);
+      else if (width > (int)(style.GetInfoHintNameMaximumWidth() * scale))
+        width = (int)(style.GetInfoHintNameMaximumWidth() * scale);
     }
 
     if (info_hint_width < width)
@@ -215,9 +223,9 @@
     }
   }
 
-  int info_value_width = geo.width;
-  info_value_width -= layout_spacing;
-  info_value_width -= info_hint_width;
+  int info_value_width = (int)(geo.width * scale);
+  info_value_width -= (int)(layout_spacing * scale);
+  info_value_width -= (int)(info_hint_width * scale);
   info_value_width = MAX(0, info_value_width);
 
   for (InfoHint const& info_hint : info_hints_)
@@ -236,6 +244,11 @@
   View::PreLayoutManagement();
 }
 
+void PreviewInfoHintWidget::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewInfoHintWidget.h'
--- dash/previews/PreviewInfoHintWidget.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PreviewInfoHintWidget.h	2014-05-09 14:03:42 +0000
@@ -27,6 +27,7 @@
 #include <Nux/View.h>
 #include <UnityCore/Preview.h>
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 #include "PreviewContainer.h"
 
 namespace unity
@@ -58,6 +59,8 @@
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
+  nux::Property<double> scale;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -84,6 +87,9 @@
 
 private:
   PreviewContainer preview_container_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 } // namespace previews

=== modified file 'dash/previews/PreviewNavigator.cpp'
--- dash/previews/PreviewNavigator.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewNavigator.cpp	2014-05-09 14:03:42 +0000
@@ -27,6 +27,7 @@
 #include <Nux/VLayout.h>
 #include <unity-shared/IconTexture.h>
 #include <unity-shared/PreviewStyle.h>
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -43,6 +44,7 @@
   , direction_(direction)
   , texture_(nullptr)
   , visual_state_(VisualState::NORMAL)
+  , cv_(Settings::Instance().em())
 {
   SetupViews();
   UpdateTexture();
@@ -96,6 +98,8 @@
 
 void PreviewNavigator::SetupViews()
 {
+  UpdateScale();
+
   previews::Style& style = dash::previews::Style::Instance();
   
   if (direction_ == Orientation::LEFT || direction_ == Orientation::RIGHT)
@@ -107,9 +111,11 @@
     layout_ = hlayout;
 
     if (direction_ == Orientation::LEFT)
-      texture_ = new IconTexture(Style::Instance().GetNavLeftIcon(), style.GetNavigatorIconSize(), style.GetNavigatorIconSize());
+      texture_ = new IconTexture(Style::Instance().GetNavLeftIcon(), (int)(scale * style.GetNavigatorIconSize()),
+          (int)(scale * style.GetNavigatorIconSize()));
     else 
-      texture_ = new IconTexture(Style::Instance().GetNavRightIcon(), style.GetNavigatorIconSize(), style.GetNavigatorIconSize());
+      texture_ = new IconTexture(Style::Instance().GetNavRightIcon(), (int)(scale * style.GetNavigatorIconSize()),
+          (int)(scale * style.GetNavigatorIconSize()));
     texture_->SetDrawMode(IconTexture::DrawMode::STRETCH_WITH_ASPECT);
 
     vlayout->AddSpace(0,1);
@@ -179,6 +185,10 @@
   }
 }
 
+void PreviewNavigator::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
 
 } // 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-05-09 14:03:42 +0000
@@ -27,6 +27,7 @@
 #include <Nux/View.h>
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 
 
 namespace unity
@@ -46,6 +47,8 @@
   typedef nux::ObjectPtr<PreviewNavigator> Ptr;  
   PreviewNavigator(Orientation direction, NUX_FILE_LINE_PROTO);
 
+  nux::Property<double> scale;
+
   void SetEnabled(bool enabled);
 
   // From debug::Introspectable
@@ -78,10 +81,13 @@
     ACTIVE
   };
   VisualState visual_state_; 
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 } // 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	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2014-05-09 14:03:42 +0000
@@ -29,6 +29,7 @@
 #include "unity-shared/RatingsButton.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include "PreviewRatingsWidget.h"
 
 namespace unity
@@ -42,21 +43,25 @@
 
 PreviewRatingsWidget::PreviewRatingsWidget(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , cv_(Settings::Instance().em())
 {
+  UpdateScale();
+
   nux::VLayout* layout = new nux::VLayout();
-  layout->SetSpaceBetweenChildren(3);
+  layout->SetSpaceBetweenChildren((int)(scale * 3));
 
   previews::Style& style = previews::Style::Instance();
 
   auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
-  ratings_ = new RatingsButton(18,2);
+  ratings_ = new RatingsButton((int)(scale * 18), (int)(scale * 2));
   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);
   reviews_->mouse_click.connect(on_mouse_down);
   layout->AddView(reviews_);
 
@@ -114,6 +119,11 @@
     .add(GetAbsoluteGeometry());
 }
 
+void PreviewRatingsWidget::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/PreviewRatingsWidget.h'
--- dash/previews/PreviewRatingsWidget.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PreviewRatingsWidget.h	2014-05-09 14:03:42 +0000
@@ -26,6 +26,7 @@
 #include <Nux/Nux.h>
 #include <Nux/View.h>
 #include "PreviewContainer.h"
+#include "unity-shared/EMConverter.h"
 
 namespace nux
 {
@@ -54,6 +55,8 @@
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
+  nux::Property<double> scale;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -69,6 +72,9 @@
   StaticCairoText* reviews_;
 
   PreviewContainer preview_container_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 } // namespace previews

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/SocialPreview.cpp	2014-05-09 14:03:42 +0000
@@ -111,6 +111,8 @@
 
 void SocialPreview::SetupViews()
 {
+  UpdateScale();
+
   dash::SocialPreview* social_preview_model = dynamic_cast<dash::SocialPreview*>(preview_model_.get());
   if (!social_preview_model)
   {
@@ -158,7 +160,7 @@
         // Icon Layout
         nux::VLayout* icon_layout = new nux::VLayout();
         icon_layout->SetSpaceBetweenChildren(3);
-        avatar_ = new IconTexture(social_preview_model->avatar.Get().RawPtr() ? g_icon_to_string(social_preview_model->avatar.Get().RawPtr()) : "", MIN(style.GetAvatarAreaWidth(), style.GetAvatarAreaHeight()));
+        avatar_ = new IconTexture(social_preview_model->avatar.Get().RawPtr() ? g_icon_to_string(social_preview_model->avatar.Get().RawPtr()) : "", MIN(style.GetAvatarAreaWidth(), (int)(scale * style.GetAvatarAreaHeight())));
         AddChild(avatar_.GetPointer());
         avatar_->SetMinMaxSize(style.GetAvatarAreaWidth(), style.GetAvatarAreaHeight());
         avatar_->mouse_click.connect(on_mouse_down);
@@ -175,12 +177,14 @@
         AddChild(title_.GetPointer());
         title_->SetLines(-1);
         title_->SetFont(style.title_font().c_str());
+        title_->SetScale(scale);
         title_->mouse_click.connect(on_mouse_down);
 
         subtitle_ = new StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
         AddChild(subtitle_.GetPointer());
         subtitle_->SetFont(style.content_font().c_str());
         subtitle_->SetLines(-1);
+        subtitle_->SetScale(scale);
         subtitle_->mouse_click.connect(on_mouse_down);
 
         social_data_layout->AddView(title_.GetPointer(), 0);
@@ -225,6 +229,7 @@
         comments_hint_->SetLines(-1);
         comments_hint_->SetFont(style.info_hint_bold_font().c_str());
         comments_hint_->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+        comments_hint_->SetScale(scale);
         comments_hint_->mouse_click.connect(on_mouse_down);
         comments_layout->AddView(comments_hint_.GetPointer(), 0, nux::MINOR_POSITION_START);
 

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/SocialPreviewComments.cpp	2014-05-09 14:03:42 +0000
@@ -22,6 +22,7 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include <UnityCore/SocialPreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/Layout.h>
@@ -48,6 +49,7 @@
 SocialPreviewComments::SocialPreviewComments(dash::Preview::Ptr preview_model, NUX_FILE_LINE_DECL)
 : View(NUX_FILE_LINE_PARAM)
 , preview_model_(preview_model)
+, cv_(Settings::Instance().em())
 {
   SetupViews();
 }
@@ -126,6 +128,8 @@
   RemoveLayout();
   comments_.clear();
 
+  UpdateScale();
+
   previews::Style& style = previews::Style::Instance();
 
   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); };
@@ -146,6 +150,7 @@
       comment_name->SetFont(style.info_hint_bold_font());
       comment_name->SetLines(-1);
       comment_name->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+      comment_name->SetScale(scale);
       comment_name->mouse_click.connect(on_mouse_down);
       name_layout->AddView(comment_name.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
@@ -157,6 +162,7 @@
       comment_time->SetFont(style.info_hint_font());
       comment_time->SetLines(-1);
       comment_time->SetTextAlignment(StaticCairoText::NUX_ALIGN_RIGHT);
+      comment_time->SetScale(scale);
       comment_time->mouse_click.connect(on_mouse_down);
       name_layout->AddView(comment_time.GetPointer(), 0, nux::MINOR_POSITION_START);
     }
@@ -170,6 +176,7 @@
     comment_value->SetFont(style.info_hint_font());
     comment_value->SetLines(-7);
     comment_value->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
+    comment_value->SetScale(scale);
     comment_value->mouse_click.connect(on_mouse_down);
     comment_layout->AddView(comment_value.GetPointer(), 1, nux::MINOR_POSITION_START);
 
@@ -195,6 +202,11 @@
   introspection.add(GetAbsoluteGeometry());
 }
 
+void SocialPreviewComments::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 }
 }
 }

=== modified file 'dash/previews/SocialPreviewComments.h'
--- dash/previews/SocialPreviewComments.h	2013-09-19 16:44:03 +0000
+++ dash/previews/SocialPreviewComments.h	2014-05-09 14:03:42 +0000
@@ -28,6 +28,7 @@
 #include <NuxCore/ObjectPtr.h>
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 #include <UnityCore/SocialPreview.h>
 #include "PreviewContainer.h"
 
@@ -50,6 +51,8 @@
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
+  nux::Property<double> scale;
+
 protected:
 
   typedef nux::ObjectPtr<StaticCairoText> StaticCairoTextPtr;
@@ -74,6 +77,9 @@
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
 
   PreviewContainer preview_container_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 }

=== modified file 'dash/previews/SocialPreviewContent.cpp'
--- dash/previews/SocialPreviewContent.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/SocialPreviewContent.cpp	2014-05-09 14:03:42 +0000
@@ -23,6 +23,7 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include <NuxCore/Logger.h>
 #include <Nux/Layout.h>
 
@@ -56,6 +57,7 @@
 
 SocialPreviewContent::SocialPreviewContent(std::string const& text, NUX_FILE_LINE_DECL)
 : View(NUX_FILE_LINE_PARAM)
+, cv_(Settings::Instance().em())
 {
   SetupViews();
   if (text.length() > 0)
@@ -128,6 +130,8 @@
 
 void SocialPreviewContent::SetupViews()
 {
+  UpdateScale();
+
   dash::previews::Style const& style = dash::previews::Style::Instance();
 
   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); };
@@ -137,6 +141,7 @@
   text_->SetFont(style.content_font());
   text_->SetLineSpacing(5);
   text_->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_MIDDLE);
+  text_->SetScale(scale);
   text_->mouse_click.connect(on_mouse_down);
 
   nux::Layout* layout = new nux::Layout();
@@ -314,6 +319,11 @@
   introspection.add(GetAbsoluteGeometry());
 }
 
+void SocialPreviewContent::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 }
 }
 }

=== modified file 'dash/previews/SocialPreviewContent.h'
--- dash/previews/SocialPreviewContent.h	2013-09-19 16:44:03 +0000
+++ dash/previews/SocialPreviewContent.h	2014-05-09 14:03:42 +0000
@@ -30,6 +30,7 @@
 #include <NuxCore/ObjectPtr.h>
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 #include "PreviewContainer.h"
 
 namespace unity
@@ -52,6 +53,8 @@
 
   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);
@@ -82,6 +85,9 @@
   NuxCairoPtr cr_bubble_;
 
   PreviewContainer preview_container_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 }

=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/Track.cpp	2014-05-09 14:03:42 +0000
@@ -29,6 +29,7 @@
 #include <unity-shared/IconTexture.h>
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
+#include <unity-shared/UnitySettings.h>
 
 namespace unity
 {
@@ -129,6 +130,7 @@
   , play_state_(PlayerState::STOPPED)
   , progress_(0.0)
   , mouse_over_(false)
+  , cv_(Settings::Instance().em())
 {
   SetupBackground();
   SetupViews();
@@ -197,6 +199,8 @@
 
 void Track::SetupViews()
 {
+  UpdateScale();
+
   previews::Style& style = previews::Style::Instance();
   nux::HLayout* layout = new nux::HLayout();
   layout->SetLeftAndRightPadding(0,0);
@@ -214,12 +218,14 @@
   track_number_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   track_number_->SetLines(-1);
   track_number_->SetFont(style.track_font());
+  track_number_->SetScale(scale);
 
   title_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   title_->SetTextAlignment(StaticCairoText::NUX_ALIGN_LEFT);
   title_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   title_->SetLines(-1);
   title_->SetFont(style.track_font());
+  title_->SetScale(scale);
 
   duration_ = new StaticCairoText("", NUX_TRACKER_LOCATION);
   duration_->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_NONE);
@@ -227,6 +233,7 @@
   duration_->SetTextVerticalAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   duration_->SetLines(-1);
   duration_->SetFont(style.track_font());
+  duration_->SetScale(scale);
   duration_->SetMaximumWidth(style.GetMusicDurationWidth());
   duration_->SetMaximumWidth(style.GetMusicDurationWidth());
   // Layouts
@@ -441,6 +448,11 @@
   View::PreLayoutManagement();
 }
 
+void Track::UpdateScale()
+{
+  scale = cv_->DPIScale();
+}
+
 } // 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-05-09 14:03:42 +0000
@@ -28,6 +28,7 @@
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/Tracks.h>
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 #include "PreviewPlayer.h"
 
 namespace nux
@@ -55,6 +56,8 @@
 
   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);
@@ -100,6 +103,10 @@
 
   bool mouse_over_;
   connection::Wrapper player_connection_;
+
+private:
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 }

=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2013-11-19 18:48:35 +0000
+++ unity-shared/CoverArt.cpp	2014-05-09 14:03:42 +0000
@@ -25,6 +25,7 @@
 #include "CoverArt.h"
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/CairoTexture.h"
+#include "unity-shared/UnitySettings.h"
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include "DashStyle.h"
@@ -56,6 +57,7 @@
   , stretch_image_(false)
   , waiting_(false)
   , rotation_(0.0)
+  , cv_(Settings::Instance().em())
 {
   SetupViews();
 }
@@ -99,6 +101,8 @@
     slot_handle_ = 0;
   }
 
+  UpdateScale();
+
   bool bLoadTexture = false;
   bLoadTexture |= g_strrstr(image_hint.c_str(), "://") != NULL;
   if (!bLoadTexture && !image_hint.empty())
@@ -118,12 +122,14 @@
     if (icon.IsType(G_TYPE_ICON))
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, (int)(ICON_SIZE * _scale),
+          (int)(ICON_SIZE * _scale), sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
     else
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromIconName(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = IconLoader::GetDefault().LoadFromIconName(image_hint, (int)(ICON_SIZE * _scale),
+          (int)(ICON_SIZE * _scale), sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
   }
   else
@@ -134,7 +140,9 @@
 
 void CoverArt::GenerateImage(std::string const& uri)
 {
-  notifier_ = ThumbnailGenerator::Instance().GetThumbnail(uri, 512);
+  UpdateScale();
+
+  notifier_ = ThumbnailGenerator::Instance().GetThumbnail(uri, 512 * _scale);
   if (notifier_)
   {
     StartWaiting();
@@ -206,11 +214,13 @@
     return;
   }
 
-  int height = max_height;
+  UpdateScale();
+
+  int height = (int)(max_height * _scale);
 
   int pixbuf_width, pixbuf_height;
-  pixbuf_width = gdk_pixbuf_get_width(pixbuf);
-  pixbuf_height = gdk_pixbuf_get_height(pixbuf);
+  pixbuf_width = (int)(gdk_pixbuf_get_width(pixbuf) * _scale);
+  pixbuf_height = (int)(gdk_pixbuf_get_height(pixbuf) * _scale);
   if (G_UNLIKELY(!pixbuf_height || !pixbuf_width))
   {
     pixbuf_width = (pixbuf_width) ? pixbuf_width : 1; // no zeros please
@@ -233,20 +243,20 @@
     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 = ICON_SIZE;
+      pixbuf_width = (int)(ICON_SIZE * _scale);
       pixbuf_height = pixbuf_width * aspect;
 
       if (pixbuf_height > height)
       {
-        // scaled too big, scale down
-        pixbuf_height = height;
-        pixbuf_width = pixbuf_height / aspect;
+        // _scaled too big, _scale down
+        pixbuf_height = (int)(height * _scale);
+        pixbuf_width = (int)(pixbuf_height / aspect);
       }
     }
     else
     {
-      pixbuf_height = height;
-      pixbuf_width = pixbuf_height / aspect;
+      pixbuf_height = (int)(height * _scale);
+      pixbuf_width = (int)(pixbuf_height / aspect);
     }
 
     if (gdk_pixbuf_get_height(pixbuf) == pixbuf_height)
@@ -263,7 +273,7 @@
     cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
     cairo_paint(cr);
 
-    float scale = float(pixbuf_height) / gdk_pixbuf_get_height(pixbuf);
+    float scale = float(pixbuf_height) / (gdk_pixbuf_get_height(pixbuf) * _scale);
     cairo_scale(cr, scale, scale);
 
     cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
@@ -439,6 +449,8 @@
 
 void CoverArt::SetupViews()
 {
+  UpdateScale();
+
   nux::VLayout* layout = new nux::VLayout();
   layout->AddSpace(0, 1);
   layout->AddSpace(0, 1);
@@ -450,6 +462,7 @@
   overlay_text_->SetFont("Ubuntu 14");
   overlay_text_->SetLines(-3);
   overlay_text_->SetText(_("No Image Available"));
+  overlay_text_->SetScale(_scale);
 
   dash::Style& style = dash::Style::Instance();
   spin_ = style.GetSearchSpinIcon();
@@ -496,6 +509,11 @@
   return false;
 }
 
+void CoverArt::UpdateScale()
+{
+  _scale = cv_->DPIScale();
+}
+
 }
 }
 }

=== modified file 'unity-shared/CoverArt.h'
--- unity-shared/CoverArt.h	2013-09-19 16:44:03 +0000
+++ unity-shared/CoverArt.h	2014-05-09 14:03:42 +0000
@@ -31,6 +31,7 @@
 #include <NuxCore/ObjectPtr.h>
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/EMConverter.h"
 #include "ThumbnailGenerator.h"
 
 namespace unity
@@ -58,6 +59,8 @@
 
   void SetFont(std::string const& font);
 
+  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);
@@ -99,6 +102,9 @@
 
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
   LayerPtr bg_layer_;
+
+  EMConverter::Ptr cv_;
+  void UpdateScale();
 };
 
 }