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

[Mirco Müller]

This branch fixes a lot of the issues stated in the mega-bug LP: #841945. But since it so much not everything is done yet. Still already done fixes should move into trunk as soon as possible. Here's a list of done fixes:

from the list of positioning issues:
- The Category Headers are positioned wrong (too far left, too low)
- The magnifying glass inside the search box is positioned wrong (should be further to the left)
- There is too much space below each category header
- "Filter results" header is positioned wrong (should be right and slightly up)
- The "All" button is aligned incorrectly relative to the other filter buttons (right sides should fall on the same vertical axis)

from the list of shape issues:
- "Filter results" is the wrong font size and weight
- The corner radius of the search filter toggle boxes is wrong
- The 'rating' stars are the wrong size
- the un-selected 'rating' star has the wrong border
- the 1px dividers in-between the categories should be narrower with 15px margin on each side
- the dividers in between the filter results categories are missing
- the 'All' button's shape is very wrong
- the filter results category headers are with wrong font size and weight

Here's a screenshot of the new looks http://people.canonical.com/~mmueller/fix-841945-1.jpg

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'plugins/unityshell/resources/dash-widgets.json'
--- plugins/unityshell/resources/dash-widgets.json	2011-09-01 08:40:57 +0000
+++ plugins/unityshell/resources/dash-widgets.json	2011-09-08 08:00:25 +0000
@@ -48,9 +48,9 @@
     "text-opacity"   : [      1.0,       1.0,       1.0,       1.0,       1.0], 
     "fill-color"     : ["#FFFFFF", "#000000", "#ffffff", "#000000", "#000000"],
     "fill-opacity"   : [      0.5,       0.0,      0.25,       0.0,       0.0],
-    "overlay-opacity": [      0.7,      0.35,       0.7,       0.0,       0.0],
+    "overlay-opacity": [      0.1,       0.1,       0.1,       0.0,       0.0],
     "overlay-mode"   : [ "normal",  "normal",  "normal",  "normal",  "normal"],
-    "blur-size"      : [        4,         2,         4,         0,         0]},
+    "blur-size"      : [        1,         1,         1,         0,         0]},
 
   "track-view"       : {
     "line-gap"         : 26.0,

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2011-09-07 21:45:10 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2011-09-08 08:00:25 +0000
@@ -62,9 +62,9 @@
   bg_layer_ = new nux::ColorLayer(nux::Color(0xff595853), true);
 
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
-  layout_->SetHorizontalInternalMargin(12);
+  layout_->SetHorizontalInternalMargin(0);
   layout_->SetVerticalExternalMargin(12);
-  layout_->SetHorizontalExternalMargin(18);
+  layout_->SetHorizontalExternalMargin(10);
   SetLayout(layout_);
 
   spinner_ = new SearchBarSpinner();

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2011-09-08 03:04:04 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2011-09-08 08:00:25 +0000
@@ -847,7 +847,7 @@
                            {0.0, 0.0}};
     double angle[5]     = {-90.0, -18.0, 54.0, 126.0, 198.0};
     double outterRadius = size;
-    double innerRadius  = size/2.0;
+    double innerRadius  = size/1.75;
 
     for (int i = 0; i < 5; i++)
     {
@@ -1545,22 +1545,25 @@
                         double*     color,
                         double      opacity,
                         std::string label)
-  {
-    double                x          = 0.0;
-    double                y          = 0.0;
-    int                   w          = 0;
-    int                   h          = 0;
-    PangoLayout*          layout     = NULL;
-    PangoFontDescription* desc       = NULL;
-    PangoContext*         pangoCtx   = NULL;
-    int                   dpi        = 0;
-    GdkScreen*            screen     = gdk_screen_get_default();   // not ref'ed
-    GtkSettings*          settings   = gtk_settings_get_default(); // not ref'ed
-    gchar*                fontName   = NULL;
+   {
+    double                x           = 0.0;
+    double                y           = 0.0;
+    int                   w           = 0;
+    int                   h           = 0;
+    PangoLayout*          layout      = NULL;
+    PangoFontDescription* desc        = NULL;
+    PangoContext*         pangoCtx    = NULL;
+    int                   dpi         = 0;
+    GdkScreen*            screen      = gdk_screen_get_default();   // not ref'ed
+    GtkSettings*          settings    = gtk_settings_get_default(); // not ref'ed
+    gchar*                fontName    = NULL;
+    double                horizMargin = 10.0;
 
     w = cairo_image_surface_get_width (cairo_get_target (cr));
     h = cairo_image_surface_get_height (cairo_get_target (cr));
 
+    w -= 2 * horizMargin;
+
     if (!screen)
       cairo_set_font_options(cr, _defaultFontOptions);
     else
@@ -1624,7 +1627,7 @@
 	PangoRectangle ink = {0, 0, 0, 0};
     PangoRectangle log = {0, 0, 0, 0};
     pango_layout_get_extents (layout, &ink, &log);
-	x = ((double) w - pango_units_to_double (ink.width)) / 2.0;
+	x = ((double) w - pango_units_to_double (ink.width)) / 2.0 + horizMargin;
     y = ((double) h - pango_units_to_double (log.height)) / 2.0;
     cairo_move_to (cr, x, y);
     pango_cairo_show_layout(cr, layout);
@@ -1748,7 +1751,7 @@
                  1.0,
                  (double) (garnish),
                  (double) (garnish),
-                 h / 4.0,
+                 7.0,
                  w - (double) (2 * garnish),
                  h - (double) (2 * garnish),
                  false);
@@ -1797,16 +1800,17 @@
     double h = cairo_image_surface_get_height (cairo_get_target (cr));
     double radius = .85 * h / 2.0;
 
-  cairo_save (cr);
+    cairo_save (cr);
     cairo_translate (cr, w / 2.0, h / 2.0);
     Star (cr, radius);
-  cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.2);
+    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, 1.0);
+    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);
+    cairo_restore (cr);
 
-  return true;
+    return true;
   }
 
   bool DashStyle::StarHalf (cairo_t* cr, nux::State state)
@@ -1822,24 +1826,25 @@
     double h = cairo_image_surface_get_height (cairo_get_target (cr));
     double radius = .85 * h / 2.0;
 
-  cairo_pattern_t* pattern = NULL;
+    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, 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_set_source (cr, pattern);
 
-  cairo_save (cr);
+    cairo_save (cr);
     cairo_translate (cr, w / 2.0, h / 2.0);
     Star (cr, radius);
-  cairo_fill_preserve (cr);
+    cairo_fill_preserve (cr);
     cairo_pattern_destroy (pattern);
-  cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0);
+    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);
+    cairo_restore (cr);
 
-  return true;
+    return true;
   }
 
   bool DashStyle::StarFull (cairo_t* cr, nux::State state)

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2011-09-08 08:00:25 +0000
@@ -35,7 +35,7 @@
       , contents_ (NULL)
       , right_hand_contents_ (NULL)
       , expander_graphic_ (NULL)
-      , label_("<span font_size='larger'>" + label + "</span>")
+      , label_("<span size='larger' weight='bold'>" + label + "</span>")
   {
     expanded.changed.connect (sigc::mem_fun(this, &FilterExpanderLabel::DoExpandChange));
     BuildLayout ();
@@ -47,7 +47,7 @@
 
   void FilterExpanderLabel::SetLabel (std::string label)
   {
-    label_ = "<span font_size='larger'>" + label + "</span>";
+    label_ = "<span size='larger' weight='bold'>" + label + "</span>";
     cairo_label_->SetText(label_.c_str());
   }
 
@@ -86,6 +86,8 @@
     top_bar_layout_->AddSpace(1, 1);
 
     layout_->AddLayout (top_bar_layout_, 0);
+    layout_->SetVerticalInternalMargin(12);
+
     SetLayout(layout_);
 
     QueueRelayout();

=== modified file 'plugins/unityshell/src/FilterGenreWidget.cpp'
--- plugins/unityshell/src/FilterGenreWidget.cpp	2011-09-07 21:25:18 +0000
+++ plugins/unityshell/src/FilterGenreWidget.cpp	2011-09-08 08:00:25 +0000
@@ -48,15 +48,12 @@
     genre_layout_ = new nux::GridHLayout(NUX_TRACKER_LOCATION);
     genre_layout_->ForceChildrenSize(true);
     genre_layout_->SetHeightMatchContent(true);
-    genre_layout_->SetVerticalInternalMargin (0);
-    genre_layout_->SetHorizontalInternalMargin (0);
+    genre_layout_->SetVerticalInternalMargin (12);
+    genre_layout_->SetVerticalExternalMargin (12);
+    genre_layout_->SetHorizontalInternalMargin (10);
     genre_layout_->EnablePartialVisibility (false);
-
-    DashStyle *dash_style = DashStyle::GetDefault();
-    int garnish = 2 * dash_style->GetButtonGarnishSize();
-
-    genre_layout_->SetChildrenSize (style->GetTileWidth() - 12,
-                                    garnish + style->GetTextLineHeight() * 2);
+    genre_layout_->SetChildrenSize (style->GetTileWidth() - 12, 35);
+    genre_layout_->Reference();
 
     SetRightHandView(all_button_);
     SetContents(genre_layout_);
@@ -146,9 +143,17 @@
 
   void FilterGenre::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
     nux::Geometry geo = GetGeometry();
+    nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
 
     GfxContext.PushClippingRectangle(geo);
     nux::GetPainter().PaintBackground(GfxContext, geo);
+
+    nux::GetPainter().Draw2DLine(GfxContext,
+                                 geo.x, geo.y + geo.height - 1,
+                                 geo.x + geo.width, geo.y + geo.height - 1,
+                                 col,
+                                 col);
+
     GfxContext.PopClippingRectangle();
   }
 

=== modified file 'plugins/unityshell/src/FilterMultiRangeWidget.cpp'
--- plugins/unityshell/src/FilterMultiRangeWidget.cpp	2011-09-07 21:25:18 +0000
+++ plugins/unityshell/src/FilterMultiRangeWidget.cpp	2011-09-08 08:00:25 +0000
@@ -43,6 +43,8 @@
     all_button_->Reference();
 
     layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+    layout_->Reference();
+    layout_->SetVerticalExternalMargin (12);
 
     SetRightHandView(all_button_);
     SetContents(layout_);
@@ -177,9 +179,17 @@
 
   void FilterMultiRange::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) {
     nux::Geometry geo = GetGeometry();
+    nux::Color col(0.2f, 0.2f, 0.2f, 0.2f);
 
     GfxContext.PushClippingRectangle(geo);
     nux::GetPainter().PaintBackground(GfxContext, geo);
+
+    nux::GetPainter().Draw2DLine(GfxContext,
+                                 geo.x, geo.y + geo.height - 1,
+                                 geo.x + geo.width, geo.y + geo.height - 1,
+                                 col,
+                                 col);
+
     GfxContext.PopClippingRectangle();
   }
 

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2011-09-06 18:30:26 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2011-09-08 08:00:25 +0000
@@ -120,7 +120,8 @@
     if (cached_geometry_ != GetGeometry())
     {
       nux::Geometry geometry = GetGeometry();
-      geometry.width /= 5;
+      //geometry.width /= 5;
+      geometry.width = 27;
       prelight_empty_->Invalidate(geometry);
       active_empty_->Invalidate(geometry);
       normal_empty_->Invalidate(geometry);
@@ -151,7 +152,8 @@
     int total_half_stars = rating % 2;
 
     nux::Geometry geometry = GetGeometry ();
-    geometry.width = geometry.width / 5;
+    //geometry.width = geometry.width / 5;
+    geometry.width = 27;
 
     gPainter.PaintBackground(GfxContext, GetGeometry());
     // set up our texture mode
@@ -210,7 +212,7 @@
                           texxform,
                           nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
 
-      geometry.x += geometry.width;
+      geometry.x += geometry.width + 10;
 
     }
 
@@ -227,7 +229,8 @@
   }
 
   void FilterRatingsButton::RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags) {
-    int width = GetGeometry().width;
+    //int width = GetGeometry().width;
+    int width = 180;
     float new_rating = (static_cast<float>(x) / width) + 0.10f;
     if (filter_ != NULL)
       filter_->rating = new_rating;

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2011-09-02 03:40:15 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2011-09-08 08:00:25 +0000
@@ -66,7 +66,8 @@
 
   _cached_name = NULL;
   _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
-  _group_layout->SetVerticalExternalMargin(12);
+  _group_layout->SetVerticalExternalMargin(15);
+  _group_layout->SetHorizontalExternalMargin(19);
 
   _header_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   _group_layout->AddLayout(_header_layout, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FULL);
@@ -305,8 +306,8 @@
 
   if (_draw_sep)
     nux::GetPainter().Draw2DLine(GfxContext,
-                                 geo.x, geo.y + geo.height - 1,
-                                 geo.x + geo.width, geo.y + geo.height - 1,
+                                 geo.x + 10, geo.y + geo.height - 1,
+                                 geo.x + geo.width - 10, geo.y + geo.height - 1,
                                  col,
                                  col);