Merge lp:~hikiko/unity/unity.scale-payment-musicpayment into lp:unity

[Eleni Maria Stea]

scaled music payment preview and payment preview and their widgets
added scale factor to action link

scaled music payment preview and payment preview and their widgets
added scale factor to action link

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3830
http://jenkins.qa.ubuntu.com/job/unity-ci/983/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/70/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/70
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/70/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

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

Please apply this diff not to make this to crash in jenkins:

http://bazaar.launchpad.net/~3v1n0/unity/previews-scaling-improved/revision/3832

review: Needs Fixing

[lp:~hikiko/unity/unity.scale-payment-musicpayment]

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

fix for jenkins

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

+1

review: Approve

=== modified file 'dash/previews/ActionLink.cpp'
--- dash/previews/ActionLink.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/ActionLink.cpp	2014-07-07 15:58:17 +0000
@@ -40,12 +40,15 @@
 
 ActionLink::ActionLink(std::string const& action_hint, std::string const& label, NUX_FILE_LINE_DECL)
   : nux::AbstractButton(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , action_hint_(action_hint)
   , aligment_(StaticCairoText::NUX_ALIGN_CENTRE)
   , underline_(StaticCairoText::NUX_UNDERLINE_SINGLE)
 {
   Init();
   BuildLayout(label);
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &ActionLink::UpdateScale));
 }
 
 std::string ActionLink::GetName() const
@@ -109,6 +112,7 @@
       static_text_ = new StaticCairoText(label_, true, NUX_TRACKER_LOCATION);
       if (!font_hint_.empty())
         static_text_->SetFont(font_hint_);
+      static_text_->SetScale(scale);
       static_text_->SetInputEventSensitivity(false);
       static_text_->SetTextAlignment(aligment_);
       static_text_->SetUnderline(underline_);
@@ -243,5 +247,14 @@
   return label_;
 }
 
+void ActionLink::UpdateScale(double scale)
+{
+  if (static_text_)
+    static_text_->SetScale(scale);
+
+  QueueRelayout();
+  QueueDraw();
+}
+
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/ActionLink.h'
--- dash/previews/ActionLink.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ActionLink.h	2014-07-07 15:58:17 +0000
@@ -48,6 +48,8 @@
   nux::RWProperty<StaticCairoText::UnderlineState> underline_state;
   nux::RWProperty<std::string> font_hint;
 
+  nux::Property<double> scale;
+
   void Activate() {}
   void Deactivate() {}
 
@@ -90,8 +92,7 @@
   StaticCairoText::UnderlineState underline_;
 private:
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
-
-
+  void UpdateScale(double scale);
 };
 
 } // namespace dash

=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPaymentPreview.cpp	2014-07-07 15:58:17 +0000
@@ -49,6 +49,22 @@
 {
 nux::logging::Logger logger("unity.dash.previews.payment.preview.music");
 
+const RawPixel DATA_MAX_HEIGHT = 76_em;
+const RawPixel TITLE_CHILDREN_SPACE = 10_em;
+const RawPixel PRIZE_CHILDREN_SPACE = 5_em;
+const RawPixel TITLE_MAX_WIDTH = 480_em;
+const RawPixel INTRO_MIN_HEIGHT = 50_em;
+const RawPixel FORM_MIN_HEIGHT = 107_em;
+const RawPixel FORM_PADDING = 20_em;
+const RawPixel LABELS_CHILDREN_SPACE = 18_em;
+const RawPixel PASSWORD_MIN_HEIGHT = 40_em;
+const RawPixel PASSWORD_MIN_WIDTH = 240_em;
+const RawPixel ACTIONS_CHILDREN_SPACE_MAX = 16_em;
+const RawPixel ACTIONS_CHILDREN_SPACE_MIN = 8_em;
+const RawPixel BUTTONS_SPACE = 20_em;
+const RawPixel HEADER_CHILDREN_SPACE = 10_em;
+const RawPixel HEADER_MAX_SIZE = 76_em;
+const RawPixel BODY_CHILDREN_SPACE = 20_em;
 }
 
 // static string definitions
@@ -77,6 +93,7 @@
 {
   SetupViews();
   PaymentPreview::SetupBackground();
+  UpdateScale(scale);
 }
 
 std::string MusicPaymentPreview::GetName() const
@@ -127,6 +144,7 @@
               || MusicPaymentPreview::FORGOT_PASSWORD_ACTION == action_id)
       {
         nux::ObjectPtr<ActionLink> link = this->CreateLink(action);
+        link->scale = scale();
         link->activate.connect(sigc::mem_fun(this,
                     &MusicPaymentPreview::OnActionLinkActivated));
 
@@ -137,6 +155,7 @@
         nux::ObjectPtr<ActionButton> button = this->CreateButton(action);
         button->activate.connect(sigc::mem_fun(this,
                     &MusicPaymentPreview::OnActionActivated));
+        button->scale = scale();
 
         buttons_map_.insert(std::make_pair(action->id, button));
       }
@@ -148,8 +167,8 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout* title_data_layout = new nux::VLayout();
-  title_data_layout->SetMaximumHeight(76);
-  title_data_layout->SetSpaceBetweenChildren(10);
+  title_data_layout->SetMaximumHeight(DATA_MAX_HEIGHT.CP(scale));
+  title_data_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
 
   title_ = new StaticCairoText(
           preview_model_->title.Get(), true,
@@ -157,8 +176,9 @@
 
   title_->SetFont(style.payment_title_font());
   title_->SetLines(-1);
+  title_->SetScale(scale);
   title_->SetFont(style.title_font());
-  title_->SetMaximumWidth(480);
+  title_->SetMaximumWidth(TITLE_MAX_WIDTH.CP(scale));
   title_->SetTextEllipsize(StaticCairoText::EllipsizeState::NUX_ELLIPSIZE_END);
   title_data_layout->AddView(title_.GetPointer(), 1);
 
@@ -166,6 +186,7 @@
           preview_model_->subtitle.Get(), true,
           NUX_TRACKER_LOCATION);
   subtitle_->SetLines(-1);
+  subtitle_->SetScale(scale);
   subtitle_->SetFont(style.payment_subtitle_font());
   title_data_layout->AddView(subtitle_.GetPointer(), 1);
   title_data_layout->AddSpace(1, 1);
@@ -176,14 +197,15 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *prize_data_layout = new nux::VLayout();
-  prize_data_layout->SetMaximumHeight(76);
-  prize_data_layout->SetSpaceBetweenChildren(5);
-  prize_data_layout->SetPadding(0, 10, 0, 0);
+  prize_data_layout->SetMaximumHeight(DATA_MAX_HEIGHT.CP(scale));
+  prize_data_layout->SetSpaceBetweenChildren(PRIZE_CHILDREN_SPACE.CP(scale));
+  prize_data_layout->SetPadding(0, TITLE_CHILDREN_SPACE.CP(scale), 0, 0);
 
   purchase_prize_ = new StaticCairoText(
           payment_preview_model_->purchase_prize.Get(), true,
           NUX_TRACKER_LOCATION);
   purchase_prize_->SetLines(-1);
+  purchase_prize_->SetScale(scale);
   purchase_prize_->SetFont(style.payment_prize_title_font());
   prize_data_layout->AddView(purchase_prize_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -192,6 +214,7 @@
           _("Ubuntu One best offer"),
           true, NUX_TRACKER_LOCATION);
   purchase_hint_->SetLines(-1);
+  purchase_hint_->SetScale(scale);
   purchase_hint_->SetFont(style.payment_prize_subtitle_font());
   prize_data_layout->AddView(purchase_hint_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -200,6 +223,7 @@
           payment_preview_model_->purchase_type.Get(), true,
           NUX_TRACKER_LOCATION);
   purchase_type_->SetLines(-1);
+  purchase_type_->SetScale(scale);
   purchase_type_->SetFont(style.payment_prize_subtitle_font());
   prize_data_layout->AddView(purchase_type_.GetPointer(), 1,
           nux::MINOR_POSITION_END);
@@ -210,31 +234,30 @@
 {
   previews::Style& style = dash::previews::Style::Instance();
   nux::VLayout *body_layout = new  nux::VLayout();
-  body_layout->SetSpaceBetweenChildren(20);
+  body_layout->SetSpaceBetweenChildren(BODY_CHILDREN_SPACE.CP(scale));
 
   intro_ = new StaticCairoText(
           payment_preview_model_->header.Get(), true,
           NUX_TRACKER_LOCATION);
   intro_->SetFont(style.payment_intro_font());
-  intro_->SetLineSpacing(10);
+  intro_->SetScale(scale);
+  intro_->SetLineSpacing(TITLE_CHILDREN_SPACE.CP(scale));
   intro_->SetLines(-style.GetDescriptionLineCount());
-  intro_->SetMinimumHeight(50);
+  intro_->SetMinimumHeight(INTRO_MIN_HEIGHT.CP(scale));
 
   form_layout_ = new nux::HLayout();
-  form_layout_->SetSpaceBetweenChildren(10);
-  form_layout_->SetMinimumHeight(107);
-  form_layout_->SetLeftAndRightPadding(20);
-  form_layout_->SetTopAndBottomPadding(10);
+  form_layout_->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
+  form_layout_->SetMinimumHeight(FORM_MIN_HEIGHT.CP(scale));
+  form_layout_->SetLeftAndRightPadding(FORM_PADDING.CP(scale));
+  form_layout_->SetTopAndBottomPadding(TITLE_CHILDREN_SPACE.CP(scale));
 
   form_layout_->AddLayout(GetFormLabels(), 1, nux::MINOR_POSITION_END);
   form_layout_->AddLayout(GetFormFields(), 1, nux::MINOR_POSITION_END);
   form_layout_->AddLayout(GetFormActions(), 1, nux::MINOR_POSITION_END);
 
-
   body_layout->AddView(intro_.GetPointer(), 1);
   body_layout->AddLayout(form_layout_.GetPointer(), 1);
 
-
   return body_layout;
 }
 
@@ -244,17 +267,18 @@
   nux::VLayout *labels_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    labels_layout->SetSpaceBetweenChildren(18);
+    labels_layout->SetSpaceBetweenChildren(LABELS_CHILDREN_SPACE.CP(scale));
   }
   else
   {
-    labels_layout->SetSpaceBetweenChildren(10);
+    labels_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
   }
 
   email_label_ = new StaticCairoText(
           _("Ubuntu One email:"), true,
           NUX_TRACKER_LOCATION);
   email_label_->SetLines(-1);
+  email_label_->SetScale(scale);
   email_label_->SetFont(style.payment_form_labels_font());
   labels_layout->AddView(email_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
@@ -262,6 +286,7 @@
           _("Payment method:"), true,
           NUX_TRACKER_LOCATION);
   payment_label_->SetLines(-1);
+  payment_label_->SetScale(scale);
   payment_label_->SetFont(style.payment_form_labels_font());
   labels_layout->AddView(payment_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
@@ -269,8 +294,9 @@
           _("Ubuntu One password:"), true,
           NUX_TRACKER_LOCATION);
   password_label_->SetLines(-1);
+  password_label_->SetScale(scale);
   password_label_->SetFont(style.payment_form_labels_font());
-  password_label_->SetMinimumHeight(40);
+  password_label_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
   labels_layout->AddView(password_label_.GetPointer(), 0, nux::MINOR_POSITION_END);
 
   return labels_layout;
@@ -282,17 +308,18 @@
   nux::VLayout *fields_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    fields_layout->SetSpaceBetweenChildren(18);
+    fields_layout->SetSpaceBetweenChildren(LABELS_CHILDREN_SPACE.CP(scale));
   }
   else
   {
-    fields_layout->SetSpaceBetweenChildren(10);
+    fields_layout->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
   }
 
   email_ = new StaticCairoText(
           payment_preview_model_->email.Get(), true,
           NUX_TRACKER_LOCATION);
   email_->SetLines(-1);
+  email_->SetScale(scale);
   email_->SetFont(style.payment_form_data_font());
   fields_layout->AddView(email_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
@@ -301,13 +328,14 @@
           payment_preview_model_->payment_method.Get(), true,
           NUX_TRACKER_LOCATION);
   payment_->SetLines(-1);
+  payment_->SetScale(scale);
   payment_->SetFont(style.payment_form_data_font());
   fields_layout->AddView(payment_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
 
   password_entry_ = new TextInput();
-  password_entry_->SetMinimumHeight(40);
-  password_entry_->SetMinimumWidth(240);
+  password_entry_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
+  password_entry_->SetMinimumWidth(PASSWORD_MIN_WIDTH.CP(scale));
   password_entry_->input_hint = _("Password");
 
   fields_layout->AddView(password_entry_.GetPointer(),
@@ -322,6 +350,7 @@
     StaticCairoText* error = new StaticCairoText(
             _("Wrong password"), true, NUX_TRACKER_LOCATION);
     error->SetLines(-1);
+    error->SetScale(scale);
     error->SetFont(style.payment_form_data_font());
     // ensure it is an error using red
     error->SetTextColor(style.payment_error_color());
@@ -337,11 +366,11 @@
   nux::VLayout *actions_layout = new nux::VLayout();
   if (error_message_.empty())
   {
-    actions_layout->SetSpaceBetweenChildren(16);
+    actions_layout->SetSpaceBetweenChildren(ACTIONS_CHILDREN_SPACE_MAX.CP(scale));
   }
   else
   {
-    actions_layout->SetSpaceBetweenChildren(8);
+    actions_layout->SetSpaceBetweenChildren(ACTIONS_CHILDREN_SPACE_MIN.CP(scale));
   }
 
   nux::ObjectPtr<StaticCairoText> empty_;
@@ -349,6 +378,7 @@
           "", true,
           NUX_TRACKER_LOCATION);
   empty_->SetLines(-1);
+  empty_->SetScale(scale);
   empty_->SetFont(style.payment_form_labels_font());
   actions_layout->AddView(empty_.GetPointer(), 1,
                   nux::MINOR_POSITION_START);
@@ -374,14 +404,14 @@
   actions_buffer_h->AddSpace(0, 1);
 
   nux::HLayout* buttons_data_layout = new nux::HLayout();
-  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions());
+  buttons_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenActions().CP(scale));
 
-  lock_texture_ = new IconTexture(style.GetLockIcon(), style.GetPaymentLockWidth(),
-          style.GetPaymentLockHeight());
+  lock_texture_ = new IconTexture(style.GetLockIcon(), style.GetPaymentLockWidth().CP(scale),
+          style.GetPaymentLockHeight().CP(scale));
   buttons_data_layout->AddView(lock_texture_.GetPointer(), 0, nux::MINOR_POSITION_CENTER,
           nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
 
-  buttons_data_layout->AddSpace(20, 1);
+  buttons_data_layout->AddSpace(BUTTONS_SPACE.CP(scale), 1);
   if(buttons_map_[MusicPaymentPreview::CANCEL_PURCHASE_ACTION].GetPointer())
     buttons_data_layout->AddView(buttons_map_[MusicPaymentPreview::CANCEL_PURCHASE_ACTION].GetPointer(),
             1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL, 100.0f,
@@ -413,7 +443,8 @@
 
   previews::Style& style = dash::previews::Style::Instance();
 
-  int width = std::max<int>(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  int width = std::max<int>(0, content_width);
 
   if(full_data_layout_) { full_data_layout_->SetMaximumWidth(width); }
   if(header_layout_) { header_layout_->SetMaximumWidth(width); }
@@ -460,6 +491,49 @@
   PaymentPreview::SetupViews();
 }
 
+void MusicPaymentPreview::UpdateScale(double scale)
+{
+  PaymentPreview::UpdateScale(scale);
+
+  if (intro_)
+    intro_->SetScale(scale);
+  if (email_label_)
+    email_label_->SetScale(scale);
+  if (payment_label_)
+    payment_label_->SetScale(scale);
+  if (payment_)
+    payment_->SetScale(scale);
+  if (password_label_)
+    password_label_->SetScale(scale);
+  if (purchase_hint_)
+    purchase_hint_->SetScale(scale);
+  if (purchase_prize_)
+    purchase_prize_->SetScale(scale);
+  if (purchase_type_)
+    purchase_type_->SetScale(scale);
+  if (change_payment_)
+    change_payment_->SetScale(scale);
+  if (error_label_)
+    error_label_->SetScale(scale);
+
+  previews::Style& style = dash::previews::Style::Instance();
+  if (lock_texture_)
+    lock_texture_->SetSize(std::max(style.GetPaymentLockWidth().CP(scale), style.GetPaymentLockHeight().CP(scale)));
+
+  if (password_entry_)
+  {
+    password_entry_->SetMinimumHeight(PASSWORD_MIN_HEIGHT.CP(scale));
+    password_entry_->SetMinimumWidth(PASSWORD_MIN_WIDTH.CP(scale));
+  }
+
+  if (form_layout_)
+  {
+    form_layout_->SetSpaceBetweenChildren(TITLE_CHILDREN_SPACE.CP(scale));
+    form_layout_->SetMinimumHeight(FORM_MIN_HEIGHT.CP(scale));
+    form_layout_->SetLeftAndRightPadding(FORM_PADDING.CP(scale));
+    form_layout_->SetTopAndBottomPadding(TITLE_CHILDREN_SPACE.CP(scale));
+  }
+}
 
 }
 }

=== modified file 'dash/previews/MusicPaymentPreview.h'
--- dash/previews/MusicPaymentPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/MusicPaymentPreview.h	2014-07-07 15:58:17 +0000
@@ -90,6 +90,7 @@
   void OnActionLinkActivated(ActionLink* link, std::string const& id);
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale) override;
 
   void PreLayoutManagement();
 

=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp	2013-09-19 16:44:03 +0000
+++ dash/previews/PaymentPreview.cpp	2014-07-07 15:58:17 +0000
@@ -39,6 +39,15 @@
 
 nux::logging::Logger logger("unity.dash.previews.payment.preview");
 
+const RawPixel CONTENT_DATA_CHILDREN_SPACE = 5_em;
+const RawPixel CONTENT_DATA_PADDING = 10_em;
+const RawPixel OVERLAY_LAYOUT_SPACE = 20_em;
+const RawPixel HEADER_CHILDREN_SPACE = 10_em;
+const RawPixel HEADER_MAX_SIZE = 76_em;
+const RawPixel IMAGE_MIN_MAX_SIZE = 64_em;
+const RawPixel HEADER_SPACE = 10_em;
+const RawPixel LINK_MIN_WIDTH = 178_em;
+const RawPixel LINK_MAX_HEIGHT = 34_em;
 }
 
 class OverlaySpinner : public unity::debug::Introspectable, public nux::View
@@ -183,6 +192,11 @@
 : Preview(preview_model)
 , data_(nullptr)
 , full_data_layout_(nullptr)
+, content_data_layout_(nullptr)
+, overlay_layout_(nullptr)
+, header_layout_(nullptr)
+, body_layout_(nullptr)
+, footer_layout_(nullptr)
 {
 }
 
@@ -199,18 +213,18 @@
 nux::Layout* PaymentPreview::GetHeader()
 {
   nux::HLayout* header_data_layout = new nux::HLayout();
-  header_data_layout->SetSpaceBetweenChildren(10);
-  header_data_layout->SetMaximumHeight(76);
-  header_data_layout->SetMinimumHeight(76);
+  header_data_layout->SetSpaceBetweenChildren(HEADER_CHILDREN_SPACE.CP(scale));
+  header_data_layout->SetMaximumHeight(HEADER_MAX_SIZE.CP(scale));
+  header_data_layout->SetMinimumHeight(HEADER_MAX_SIZE.CP(scale));
 
   image_ = new CoverArt();
-  image_->SetMinMaxSize(64, 64);
+  image_->SetMinMaxSize(IMAGE_MIN_MAX_SIZE.CP(scale), IMAGE_MIN_MAX_SIZE.CP(scale));
   AddChild(image_.GetPointer());
   UpdateCoverArtImage(image_.GetPointer());
 
   header_data_layout->AddView(image_.GetPointer(), 0);
   header_data_layout->AddLayout(GetTitle(), 0);
-  header_data_layout->AddSpace(10, 1);
+  header_data_layout->AddSpace(HEADER_SPACE.CP(scale), 1);
   header_data_layout->AddLayout(GetPrice(), 0);
   return header_data_layout;
 }
@@ -223,8 +237,8 @@
   link = new ActionLink(action->id,
          action->display_name, NUX_TRACKER_LOCATION);
   link->font_hint.Set(style.payment_form_labels_font().c_str());
-  link->SetMinimumWidth(178);
-  link->SetMaximumHeight(34);
+  link->SetMinimumWidth(LINK_MIN_WIDTH.CP(scale));
+  link->SetMaximumHeight(LINK_MAX_HEIGHT.CP(scale));
   return link;
 }
 
@@ -239,8 +253,8 @@
            NUX_TRACKER_LOCATION);
   button->SetFont(style.action_font());
   button->SetExtraHint(action->extra_text, style.action_extra_font());
-  button->SetMinimumWidth(178);
-  button->SetMaximumHeight(34);
+  button->SetMinimumWidth(LINK_MIN_WIDTH.CP(scale));
+  button->SetMaximumHeight(LINK_MAX_HEIGHT.CP(scale));
   return button;
 }
 
@@ -327,8 +341,8 @@
 
   // layout to be used to show the info
   content_data_layout_ = new nux::VLayout();
-  content_data_layout_->SetSpaceBetweenChildren(5);
-  content_data_layout_->SetPadding(10, 10, 0, 10);
+  content_data_layout_->SetSpaceBetweenChildren(CONTENT_DATA_CHILDREN_SPACE.CP(scale));
+  content_data_layout_->SetPadding(CONTENT_DATA_PADDING.CP(scale), CONTENT_DATA_PADDING.CP(scale), 0, CONTENT_DATA_PADDING.CP(scale));
 
   header_layout_ = GetHeader();
 
@@ -344,21 +358,36 @@
 
   // layout to draw an overlay
   overlay_layout_ = new nux::VLayout();
-  StaticCairoText* calculating = new StaticCairoText(
+  calculating_ = new StaticCairoText(
                                    "Performing purchase", true,
                                    NUX_TRACKER_LOCATION);
 
   OverlaySpinner* spinner_ = new OverlaySpinner();
-  overlay_layout_->AddSpace(20, 1);
-  overlay_layout_->AddView(calculating, 0, nux::MINOR_POSITION_CENTER);
+  overlay_layout_->AddSpace(OVERLAY_LAYOUT_SPACE.CP(scale), 1);
+  overlay_layout_->AddView(calculating_, 0, nux::MINOR_POSITION_CENTER);
   overlay_layout_->AddView(spinner_, 1, nux::MINOR_POSITION_CENTER);
-  overlay_layout_->AddSpace(20, 1);
+  overlay_layout_->AddSpace(OVERLAY_LAYOUT_SPACE.CP(scale), 1);
 
   full_data_layout_->AddLayout(overlay_layout_.GetPointer());
 
+  UpdateScale(scale);
   SetLayout(full_data_layout_.GetPointer());
 }
 
+void PaymentPreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  if (calculating_)
+    calculating_->SetScale(scale);
+
+  if (content_data_layout_)
+  {
+    content_data_layout_->SetSpaceBetweenChildren(CONTENT_DATA_CHILDREN_SPACE.CP(scale));
+    content_data_layout_->SetPadding(CONTENT_DATA_PADDING.CP(scale), CONTENT_DATA_PADDING.CP(scale), 0, CONTENT_DATA_PADDING.CP(scale));
+  }
+}
+
 }
 
 }

=== modified file 'dash/previews/PaymentPreview.h'
--- dash/previews/PaymentPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/PaymentPreview.h	2014-07-07 15:58:17 +0000
@@ -106,6 +106,7 @@
 
   virtual void LoadActions() = 0;
   virtual void SetupViews();
+  virtual void UpdateScale(double scale) override;
   virtual void SetupBackground();
 
   nux::ObjectPtr<nux::LayeredLayout> full_data_layout_;
@@ -115,6 +116,8 @@
   nux::ObjectPtr<nux::Layout> body_layout_;
   nux::ObjectPtr<nux::Layout> footer_layout_;
 
+  StaticCairoText* calculating_;
+
   // content elements
   nux::ObjectPtr<CoverArt> image_;
 

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2014-07-07 15:58:17 +0000
+++ dash/previews/Preview.cpp	2014-07-07 15:58:17 +0000
@@ -306,6 +306,10 @@
     ActionButton* bn = dynamic_cast<ActionButton*>(button);
     if (bn)
       bn->scale = scale;
+
+    ActionLink* link = dynamic_cast<ActionLink*>(button);
+    if (link)
+      link->scale = scale;
   }
 
   QueueRelayout();

=== modified file 'dash/previews/StandaloneMusicPaymentPreview.cpp'
--- dash/previews/StandaloneMusicPaymentPreview.cpp	2013-11-18 18:13:59 +0000
+++ dash/previews/StandaloneMusicPaymentPreview.cpp	2014-07-07 15:58:17 +0000
@@ -147,6 +147,7 @@
 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);
 
@@ -189,7 +190,8 @@
               glib::StealRef());
 
   dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
-  container_->Preview(preview_model, previews::Navigation::LEFT);
+  if (container_)
+    container_->Preview(preview_model, previews::Navigation::LEFT);
 }
 
 void TestRunner::InitWindowThread(nux::NThread* thread, void* InitData)