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

[Mirco Müller]

Fixed issues:

- Category header icons are too large
- The font size of category header titles is too larged
- The search result icons are too small
- The search filter toggle boxes are too high
- The search filter toggle boxes are too narrow
- the search box is too short
- The the font size of the text underneath each icon in the search results is too large
- The size and shape of the arrow that points to the currently selected Dash Lens is incorrect

See:
http://people.canonical.com/~mmueller/fix-844889-1.jpg

Issues that can't be fixed, because it would introduce some sort of regression or would otherwise cause breakage:
- The search box is positioned wrong (centre should align with the center of the BFB, should start a few px to the left)
- There is too much space between the individual icons in the search result
- There is too much space below each category header
- The desktop dash box is much too large (both height and width)
- the expand/collapse triangle is the wrong shape and size
- the expand/collapse triangle is missing from the filter results category headers

NOTE: We're still also waiting for an ACK regarding the UIFe from the documentation-team

[Gord Allott (gordallott)]

worked well here

review: Approve

=== modified file 'plugins/unityshell/resources/dash-widgets.json'
--- plugins/unityshell/resources/dash-widgets.json	2011-09-06 15:54:50 +0000
+++ plugins/unityshell/resources/dash-widgets.json	2011-09-15 10:02:37 +0000
@@ -42,7 +42,7 @@
   "button-label": {
     "border-opacity" : [      1.0,       0.5,       0.5,       0.5,       0.5],
     "border-color"   : ["#ffffff", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#FFFFFF"],
-    "border-size"    : [      2.0,       0.5,       1.0,       0.5,       0.5],
+    "border-size"    : [      2.0,       1.0,       1.0,       0.5,       0.5],
     "text-size"      : 1.0,
     "text-color"     : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"],
     "text-opacity"   : [      1.0,       1.0,       1.0,       1.0,       1.0], 

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2011-09-08 12:43:05 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2011-09-15 10:02:37 +0000
@@ -90,7 +90,7 @@
   layered_layout_->SetPaintAll(true);
   layered_layout_->SetActiveLayerN(1);
   layered_layout_->SetMinimumWidth(420);
-  layered_layout_->SetMaximumWidth(620);
+  layered_layout_->SetMaximumWidth(645);
   layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FIX);
 
   std::string filter_str = _("Filter results");

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2011-09-08 07:55:05 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2011-09-15 10:02:37 +0000
@@ -1754,7 +1754,7 @@
                  7.0,
                  w - (double) (2 * garnish),
                  h - (double) (2 * garnish),
-                 false);
+                 true);
 
     if (_buttonLabelFillOpacity[state] != 0.0)
     {

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2011-09-12 03:57:01 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2011-09-15 10:02:37 +0000
@@ -75,6 +75,7 @@
     top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
 
     cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
+    cairo_label_->SetFontName("Ubuntu 10");
     cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
     cairo_label_->mouse_down.connect(
       [&](int x, int y, unsigned long button_flags, unsigned long key_flag)

=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2011-09-11 16:51:43 +0000
+++ plugins/unityshell/src/LensBar.cpp	2011-09-15 10:02:37 +0000
@@ -60,11 +60,11 @@
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
-  layout_->SetHorizontalInternalMargin(32);
+  layout_->SetHorizontalInternalMargin(40);
   SetLayout(layout_);
 
-  SetMinimumHeight(40);
-  SetMaximumHeight(40);
+  SetMinimumHeight(46);
+  SetMaximumHeight(46);
 }
 
 void LensBar::SetupHomeLens()
@@ -116,6 +116,7 @@
   bg_layer_->SetGeometry(geo);
   nux::GetPainter().RenderSinglePaintLayer(gfx_context, geo, bg_layer_);
 
+	
   gfx_context.PopClippingRectangle();
 }
 
@@ -128,7 +129,23 @@
   layout_->ProcessDraw(gfx_context, force_draw);
 
   nux::GetPainter().PopBackground();
-  
+
+  for (auto icon: icons_)
+    if (icon->active)
+	{
+      nux::Geometry geo = icon->GetGeometry();
+      int middle = geo.x + geo.width/2;
+      int size = 5;
+      int y = geo.y - 11;
+
+      nux::GetPainter().Draw2DTriangleColor(gfx_context,
+                                            middle - size, y,
+                                            middle, y + size,
+                                            middle + size, y,
+                                            nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+
+	}
+
   gfx_context.PopClippingRectangle();
 }
 

=== modified file 'plugins/unityshell/src/LensBarIcon.cpp'
--- plugins/unityshell/src/LensBarIcon.cpp	2011-08-22 17:17:26 +0000
+++ plugins/unityshell/src/LensBarIcon.cpp	2011-09-15 10:02:37 +0000
@@ -28,15 +28,15 @@
 NUX_IMPLEMENT_OBJECT_TYPE(LensBarIcon);
 
 LensBarIcon::LensBarIcon(std::string id_, std::string icon_hint)
-  : IconTexture(icon_hint.c_str(), 26)
+  : IconTexture(icon_hint.c_str(), 24)
   , id(id_)
   , active(false)
   , inactive_opacity_(0.4f)
 {
-  SetMinimumWidth(26);
-  SetMaximumWidth(26);
-  SetMinimumHeight(40);
-  SetMaximumHeight(40);
+  SetMinimumWidth(24);
+  SetMaximumWidth(24);
+  SetMinimumHeight(24);
+  SetMaximumHeight(24);
   SetOpacity(inactive_opacity_);
 
   active.changed.connect(sigc::mem_fun(this, &LensBarIcon::OnActiveChanged));
@@ -75,19 +75,6 @@
                       texture()->GetDeviceTexture(),
                       texxform,
                       col);
-  if (active)
-  {
-    nux::Geometry geo = GetGeometry();
-    int middle = geo.x + geo.width/2;
-    int size = 4;
-    int y = geo.y + 1;
-
-    nux::GetPainter().Draw2DTriangleColor(gfx_context,
-                                          middle - size, y,
-                                          middle, y + size,
-                                          middle + size, y,
-                                          nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
-  }
 
   gfx_context.PopClippingRectangle();
 }

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2011-09-07 15:03:07 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2011-09-15 10:02:37 +0000
@@ -147,7 +147,7 @@
 {
   // Spaces are on purpose, want padding to be proportional to the size of the text
   // Bear with me, I'm trying something different :)
-  const gchar* temp = "    <span font_size='larger'>%s</span>    ";
+  const gchar* temp = "    %s    ";
   gchar* tmp = NULL;
   gchar* final = NULL;
   if (_cached_name != NULL)

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-09-13 22:35:13 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2011-09-15 10:02:37 +0000
@@ -364,6 +364,7 @@
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
   layout = pango_cairo_create_layout(cr);
   desc = pango_font_description_from_string(font.Value());
+  pango_font_description_set_size (desc, 9 * PANGO_SCALE);
 
   pango_layout_set_font_description(layout, desc);
   pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);