Merge lp:~gordallott/unity/places-subpix-rendering into lp:unity

[Gord Allott]

enables subpixel rendering in places text, also increases the font size by one point, mainly just because the font provides thicker text there which is much more appealing

[Didier Roche-Tolomelli (didrocks)]

approved!

review: Approve

=== modified file 'src/PlacesSimpleTile.cpp'
--- src/PlacesSimpleTile.cpp	2011-03-16 21:54:33 +0000
+++ src/PlacesSimpleTile.cpp	2011-03-21 10:26:26 +0000
@@ -28,7 +28,7 @@
 
 #include <NuxImage/GdkGraphics.h>
 #include <gtk/gtk.h>
-
+#include <gdk/gdk.h>
 
 PlacesSimpleTile::PlacesSimpleTile (const char *icon_name,
                                     const char *label,
@@ -40,6 +40,10 @@
   _icon (NULL),
   _uri (NULL)
 {
+  GtkSettings *settings = gtk_settings_get_default ();
+  gchar *font = NULL;
+  gchar *fontstring = NULL;
+  
   nux::VLayout *layout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
 
   _label = g_strdup (label);
@@ -52,7 +56,11 @@
 
   _cairotext = new nux::StaticCairoText (_label);
   _cairotext->SinkReference ();
-  _cairotext->SetFont ("Ubuntu normal 9");
+
+  g_object_get (settings, "gtk-font-name", &font, NULL);
+  fontstring = g_strdup_printf ("%s normal 10", font);
+  
+  _cairotext->SetFont (fontstring);
   _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_START);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
   _cairotext->SetMaximumWidth (140);
@@ -67,6 +75,9 @@
   SetLayout (layout);
 
   SetDndEnabled (true, false);
+
+  g_free (font);
+  g_free (fontstring);
 }
 
 
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-03-10 12:42:07 +0000
+++ src/StaticCairoText.cpp	2011-03-21 10:26:26 +0000
@@ -414,9 +414,15 @@
                                         (float) dpi / (float) PANGO_SCALE);
   }
 
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-  cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.0f);
+  //cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint (cr);
+
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  //cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.0f);
+  //cairo_paint (cr);
   cairo_set_source_rgba (cr, color.R (),color.G (), color.B (), color.A ());
 
   pango_layout_context_changed (layout);