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

[Mirco Müller]

This fixes the alignment of the baseline of both text-labels (both on the same baseline now), uses updated/correct artwork-assets for the expander-arrows and corrects the spacing between icon, name, expander-label and expander-arrows.

There is no test other than the before/after screenshots I provide here...

http://people.canonical.com/~mmueller/748101-before.png
http://people.canonical.com/~mmueller/748101-after.png

[Mikkel Kamstrup Erlandsen (kamstrup)]

It looks like the glow on the expander arrow is gone, is that on purpose?

[Adolfo Jayme Barrientos (fitojb)]

> It looks like the glow on the expander arrow is gone, is that on purpose?

Yes, see bug 748101 starting at comment 20

[Mikkel Kamstrup Erlandsen (kamstrup)]

Thanks for the pointer Fitoschido

[Sam Spilsbury (smspillaz)]

92 + //const gchar* temp = " %s ";
93 + //gchar* tmp = NULL;
94 gchar* final = NULL;
95 if (_cached_name != NULL)
96 {
97 @@ -161,13 +170,14 @@
98
99 _cached_name = g_strdup(name);
100
101 - tmp = g_markup_escape_text(name, -1);
102 + //tmp = g_markup_escape_text(name, -1);
103 + final = g_markup_escape_text(name, -1);
104
105 - final = g_strdup_printf(temp, tmp);
106 + //final = g_strdup_printf(temp, tmp);
107
108 _name->SetText(final);
109
110 - g_free(tmp);
111 + //g_free(tmp);
112 g_free(final);

I think this commented out code can be removed?

143 + /*nux::Color red(1.0, 0.0, 0.0, 1.0);
144 + nux::Color green(0.0, 1.0, 0.0, 1.0);
145 + nux::Color blue(0.0, 0.0, 1.0, 1.0);
146 +
147 + nux::Geometry geo;
148 + geo = _header_layout->GetGeometry();
149 + print_geo ("_header_layout", geo);
150 + geo = _text_layout->GetGeometry();
151 + print_geo ("_text_layout", geo);
152 + geo = _expand_layout->GetGeometry();
153 + print_geo ("_expand_layout", geo);
154 +
155 + nux::GetPainter().Paint2DQuadColor(GfxContext, _header_layout->GetGeometry(), red);
156 + nux::GetPainter().Paint2DQuadColor(GfxContext, _text_layout->GetGeometry(), green);
157 + nux::GetPainter().Paint2DQuadColor(GfxContext, _expand_layout->GetGeometry(), blue);*/

As can that (almost missed it)

128 +void print_geo (std::string text, nux::Geometry geo)
129 +{
130 + std::cout << text.c_str() << ": "
131 + << geo.GetWidth() << "/"
132 + << geo.GetHeight()
133 + << std::endl;
134 +}

Is this a debugging function? I'm not really against having them in the code, as long as they are done in a consistent way - I was discussing this with thumper the other day, we should look into having a header file with overloads for std::ostream & operator<< for types that need printing out a lot, maybe stuff we can just #ifdef out on non-debug builds

review: Needs Fixing (style)

[Mirco Müller (macslow)]

Fixed the raised issues.

[Sam Spilsbury (smspillaz)]

review: Approve (style)

=== modified file 'plugins/unityshell/resources/dash_group_expand.png'
Binary files plugins/unityshell/resources/dash_group_expand.png	2011-02-28 12:58:19 +0000 and plugins/unityshell/resources/dash_group_expand.png	2011-12-12 12:37:25 +0000 differ
=== modified file 'plugins/unityshell/resources/dash_group_unexpand.png'
Binary files plugins/unityshell/resources/dash_group_unexpand.png	2011-02-28 12:58:19 +0000 and plugins/unityshell/resources/dash_group_unexpand.png	2011-12-12 12:37:25 +0000 differ
=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2011-11-07 19:05:57 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2011-12-12 12:37:25 +0000
@@ -44,9 +44,9 @@
 
 #include "DashStyle.h"
 
-static const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.6f);
+static const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
 static const nux::Color kExpandHoverTextColor(1.0f, 1.0f, 1.0f, 1.0f);
-static const float kExpandDefaultIconOpacity = 0.6f;
+static const float kExpandDefaultIconOpacity = 0.5f;
 static const float kExpandHoverIconOpacity = 1.0f;
 
 namespace unity
@@ -72,16 +72,25 @@
   _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);
 
   _header_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
-  _group_layout->AddLayout(_header_layout, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FULL);
+  _header_layout->SetHorizontalInternalMargin(10);
+  _group_layout->AddLayout(_header_layout, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FIX);
 
   _icon = new IconTexture("", 24);
   _icon->SetMinMaxSize(24, 24);
   _header_layout->AddView(_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
+  _text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+  _text_layout->SetHorizontalInternalMargin(15);
+  _header_layout->AddLayout(_text_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
+  
   _name = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   _name->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _name->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_LEFT);
-  _header_layout->AddView(_name, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _text_layout->AddView(_name, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
+
+  _expand_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+  _expand_layout->SetHorizontalInternalMargin(8);
+  _text_layout->AddLayout(_expand_layout, 0, nux::MINOR_POSITION_END, nux::MINOR_SIZE_MATCHCONTENT);
 
   _expand_label = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   _expand_label->SetTextEllipsize(nux::StaticCairoText::NUX_ELLIPSIZE_END);
@@ -91,13 +100,13 @@
   _expand_label->OnKeyNavFocusActivate.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelActivated));
   _expand_label->OnKeyNavFocusChange.connect(sigc::mem_fun(this, &PlacesGroup::OnLabelFocusChanged));
 
-  _header_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _expand_layout->AddView(_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _expand_icon = new IconTexture(arrow, arrow->GetWidth(), arrow->GetHeight());
   _expand_icon->SetOpacity(kExpandDefaultIconOpacity);
   _expand_icon->SetMinimumSize(arrow->GetWidth(), arrow->GetHeight());
   _expand_icon->SetVisible(false);
-  _header_layout->AddView(_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _expand_layout->AddView(_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   SetLayout(_group_layout);
 
@@ -148,10 +157,6 @@
 void
 PlacesGroup::SetName(const char* name)
 {
-  // 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 = "    %s    ";
-  gchar* tmp = NULL;
   gchar* final = NULL;
   if (_cached_name != NULL)
   {
@@ -161,13 +166,10 @@
 
   _cached_name = g_strdup(name);
 
-  tmp = g_markup_escape_text(name, -1);
-
-  final = g_strdup_printf(temp, tmp);
+  final = g_markup_escape_text(name, -1);
 
   _name->SetText(final);
 
-  g_free(tmp);
   g_free(final);
 }
 
@@ -212,7 +214,7 @@
 void
 PlacesGroup::RefreshLabel()
 {
-  const char* temp = "<small>%s</small>";
+  const char* temp = "<span size='small'>%s</span>";
   char*       result_string;
   char*       final;
 

=== modified file 'plugins/unityshell/src/PlacesGroup.h'
--- plugins/unityshell/src/PlacesGroup.h	2011-11-28 21:27:17 +0000
+++ plugins/unityshell/src/PlacesGroup.h	2011-12-12 12:37:25 +0000
@@ -88,6 +88,8 @@
 private:
   nux::VLayout* _group_layout;
   nux::HLayout* _header_layout;
+  nux::HLayout* _text_layout;
+  nux::HLayout* _expand_layout;
   nux::View*  _child_view;
 
   IconTexture*          _icon;