Merge lp:~hikiko/unity/unity.scale-application-components into lp:unity

[Eleni Maria Stea]

Scaled the ApplicationPreview and the containing widgets and components.

Scaled the ApplicationPreview and the containing widgets and components.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

fixed the PreLayoutManagement

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

Ok, problematic code has been fixed here.

review: Approve

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2014-06-17 18:22:57 +0000
+++ dash/previews/ApplicationPreview.cpp	2014-06-17 18:22:57 +0000
@@ -46,6 +46,16 @@
 {
 namespace previews
 {
+
+namespace
+{
+  const RawPixel ICON_SPACE_CHILDREN = 3_em;
+  const RawPixel DATA_SPACE_CHILDREN = 16_em;
+  const RawPixel INFO_SPACE_CHILDREN = 12_em;
+  const RawPixel COPYRIGHT_SPACE_CHILDREN = 8_em;
+  const RawPixel ICON_SIZE = 72_em;
+}
+
 DECLARE_LOGGER(logger, "unity.dash.preview.application");
 
 class DetailsScrollView : public nux::ScrollView
@@ -121,8 +131,8 @@
 
   auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
-  nux::HLayout* image_data_layout = new nux::HLayout();
-  image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
+  image_data_layout_ = new nux::HLayout();
+  image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
 
   /////////////////////
   // Image
@@ -134,34 +144,34 @@
     /////////////////////
     // App Data Panel
     full_data_layout_ = new nux::VLayout();
-    full_data_layout_->SetPadding(style.GetDetailsTopMargin(), 0, style.GetDetailsBottomMargin(), style.GetDetailsLeftMargin());
-    full_data_layout_->SetSpaceBetweenChildren(16);
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN);
 
       /////////////////////
       // Main App Info
-      nux::HLayout* main_app_info = new nux::HLayout();
-      main_app_info->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails());
+      main_app_info_ = new nux::HLayout();
+      main_app_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
 
         /////////////////////
         // Icon Layout
-        nux::VLayout* icon_layout = new nux::VLayout();
-        icon_layout->SetSpaceBetweenChildren(3);
-        app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", 72);
+        icon_layout_ = new nux::VLayout();
+        icon_layout_->SetSpaceBetweenChildren(ICON_SPACE_CHILDREN.CP(scale));
+        app_icon_ = new IconTexture(app_preview_model->app_icon.Get().RawPtr() ? g_icon_to_string(app_preview_model->app_icon.Get().RawPtr()) : "", ICON_SIZE.CP(scale));
         AddChild(app_icon_.GetPointer());
-        app_icon_->SetMinimumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
-        app_icon_->SetMaximumSize(style.GetAppIconAreaWidth(), style.GetAppIconAreaWidth());
+        app_icon_->SetMinimumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+        app_icon_->SetMaximumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
         app_icon_->mouse_click.connect(on_mouse_down);
-        icon_layout->AddView(app_icon_.GetPointer(), 0);
+        icon_layout_->AddView(app_icon_.GetPointer(), 0);
 
         if (app_preview_model->rating >= 0) {
           app_rating_ = new PreviewRatingsWidget();
           AddChild(app_rating_.GetPointer());
-          app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight());
-          app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight());
+          app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+          app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
           app_rating_->SetRating(app_preview_model->rating);
           app_rating_->SetReviews(app_preview_model->num_ratings);
           app_rating_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-          icon_layout->AddView(app_rating_.GetPointer(), 0);
+          icon_layout_->AddView(app_rating_.GetPointer(), 0);
         }
 
         /////////////////////
@@ -169,11 +179,11 @@
         /////////////////////
         // Data
 
-        nux::VLayout* app_data_layout = new nux::VLayout();
-        app_data_layout->SetSpaceBetweenChildren(16);
+        app_data_layout_ = new nux::VLayout();
+        app_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
 
         title_subtitle_layout_ = new nux::VLayout();
-        title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
+        title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle().CP(scale));
 
         title_ = new StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
         AddChild(title_.GetPointer());
@@ -192,8 +202,8 @@
           title_subtitle_layout_->AddView(subtitle_.GetPointer(), 1);
         }
 
-        nux::VLayout* app_updated_copywrite_layout = new nux::VLayout();
-        app_updated_copywrite_layout->SetSpaceBetweenChildren(8);
+        app_updated_copywrite_layout_ = new nux::VLayout();
+        app_updated_copywrite_layout_->SetSpaceBetweenChildren(COPYRIGHT_SPACE_CHILDREN.CP(scale));
 
         if (!app_preview_model->license.Get().empty())
         {
@@ -202,7 +212,7 @@
           license_->SetFont(style.app_license_font().c_str());
           license_->SetLines(-1);
           license_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(license_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(license_.GetPointer(), 1);
         }
 
         if (!app_preview_model->last_update.Get().empty())
@@ -214,7 +224,7 @@
           AddChild(last_update_.GetPointer());
           last_update_->SetFont(style.app_last_update_font().c_str());
           last_update_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(last_update_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(last_update_.GetPointer(), 1);
         }
 
         if (!app_preview_model->copyright.Get().empty())
@@ -224,17 +234,17 @@
           copywrite_->SetFont(style.app_copywrite_font().c_str());
           copywrite_->SetLines(-1);
           copywrite_->mouse_click.connect(on_mouse_down);
-          app_updated_copywrite_layout->AddView(copywrite_.GetPointer(), 1);
+          app_updated_copywrite_layout_->AddView(copywrite_.GetPointer(), 1);
         }
 
-        app_data_layout->AddLayout(title_subtitle_layout_);
-        app_data_layout->AddLayout(app_updated_copywrite_layout);
+        app_data_layout_->AddLayout(title_subtitle_layout_);
+        app_data_layout_->AddLayout(app_updated_copywrite_layout_);
 
         // buffer space
         /////////////////////
 
-      main_app_info->AddLayout(icon_layout, 0);
-      main_app_info->AddLayout(app_data_layout, 1);
+      main_app_info_->AddLayout(icon_layout_, 0);
+      main_app_info_->AddLayout(app_data_layout_, 1);
       /////////////////////
 
       /////////////////////
@@ -243,9 +253,9 @@
       app_info->EnableHorizontalScrollBar(false);
       app_info->mouse_click.connect(on_mouse_down);
 
-      nux::VLayout* app_info_layout = new nux::VLayout();
-      app_info_layout->SetSpaceBetweenChildren(12);
-      app_info->SetLayout(app_info_layout);
+      app_info_layout_ = new nux::VLayout();
+      app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN);
+      app_info->SetLayout(app_info_layout_);
 
       if (!preview_model_->description.Get().empty())
       {
@@ -256,7 +266,7 @@
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
         description_->mouse_click.connect(on_mouse_down);
-        app_info_layout->AddView(description_.GetPointer());
+        app_info_layout_->AddView(description_.GetPointer());
       }
 
       if (!preview_model_->GetInfoHints().empty())
@@ -264,7 +274,7 @@
         preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
         AddChild(preview_info_hints_.GetPointer());
         preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        app_info_layout->AddView(preview_info_hints_.GetPointer());
+        app_info_layout_->AddView(preview_info_hints_.GetPointer());
       }
       /////////////////////
 
@@ -275,17 +285,17 @@
       actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
       ///////////////////
 
-    full_data_layout_->AddLayout(main_app_info, 0);
+    full_data_layout_->AddLayout(main_app_info_, 0);
     full_data_layout_->AddView(app_info, 1);
     full_data_layout_->AddLayout(actions_layout, 0);
     /////////////////////
   
-  image_data_layout->AddView(image_.GetPointer(), 0);
-  image_data_layout->AddLayout(full_data_layout_, 1);
+  image_data_layout_->AddView(image_.GetPointer(), 0);
+  image_data_layout_->AddLayout(full_data_layout_, 1);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(image_data_layout);
+  SetLayout(image_data_layout_);
 }
 
 void ApplicationPreview::PreLayoutManagement()
@@ -296,12 +306,14 @@
 
   nux::Geometry geo_art(geo.x, geo.y, style.GetAppImageAspectRatio() * geo.height, geo.height);
 
-  if (geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() < style.GetDetailsPanelMinimumWidth())
-    geo_art.width = MAX(0, geo.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin() - style.GetDetailsPanelMinimumWidth());
+  int content_width = geo.width - style.GetPanelSplitWidth().CP(scale) - style.GetDetailsLeftMargin().CP(scale) - style.GetDetailsRightMargin().CP(scale);
+  if (content_width - geo_art.width < style.GetDetailsPanelMinimumWidth().CP(scale))
+    geo_art.width = std::max(0, content_width - style.GetDetailsPanelMinimumWidth().CP(scale));
+
   image_->SetMinMaxSize(geo_art.width, geo_art.height);
 
-  int details_width = MAX(0, geo.width - geo_art.width - style.GetPanelSplitWidth() - style.GetDetailsLeftMargin() - style.GetDetailsRightMargin());
-  int top_app_info_max_width = MAX(0, details_width - style.GetAppIconAreaWidth() - style.GetSpaceBetweenIconAndDetails());
+  int details_width = std::max(0, content_width - geo_art.width);
+  int top_app_info_max_width = std::max(0, details_width - style.GetAppIconAreaWidth().CP(scale) - style.GetSpaceBetweenIconAndDetails().CP(scale));
 
   if (title_) { title_->SetMaximumWidth(top_app_info_max_width); }
   if (subtitle_) { subtitle_->SetMaximumWidth(top_app_info_max_width); }
@@ -312,12 +324,65 @@
 
   for (nux::AbstractButton* button : action_buttons_)
   {
-    button->SetMinMaxSize(CLAMP(RawPixel((details_width - style.GetSpaceBetweenActions()) / 2), 0_em, style.GetActionButtonMaximumWidth()), style.GetActionButtonHeight());
+    button->SetMinMaxSize(CLAMP((details_width - style.GetSpaceBetweenActions().CP(scale)) / 2, 0, style.GetActionButtonMaximumWidth().CP(scale)), style.GetActionButtonHeight().CP(scale));
   }
 
   Preview::PreLayoutManagement();
 }
 
+void ApplicationPreview::UpdateScale(double scale)
+{
+  previews::Style& style = dash::previews::Style::Instance();
+
+  if (app_icon_)
+  {
+    app_icon_->SetSize(ICON_SIZE.CP(scale));
+    app_icon_->SetMinimumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+    app_icon_->SetMaximumSize(style.GetAppIconAreaWidth().CP(scale), style.GetAppIconAreaWidth().CP(scale));
+    app_icon_->ReLoadIcon();
+  }
+
+  if (license_)
+    license_->SetScale(scale);
+  if (last_update_)
+    last_update_->SetScale(scale);
+  if (copywrite_)
+    copywrite_->SetScale(scale);
+
+  if (app_rating_)
+  {
+    app_rating_->scale = scale;
+    app_rating_->SetMaximumHeight(style.GetRatingWidgetHeight().CP(scale));
+    app_rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
+  }
+
+  if (image_data_layout_)
+    image_data_layout_->SetSpaceBetweenChildren(style.GetPanelSplitWidth().CP(scale));
+
+  if (full_data_layout_)
+  {
+    full_data_layout_->SetPadding(style.GetDetailsTopMargin().CP(scale), 0, style.GetDetailsBottomMargin().CP(scale), style.GetDetailsLeftMargin().CP(scale));
+    full_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
+  }
+
+  if (main_app_info_)
+    main_app_info_->SetSpaceBetweenChildren(style.GetSpaceBetweenIconAndDetails().CP(scale));
+
+  if (icon_layout_)
+    icon_layout_->SetSpaceBetweenChildren(ICON_SPACE_CHILDREN.CP(scale));
+
+  if (app_data_layout_)
+    app_data_layout_->SetSpaceBetweenChildren(DATA_SPACE_CHILDREN.CP(scale));
+
+  if (app_info_layout_)
+    app_info_layout_->SetSpaceBetweenChildren(INFO_SPACE_CHILDREN.CP(scale));
+
+  if (app_updated_copywrite_layout_)
+    app_updated_copywrite_layout_->SetSpaceBetweenChildren(COPYRIGHT_SPACE_CHILDREN.CP(scale));
+
+  Preview::UpdateScale(scale);
+}
+
 } // namespace previews
 } // namespace dash
 } // namepsace unity
 
=== modified file 'dash/previews/ApplicationPreview.h'
--- dash/previews/ApplicationPreview.h	2013-09-19 16:44:03 +0000
+++ dash/previews/ApplicationPreview.h	2014-06-17 18:22:57 +0000
@@ -54,9 +54,17 @@
   virtual void PreLayoutManagement();
 
   virtual void SetupViews();
+  void UpdateScale(double scale) override;
 
 protected:
   nux::VLayout* title_subtitle_layout_;
+  nux::HLayout* image_data_layout_;
+  nux::HLayout* main_app_info_;
+  nux::VLayout* icon_layout_;
+  nux::VLayout* app_data_layout_;
+  nux::VLayout* app_updated_copywrite_layout_;
+  nux::VLayout* app_info_layout_;
+  nux::Layout* actions_layout_;
 
   nux::ObjectPtr<IconTexture> app_icon_;
   nux::ObjectPtr<PreviewRatingsWidget> app_rating_;
 
=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2013-11-19 18:48:35 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2014-06-17 18:22:57 +0000
@@ -38,31 +38,42 @@
 namespace previews
 {
 
+namespace
+{
+  const RawPixel CHILDREN_SPACE = 3_em;
+  const RawPixel RATINGS_SIZE = 18_em;
+  const RawPixel RATINGS_GAP = 2_em;
+}
+
 NUX_IMPLEMENT_OBJECT_TYPE(PreviewRatingsWidget);
 
 PreviewRatingsWidget::PreviewRatingsWidget(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
 {
-  nux::VLayout* layout = new nux::VLayout();
-  layout->SetSpaceBetweenChildren(3);
+  layout_ = new nux::VLayout();
+  layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
 
   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(RATINGS_SIZE.CP(scale), RATINGS_GAP.CP(scale));
   ratings_->SetEditable(false);
   ratings_->mouse_click.connect(on_mouse_down);
-  layout->AddView(ratings_);
+  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_);
+  layout_->AddView(reviews_);
 
   mouse_click.connect(on_mouse_down);
 
-  SetLayout(layout);
+  SetLayout(layout_);
+
+  scale.changed.connect(sigc::mem_fun(this, &PreviewRatingsWidget::UpdateScale));
 }
 
 PreviewRatingsWidget::~PreviewRatingsWidget()
@@ -114,6 +125,26 @@
     .add(GetAbsoluteGeometry());
 }
 
+void PreviewRatingsWidget::UpdateScale(double scale)
+{
+  if (reviews_)
+    reviews_->SetScale(scale);
+
+  if (ratings_)
+  {
+    ratings_->star_gap_ = RATINGS_SIZE.CP(scale);
+    ratings_->star_gap_ = RATINGS_GAP.CP(scale);
+  }
+
+  preview_container_.scale = scale;
+
+  if (layout_)
+    layout_->SetSpaceBetweenChildren(CHILDREN_SPACE.CP(scale));
+
+  QueueRelayout();
+  QueueDraw();
+}
+
 } // 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-06-17 18:22:57 +0000
@@ -52,6 +52,8 @@
 
   void SetReviews(int count);
 
+  nux::Property<double> scale;
+
   sigc::signal<void> request_close() const { return preview_container_.request_close; }
 
 protected:
@@ -65,9 +67,13 @@
   void AddProperties(debug::IntrospectionData&);
 
 private:
+  void UpdateScale(double scale);
+
   RatingsButton* ratings_;
   StaticCairoText* reviews_;
 
+  nux::VLayout* layout_;
+
   PreviewContainer preview_container_;
 };
 
 
=== modified file 'unity-shared/RatingsButton.cpp'
--- unity-shared/RatingsButton.cpp	2013-11-19 18:48:35 +0000
+++ unity-shared/RatingsButton.cpp	2014-06-17 18:22:57 +0000
@@ -36,11 +36,11 @@
 {
 RatingsButton::RatingsButton(int star_size, int star_gap, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
+  , star_size_(star_size)
+  , star_gap_(star_gap)
   , editable_(true)
   , rating_(0.0)
   , focused_star_(-1)
-  , star_size_(star_size)
-  , star_gap_(star_gap)
 {
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(true);
 
=== modified file 'unity-shared/RatingsButton.h'
--- unity-shared/RatingsButton.h	2013-09-19 16:44:03 +0000
+++ unity-shared/RatingsButton.h	2014-06-17 18:22:57 +0000
@@ -41,6 +41,9 @@
   virtual void SetRating(float rating);
   virtual float GetRating() const;
 
+  int star_size_;
+  int star_gap_;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
@@ -67,8 +70,6 @@
   bool editable_;
   float rating_;
   int focused_star_;
-  int star_size_;
-  int star_gap_;
 };
 
 } // namespace unity