Merge lp:~hikiko/unity/unity.scale-social-preview into lp:unity

[Eleni Maria Stea]

scaled social preview, social preview comments, social preview content and components

scaled social preview, social preview comments, social preview content and components

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

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

There are various things that needs fixing here, I've mostly fixed them in lp:~3v1n0/unity/previews-scaling-improved which you should merge in lp:~hikiko/unity/unity.scale-track

I fixed the comment scaling, made the action buttons and other cairo textures (such as the bubble) to be properly scaled (not just resized), various crashes...

But there's still one mayor issue: the social avatar picture and the button icons are not shown in the actual dash (while they correctly work in the standalone version).

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

thank you for fixing it Marco :) I'll merge your branch to mine

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2014-06-21 11:58:37 +0000
+++ dash/previews/SocialPreview.cpp	2014-06-21 11:58:37 +0000
@@ -49,6 +49,13 @@
 {
 DECLARE_LOGGER(logger, "unity.dash.preview.social");
 
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 16_em;
+  const RawPixel ICON_CHILDREN_SPACE = 3_em;
+  const RawPixel SOCIAL_INFO_CHILDREN_SPACE = 12_em;
+}
+
 class DetailsScrollView : public nux::ScrollView
 {
 public:
@@ -64,8 +71,16 @@
 
 SocialPreview::SocialPreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
+, image_data_layout_(nullptr)
+, main_social_info_(nullptr)
+, social_content_layout_(nullptr)
+, social_data_layout_(nullptr)
+, social_info_layout_(nullptr)
+, icon_layout_(nullptr)
+, actions_layout_(nullptr)
 {
   SetupViews();
+  UpdateScale(scale);
 }
 
 SocialPreview::~SocialPreview()
@@ -122,23 +137,22 @@
 
   auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
-  nux::VLayout* social_content_layout = new nux::VLayout();
-  social_content_layout->SetSpaceBetweenChildren(16);
-  
+  nux::VLayout* social_content_layout_ = new nux::VLayout();
+  social_content_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   if (social_preview_model->description.Get().length() > 0)
   {
     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);
+    social_content_layout_->AddView(content_.GetPointer(), 1);
   } else {
     image_ = new CoverArt();
     AddChild(image_.GetPointer());
     UpdateCoverArtImage(image_.GetPointer());
-    social_content_layout->AddView(image_.GetPointer(), 1);
+    social_content_layout_->AddView(image_.GetPointer(), 1);
   }
 
   /////////////////////
@@ -146,34 +160,35 @@
     /////////////////////
     // Social Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
       /////////////////////
       // Main Social Info
-      nux::HLayout* main_social_info = new nux::HLayout();
-      main_social_info->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails());
+      main_social_info_ = new nux::HLayout();
+      main_social_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
 
         /////////////////////
         // 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()));
+        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)));
         AddChild(avatar_.GetPointer());
-        avatar_->SetMinMaxSize(style.GetAvatarAreaWidth(), style.GetAvatarAreaHeight());
+        avatar_->SetMinMaxSize(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale));
         avatar_->mouse_click.connect(on_mouse_down);
-        icon_layout->AddView(avatar_.GetPointer(), 0);
+        icon_layout_->AddView(avatar_.GetPointer(), 0);
 
         /////////////////////
 
         /////////////////////
         // Data
-        nux::VLayout* social_data_layout = new nux::VLayout();
-        social_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
+        social_data_layout_ = new nux::VLayout();
+        social_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
 
         title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
         AddChild(title_.GetPointer());
         title_->SetLines(-1);
+        title_->SetScale(scale);
         title_->SetFont(style.title_font().c_str());
         title_->mouse_click.connect(on_mouse_down);
 
@@ -181,17 +196,18 @@
         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);
-        social_data_layout->AddView(subtitle_.GetPointer(), 0);
-        social_data_layout->AddSpace(0, 1);
+        social_data_layout_->AddView(title_.GetPointer(), 0);
+        social_data_layout_->AddView(subtitle_.GetPointer(), 0);
+        social_data_layout_->AddSpace(0, 1);
 
         // buffer space
         /////////////////////
 
-      main_social_info->AddLayout(icon_layout, 0);
-      main_social_info->AddLayout(social_data_layout, 1);
+      main_social_info_->AddLayout(icon_layout_, 0);
+      main_social_info_->AddLayout(social_data_layout_, 1);
       /////////////////////
 
       /////////////////////
@@ -200,16 +216,16 @@
       social_info->EnableHorizontalScrollBar(false);
       social_info->mouse_click.connect(on_mouse_down);
 
-      nux::VLayout* social_info_layout = new nux::VLayout();
-      social_info_layout->SetSpaceBetweenChildren(12);
-      social_info->SetLayout(social_info_layout);
+      social_info_layout_ = new nux::VLayout();
+      social_info_layout_->SetSpaceBetweenChildren(SOCIAL_INFO_CHILDREN_SPACE.CP(scale));
+      social_info->SetLayout(social_info_layout_);
 
       if (!preview_model_->GetInfoHints().empty())
       {
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetAvatarAreaWidth());
         AddChild(preview_info_hints_.GetPointer());
         preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        social_info_layout->AddView(preview_info_hints_.GetPointer(), 0);
+        social_info_layout_->AddView(preview_info_hints_.GetPointer(), 0);
       }
       /////////////////////
       // Comments/Replies
@@ -232,29 +248,29 @@
         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);
+        social_info_layout_->AddView(comments_layout, 0);
       }
 
       /////////////////////
       // 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_social_info, 0, nux::MINOR_POSITION_START);
+    full_data_layout_->AddLayout(main_social_info_, 0, nux::MINOR_POSITION_START);
     full_data_layout_->AddView(social_info, 1, nux::MINOR_POSITION_START);
     //full_data_layout_->AddView(comments_.GetPointer(), 1, nux::MINOR_POSITION_START);
 
-    full_data_layout_->AddLayout(actions_layout, 0);
+    full_data_layout_->AddLayout(actions_layout_, 0);
     /////////////////////
-  
-  image_data_layout->AddView(social_content_layout, 0);
-  image_data_layout->AddLayout(full_data_layout_, 1);
+
+  image_data_layout_->AddView(social_content_layout_, 0);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 void SocialPreview::PreLayoutManagement()
@@ -286,6 +302,50 @@
   Preview::PreLayoutManagement();
 }
 
+void SocialPreview::UpdateScale(double scale)
+{
+  Preview::UpdateScale(scale);
+
+  if (preview_info_hints_)
+    preview_info_hints_->scale = scale;
+
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (avatar_)
+  {
+    avatar_->SetMinMaxSize(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale));
+    avatar_->SetSize(MIN(style.GetAvatarAreaWidth().CP(scale), style.GetAvatarAreaHeight().CP(scale)));
+    avatar_->ReLoadIcon();
+  }
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (social_content_layout_)
+    social_content_layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+
+  if (main_social_info_)
+    main_social_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
+
+  if (icon_layout_)
+    icon_layout_->SetSpaceBetweenChildren(ICON_CHILDREN_SPACE.CP(scale));
+
+  if (social_data_layout_)
+    social_data_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
+
+  if (social_info_layout_)
+    social_info_layout_->SetSpaceBetweenChildren(SOCIAL_INFO_CHILDREN_SPACE.CP(scale));
+
+  if (actions_layout_)
+    actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
+
+  if (content_)
+    content_->scale = scale;
+
+  if (comments_)
+    comments_->scale = scale;
+}
+
 } // namespace previews
 } // namespace dash
 } // namepsace unity

=== modified file 'dash/previews/SocialPreview.h'
--- dash/previews/SocialPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/SocialPreview.h	2014-06-21 11:58:37 +0000
@@ -56,11 +56,20 @@
   virtual void PreLayoutManagement();
 
   virtual void SetupViews();
+  virtual void UpdateScale(double scale) override;
 
 protected:
   nux::VLayout* sender_layout_;
   nux::VLayout* title_layout_;
 
+  nux::HLayout* image_data_layout_;
+  nux::HLayout* main_social_info_;
+  nux::VLayout* social_content_layout_;
+  nux::VLayout* social_data_layout_;
+  nux::VLayout* social_info_layout_;
+  nux::VLayout* icon_layout_;
+  nux::Layout* actions_layout_;
+
   nux::ObjectPtr<IconTexture> avatar_;
   nux::ObjectPtr<SocialPreviewContent> content_;
   nux::ObjectPtr<SocialPreviewComments> comments_;

=== modified file 'dash/previews/SocialPreviewComments.cpp'
--- dash/previews/SocialPreviewComments.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/SocialPreviewComments.cpp	2014-06-21 11:58:37 +0000
@@ -40,16 +40,25 @@
 
 namespace
 {
-const int layout_spacing = 12;
+const RawPixel LAYOUT_SPACING = 12_em;
+const RawPixel CHILDREN_SPACE = 6_em;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(SocialPreviewComments);
 
 SocialPreviewComments::SocialPreviewComments(dash::Preview::Ptr preview_model, NUX_FILE_LINE_DECL)
 : 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()
@@ -87,13 +96,13 @@
   int comment_width = 0;
   for (Comment const& comment : comments_)
   {
-    int width = style.GetDetailsPanelMinimumWidth();
+    int width = style.GetDetailsPanelMinimumWidth().CP(scale);
     if (comment.first)
     {
       width = comment.first->GetTextExtents().width;
 
-      if (width < style.GetDetailsPanelMinimumWidth())
-        width = style.GetDetailsPanelMinimumWidth();
+      if (width < style.GetDetailsPanelMinimumWidth().CP(scale))
+        width = style.GetDetailsPanelMinimumWidth().CP(scale);
     }
 
     if (comment_width < width)
@@ -102,7 +111,7 @@
     }
   }
 
-  int comment_value_width = MAX(0, geo.width - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
+  int comment_value_width = MAX(0, geo.width - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale));
 
   for (Comment const& comment : comments_)
   {
@@ -122,7 +131,6 @@
 {
   dash::SocialPreview* social_preview_model = dynamic_cast<dash::SocialPreview*>(preview_model_.get());
 
-
   RemoveLayout();
   comments_.clear();
 
@@ -130,59 +138,58 @@
 
   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_ = new nux::VLayout();
+  layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   for (dash::SocialPreview::CommentPtr comment : social_preview_model->GetComments())
   {
-
-    nux::HLayout* name_layout = new nux::HLayout();
-    name_layout->SetSpaceBetweenChildren(layout_spacing);
-
-    StaticCairoTextPtr comment_name;
+    name_layout_ = new nux::HLayout();
+    name_layout_->SetSpaceBetweenChildren(LAYOUT_SPACING.CP(scale));
+
     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->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->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);
-
-    StaticCairoTextPtr comment_value(new StaticCairoText(comment->content, false, NUX_TRACKER_LOCATION));
-
-    comment_value->SetFont(style.info_hint_font());
-    comment_value->SetLines(-7);
-    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);
+
+    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
@@ -195,6 +202,24 @@
   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	2013-09-19 16:44:03 +0000
+++ dash/previews/SocialPreviewComments.h	2014-06-21 11:58:37 +0000
@@ -50,6 +50,8 @@
 
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
+  nux::Property<double> scale;
+
 protected:
 
   typedef nux::ObjectPtr<StaticCairoText> StaticCairoTextPtr;
@@ -70,10 +72,19 @@
   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	2013-11-19 18:48:35 +0000
+++ dash/previews/SocialPreviewContent.cpp	2014-06-21 11:58:37 +0000
@@ -38,16 +38,17 @@
 
 namespace
 {
-const int BUBBLE_WIDTH = 300;
-const int BUBBLE_HEIGHT = 250;
-const int TAIL_HEIGHT = 50;
-const int TAIL_POS_FROM_RIGHT = 60;
+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 RawPixel TEXT_LINE_SPACING = 5_em;
 }
 
-inline nux::Geometry GetBubbleGeometry(nux::Geometry const& geo)
+inline nux::Geometry GetBubbleGeometry(nux::Geometry const& geo, double scale)
 {
-  int width = MIN(BUBBLE_WIDTH, geo.width);
-  int height = MIN(BUBBLE_HEIGHT + TAIL_HEIGHT, geo.height);
+  int width = MIN(BUBBLE_WIDTH.CP(scale), geo.width);
+  int height = 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);
 }
@@ -56,10 +57,13 @@
 
 SocialPreviewContent::SocialPreviewContent(std::string const& text, NUX_FILE_LINE_DECL)
 : View(NUX_FILE_LINE_PARAM)
+, scale(1.0)
 {
   SetupViews();
   if (text.length() > 0)
     SetText(text);
+  UpdateScale(scale);
+  scale.changed.connect(sigc::mem_fun(this, &SocialPreviewContent::UpdateScale));
 }
 
 SocialPreviewContent::~SocialPreviewContent()
@@ -94,7 +98,7 @@
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> tex = cr_bubble_->GetTexture()->GetDeviceTexture();
 
-  nux::Geometry geo_bubble(GetBubbleGeometry(geo));
+  nux::Geometry geo_bubble(GetBubbleGeometry(geo, scale));
 
   gfx_engine.QRP_1Tex(geo_bubble.x,
                       geo_bubble.y,
@@ -134,8 +138,9 @@
 
   text_ = new StaticCairoText("", false, NUX_TRACKER_LOCATION);
   text_->SetLines(-8);
+  text_->SetScale(scale);
   text_->SetFont(style.content_font());
-  text_->SetLineSpacing(5);
+  text_->SetLineSpacing(TEXT_LINE_SPACING.CP(scale));
   text_->SetTextEllipsize(StaticCairoText::NUX_ELLIPSIZE_MIDDLE);
   text_->mouse_click.connect(on_mouse_down);
 
@@ -153,10 +158,10 @@
 {
   nux::Geometry const& geo = GetGeometry();
 
-  nux::Geometry geo_cr(GetBubbleGeometry(geo));
+  nux::Geometry geo_cr(GetBubbleGeometry(geo, scale));
 
   int max_width = std::max(0, (int)(geo_cr.width - 2*(geo_cr.width*0.1)));
-  int max_height = std::max(0, (int)((geo_cr.height - TAIL_HEIGHT) - 2*((geo_cr.height - TAIL_HEIGHT)*0.1)));
+  int max_height = std::max(0, (int)((geo_cr.height - TAIL_HEIGHT.CP(scale)) - 2*((geo_cr.height - TAIL_HEIGHT.CP(scale))*0.1)));
 
   // this will update the texture with the actual size of the text.
   text_->SetMaximumHeight(max_height);
@@ -314,6 +319,12 @@
   introspection.add(GetAbsoluteGeometry());
 }
 
+void SocialPreviewContent::UpdateScale(double scale)
+{
+  if (text_)
+    text_->SetScale(scale);
+}
+
 }
 }
 }

=== modified file 'dash/previews/SocialPreviewContent.h'
--- dash/previews/SocialPreviewContent.h	2013-09-19 16:44:03 +0000
+++ dash/previews/SocialPreviewContent.h	2014-06-21 11:58:37 +0000
@@ -52,6 +52,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);
@@ -76,6 +78,8 @@
   virtual void AddProperties(debug::IntrospectionData&);
 
 private:
+  void UpdateScale(double scale);
+
   nux::ObjectPtr<StaticCairoText> text_;
 
   typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;