Merge lp:~macslow/unity/unity.fix-924884 into lp:unity

[Mirco Müller]

Fixed artwork-assets to be correctly cropped to intended size. Replaced procedural vector drawing methods with newly added artwork-textures. Updated sizes and margins to adapt to new artwork. Added FIXME-hint for keyboard-navigation highlight implementation.

Also see size/gap verification in gimp for screenshot of newly implemented rating-stars:
http://people.canonical.com/~mmueller/fix-924884.png

[Andrea Cimitan (cimi)]

The stars are correctly rendered at the moment, what is currently broken in the filter pane is a lot of padding and spacing. Might worth fixing it after those elements gets in

review: Approve (design)

[Andrea Cimitan (cimi)]

(at the moment = with this branch. thanks mirco!)

[Andrea Azzarone (azzar1)]

388 + // FIXME: A small hint for the keyboard-navigation highlight... you can use
389 + // the method...
390 + //
391 + // style.GetStarHighlightIcon()
392 + //
393 + // ... to get the correct texture from the style/theme and use an opacity of
394 + // .5 for blending it over the regular star-textures.
395 + //
396 + //GfxContext.QRP_1Tex(geo_star.x,
397 + // geo_star.y,
398 + // geo_star.width,
399 + // geo_star.height,
400 + // style.GetStarHighlightIcon()->GetDeviceTexture(),
401 + // texxform,
402 + // nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
403 +
404 + geo_star.x += geo_star.width + star_gap;

Thanks for this :)

Code looks good.

review: Approve

=== added file 'plugins/unityshell/resources/star_deselected.png'
Binary files plugins/unityshell/resources/star_deselected.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/star_deselected.png	2012-02-20 12:18:30 +0000 differ
=== added file 'plugins/unityshell/resources/star_highlight.png'
Binary files plugins/unityshell/resources/star_highlight.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/star_highlight.png	2012-02-20 12:18:30 +0000 differ
=== added file 'plugins/unityshell/resources/star_selected.png'
Binary files plugins/unityshell/resources/star_selected.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/star_selected.png	2012-02-20 12:18:30 +0000 differ
=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-02-07 20:46:22 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-02-20 12:18:30 +0000
@@ -110,8 +110,6 @@
 
   void SetDefaultValues();
 
-  void Star(cairo_t* cr, double size);
-
   void GetTextExtents(int& width,
                       int& height,
                       int  maxWidth,
@@ -215,6 +213,9 @@
   LazyLoadTexture group_unexpand_texture_;
   LazyLoadTexture group_expand_texture_;
 
+  LazyLoadTexture star_deselected_texture_;
+  LazyLoadTexture star_selected_texture_;
+  LazyLoadTexture star_highlight_texture_;
 };
 
 Style::Impl::Impl(Style* owner)
@@ -247,6 +248,9 @@
   , search_spin_glow_texture_("/search_spin_glow.png")
   , group_unexpand_texture_("/dash_group_unexpand.png")
   , group_expand_texture_("/dash_group_expand.png")
+  , star_deselected_texture_("/star_deselected.png")
+  , star_selected_texture_("/star_selected.png")
+  , star_highlight_texture_("/star_highlight.png")
 {
   signal_manager_.Add(new glib::Signal<void, GtkSettings*, GParamSpec*>
                       (gtk_settings_get_default(),
@@ -669,43 +673,6 @@
   cairo_surface_mark_dirty(surface);
 }
 
-void Style::Impl::Star(cairo_t* cr, double size)
-{
-  double outter[5][2] = {{0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0}};
-  double inner[5][2]  = {{0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0},
-                         {0.0, 0.0}};
-  double angle[5]     = {-90.0, -18.0, 54.0, 126.0, 198.0};
-  double outterRadius = size;
-  double innerRadius  = size/1.75;
-
-  for (int i = 0; i < 5; i++)
-  {
-    outter[i][0] = outterRadius * cos(angle[i] * M_PI / 180.0);
-    outter[i][1] = outterRadius * sin(angle[i] * M_PI / 180.0);
-    inner[i][0]  = innerRadius * cos((angle[i] + 36.0) * M_PI / 180.0);
-    inner[i][1]  = innerRadius * sin((angle[i] + 36.0) * M_PI / 180.0);
-  }
-
-  cairo_move_to(cr, outter[0][0], outter[0][1]);
-  cairo_line_to(cr, inner[0][0], inner[0][1]);
-  cairo_line_to(cr, outter[1][0], outter[1][1]);
-  cairo_line_to(cr, inner[1][0], inner[1][1]);
-  cairo_line_to(cr, outter[2][0], outter[2][1]);
-  cairo_line_to(cr, inner[2][0], inner[2][1]);
-  cairo_line_to(cr, outter[3][0], outter[3][1]);
-  cairo_line_to(cr, inner[3][0], inner[3][1]);
-  cairo_line_to(cr, outter[4][0], outter[4][1]);
-  cairo_line_to(cr, inner[4][0], inner[4][1]);
-  cairo_close_path(cr);
-}
-
 void Style::Impl::SetDefaultValues()
 {
   // button-label
@@ -1786,90 +1753,6 @@
   return true;
 }
 
-bool Style::StarEmpty(cairo_t* cr, nux::ButtonVisualState state)
-{
-  // sanity checks
-  if (cairo_status(cr) != CAIRO_STATUS_SUCCESS)
-    return false;
-
-  if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
-    return false;
-
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
-  double radius = .85 * h / 2.0;
-
-  cairo_save(cr);
-  cairo_translate(cr, w / 2.0, h / 2.0);
-  pimpl->Star(cr, radius);
-  cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.2);
-  cairo_fill_preserve(cr);
-  cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
-	cairo_set_line_width(cr, 0.75);
-  cairo_stroke(cr);
-  cairo_restore(cr);
-
-  return true;
-}
-
-bool Style::StarHalf(cairo_t* cr, nux::ButtonVisualState state)
-{
-  // sanity checks
-  if (cairo_status(cr) != CAIRO_STATUS_SUCCESS)
-    return false;
-
-  if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
-    return false;
-
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
-  double radius = .85 * h / 2.0;
-
-  cairo_pattern_t* pattern = NULL;
-  pattern = cairo_pattern_create_linear(0.0, 0.0, w, 0.0);
-  cairo_pattern_add_color_stop_rgba(pattern, 0.0,        1.0, 1.0, 1.0, 1.0);
-  cairo_pattern_add_color_stop_rgba(pattern,  .5,        1.0, 1.0, 1.0, 1.0);
-  cairo_pattern_add_color_stop_rgba(pattern,  .5 + 0.01, 1.0, 1.0, 1.0, 0.2);
-  cairo_pattern_add_color_stop_rgba(pattern, 1.0,        1.0, 1.0, 1.0, 0.2);
-  cairo_set_source(cr, pattern);
-
-  cairo_save(cr);
-  cairo_translate(cr, w / 2.0, h / 2.0);
-  pimpl->Star(cr, radius);
-  cairo_fill_preserve(cr);
-  cairo_pattern_destroy(pattern);
-  cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
-	cairo_set_line_width(cr, 0.75);
-  cairo_stroke(cr);
-  cairo_restore(cr);
-
-  return true;
-}
-
-bool Style::StarFull(cairo_t* cr, nux::ButtonVisualState state)
-{
-  // sanity checks
-  if (cairo_status(cr) != CAIRO_STATUS_SUCCESS)
-    return false;
-
-  if (cairo_surface_get_type(cairo_get_target(cr)) != CAIRO_SURFACE_TYPE_IMAGE)
-    return false;
-
-  double w = cairo_image_surface_get_width(cairo_get_target(cr));
-  double h = cairo_image_surface_get_height(cairo_get_target(cr));
-  double radius = .85 * h / 2.0;
-
-  cairo_save(cr);
-  cairo_translate(cr, w / 2.0, h / 2.0);
-  pimpl->Star(cr, radius);
-  cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
-  cairo_fill_preserve(cr);
-  cairo_stroke(cr); // to make sure it's as "large" as the empty and half ones
-  cairo_restore(cr);
-
-  return true;
-}
-
 bool Style::MultiRangeSegment(cairo_t*    cr,
                               nux::ButtonVisualState  state,
                               std::string const& label,
@@ -2256,6 +2139,21 @@
   return pimpl->group_expand_texture_.texture();
 }
 
+nux::BaseTexture* Style::GetStarDeselectedIcon()
+{
+  return pimpl->star_deselected_texture_.texture();
+}
+
+nux::BaseTexture* Style::GetStarSelectedIcon()
+{
+  return pimpl->star_selected_texture_.texture();
+}
+
+nux::BaseTexture* Style::GetStarHighlightIcon()
+{
+  return pimpl->star_highlight_texture_.texture();
+}
+
 nux::BaseTexture* Style::GetDashShine()
 {
   return pimpl->dash_shine_.texture();

=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-02-10 12:12:45 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-02-20 12:18:30 +0000
@@ -106,12 +106,6 @@
 
   virtual bool ButtonFocusOverlay(cairo_t* cr);
 
-  virtual bool StarEmpty(cairo_t* cr, nux::ButtonVisualState state);
-
-  virtual bool StarHalf(cairo_t* cr, nux::ButtonVisualState state);
-
-  virtual bool StarFull(cairo_t* cr, nux::ButtonVisualState state);
-
   virtual bool MultiRangeSegment(cairo_t*    cr,
                                  nux::ButtonVisualState  state,
                                  std::string const& label,
@@ -192,6 +186,10 @@
   nux::BaseTexture* GetGroupUnexpandIcon();
   nux::BaseTexture* GetGroupExpandIcon();
 
+  nux::BaseTexture* GetStarDeselectedIcon();
+  nux::BaseTexture* GetStarSelectedIcon();
+  nux::BaseTexture* GetStarHighlightIcon();
+
   sigc::signal<void> changed;
 
 private:

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2012-02-20 12:18:30 +0000
@@ -27,15 +27,19 @@
 #include "DashStyle.h"
 #include "FilterRatingsButton.h"
 
+namespace
+{
+const int star_size = 28;
+const int star_gap  = 10;
+}
+
 namespace unity
 {
 namespace dash
 {
-
 FilterRatingsButton::FilterRatingsButton(NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
 {
-  InitTheme();
   SetAcceptKeyNavFocusOnMouseDown(false);
 
   mouse_up.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseUp));
@@ -58,73 +62,6 @@
   return "FilterRatingsButton";
 }
 
-void FilterRatingsButton::InitTheme()
-{
-  if (!active_empty_)
-  {
-    nux::Geometry geometry(GetGeometry());
-    geometry.width /= 5;
-
-    active_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
-    normal_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
-    prelight_empty_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 0, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
-
-    active_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
-    normal_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
-    prelight_half_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 1, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
-
-    active_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
-    normal_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
-    prelight_full_.reset(new nux::CairoWrapper(geometry, sigc::bind(sigc::mem_fun(this, &FilterRatingsButton::RedrawTheme), 2, nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
-  }
-}
-
-void FilterRatingsButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, int type, nux::ButtonVisualState faked_state)
-{
-  Style& dash_style = Style::Instance();
-  if (type == 0)
-  {
-    // empty
-    dash_style.StarEmpty(cr, faked_state);
-  }
-  else if (type == 1)
-  {
-    // half
-    dash_style.StarHalf(cr, faked_state);
-  }
-  else
-  {
-    // full
-    dash_style.StarFull(cr, faked_state);
-  }
-}
-
-long FilterRatingsButton::ComputeContentSize()
-{
-  long ret = nux::Button::ComputeContentSize();
-  nux::Geometry geo(GetGeometry());
-
-  if (cached_geometry_ != geo)
-  {
-    geo.width = 27;
-    active_empty_->Invalidate(geo);
-    normal_empty_->Invalidate(geo);
-    prelight_empty_->Invalidate(geo);
-
-    active_half_->Invalidate(geo);
-    normal_half_->Invalidate(geo);
-    prelight_half_->Invalidate(geo);
-
-    active_full_->Invalidate(geo);
-    normal_full_->Invalidate(geo);
-    prelight_full_->Invalidate(geo);
-
-    cached_geometry_ = geo;
-  }
-
-  return ret;
-}
-
 void FilterRatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   int rating = 0;
@@ -138,12 +75,11 @@
   //    int total_half_stars = rating % 2;
   //    int total_full_stars = rating / 2;
   int total_full_stars = rating;
-  int total_half_stars = 0;
 
   nux::Geometry const& geo = GetGeometry();
   nux::Geometry geo_star(geo);
-  geo_star.width = 27;
-
+  geo_star.width = star_size;
+	
   gPainter.PaintBackground(GfxContext, geo);
   // set up our texture mode
   nux::TexCoordXForm texxform;
@@ -166,33 +102,25 @@
 
   for (int index = 0; index < 5; index++)
   {
-    nux::BaseTexture* texture = normal_empty_->GetTexture();
+	Style& style = Style::Instance();
+    nux::BaseTexture* texture = style.GetStarSelectedIcon();	  
     if (index < total_full_stars)
     {
       if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-        texture = normal_full_->GetTexture();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-        texture = prelight_full_->GetTexture();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-        texture = active_full_->GetTexture();
-    }
-    else if (index < total_full_stars + total_half_stars)
-    {
-      if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-        texture = normal_half_->GetTexture();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-        texture = prelight_half_->GetTexture();
-      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-        texture = active_half_->GetTexture();
+        texture = style.GetStarSelectedIcon();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
+        texture = style.GetStarSelectedIcon();
+      else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
+        texture = style.GetStarSelectedIcon();
     }
     else
     {
       if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
-        texture = normal_empty_->GetTexture();
+        texture = style.GetStarDeselectedIcon();
       else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)
-        texture = prelight_empty_->GetTexture();
+        texture = style.GetStarDeselectedIcon();
       else if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_PRESSED)
-        texture = active_empty_->GetTexture();
+        texture = style.GetStarDeselectedIcon();
     }
 
     GfxContext.QRP_1Tex(geo_star.x,
@@ -203,7 +131,23 @@
                         texxform,
                         nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
 
-    geo_star.x += geo_star.width + 10;
+    // FIXME: A small hint for the keyboard-navigation highlight... you can use
+	// the method...
+	//
+    //   style.GetStarHighlightIcon()
+	//
+	// ... to get the correct texture from the style/theme and use an opacity of
+	// .5 for blending it over the regular star-textures.
+	//
+    //GfxContext.QRP_1Tex(geo_star.x,
+    //                    geo_star.y,
+    //                    geo_star.width,
+    //                    geo_star.height,
+    //                    style.GetStarHighlightIcon()->GetDeviceTexture(),
+    //                    texxform,
+    //                    nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
+
+    geo_star.x += geo_star.width + star_gap;
 
   }
 
@@ -242,4 +186,4 @@
 }
 
 } // namespace dash
-} // namespace unity
+} // namespace unity
\ No newline at end of file

=== modified file 'plugins/unityshell/src/FilterRatingsButton.h'
--- plugins/unityshell/src/FilterRatingsButton.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/FilterRatingsButton.h	2012-02-20 12:18:30 +0000
@@ -45,29 +45,12 @@
   std::string GetFilterType();
 
 protected:
-  virtual long ComputeContentSize();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
-  void InitTheme();
-  void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, int type, nux::ButtonVisualState faked_state);
-
   void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
   void OnRatingsChanged(int rating);
 
-  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
-
-  NuxCairoPtr active_empty_;
-  NuxCairoPtr normal_empty_;
-  NuxCairoPtr prelight_empty_;
-  NuxCairoPtr active_half_;
-  NuxCairoPtr normal_half_;
-  NuxCairoPtr prelight_half_;
-  NuxCairoPtr active_full_;
-  NuxCairoPtr normal_full_;
-  NuxCairoPtr prelight_full_;
-  nux::Geometry cached_geometry_;
-
   dash::RatingsFilter::Ptr filter_;
 
 };

=== modified file 'plugins/unityshell/src/FilterRatingsWidget.cpp'
--- plugins/unityshell/src/FilterRatingsWidget.cpp	2012-02-09 20:19:30 +0000
+++ plugins/unityshell/src/FilterRatingsWidget.cpp	2012-02-20 12:18:30 +0000
@@ -30,6 +30,13 @@
 #include "FilterRatingsButton.h"
 #include "FilterRatingsWidget.h"
 
+namespace
+{
+const int top_padding    = 11;
+const int bottom_padding = 12;
+const int star_size      = 28;
+}
+
 namespace unity
 {
 namespace dash
@@ -43,8 +50,9 @@
   all_button_ = new FilterAllButton(NUX_TRACKER_LOCATION);
 
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout->SetTopAndBottomPadding(11, 12);
+  layout->SetTopAndBottomPadding(top_padding, bottom_padding);
   ratings_ = new FilterRatingsButton(NUX_TRACKER_LOCATION);
+  ratings_->SetMinimumHeight(star_size);
 
   layout->AddView(ratings_);