Merge lp:~canonical-dx-team/unity/unity.fix-697791 into lp:unity

[Mirco Müller]

Corrected slight alignment-issue of text position. Fixes LP: #697791

=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-01-04 04:28:22 +0000
+++ src/StaticCairoText.cpp	2011-01-06 13:59:08 +0000
@@ -283,7 +283,7 @@
 
   pango_layout_context_changed (layout);
 
-  cairo_move_to (cr, 0.0f, 0.0f);
+  cairo_move_to (cr, -1.0f, 1.0f);
   pango_cairo_show_layout (cr, layout);
 
   // clean up

=== modified file 'src/Tooltip.cpp'
--- src/Tooltip.cpp	2011-01-04 04:28:22 +0000
+++ src/Tooltip.cpp	2011-01-06 13:59:08 +0000
@@ -423,15 +423,6 @@
     gfloat* rgba_hl,
     gfloat* rgba_dot)
   {
-    /*cairo_surface_t* dots_surf    = NULL;
-    cairo_t*         dots_cr      = NULL;
-    cairo_pattern_t* dots_pattern = NULL;
-    cairo_pattern_t* hl_pattern   = NULL;*/
-
-    // create context for dot-pattern
-    /*dots_surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 4, 4);
-    dots_cr = cairo_create (dots_surf);*/
-
     // clear normal context
     cairo_scale (cr, 1.0f, 1.0f);
     cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.0f);
@@ -450,52 +441,7 @@
       rgba_tint[1],
       rgba_tint[2],
       rgba_tint[3]);
-    //cairo_fill_preserve (cr);
-    cairo_fill (cr);
-
-    // create pattern in dot-context
-    /*cairo_set_operator (dots_cr, CAIRO_OPERATOR_CLEAR);
-    cairo_paint (dots_cr);
-    cairo_scale (dots_cr, 1.0f, 1.0f);
-    cairo_set_operator (dots_cr, CAIRO_OPERATOR_OVER);
-    cairo_set_source_rgba (dots_cr,
-      rgba_dot[0],
-      rgba_dot[1],
-      rgba_dot[2],
-      rgba_dot[3]);
-    cairo_rectangle (dots_cr, 0.0f, 0.0f, 1.0f, 1.0f);
-    cairo_fill (dots_cr);
-    cairo_rectangle (dots_cr, 2.0f, 2.0f, 1.0f, 1.0f);
-    cairo_fill (dots_cr);
-    dots_pattern = cairo_pattern_create_for_surface (dots_surf);*/
-
-    // fill path of normal context with dot-pattern
-    /*cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    cairo_set_source (cr, dots_pattern);
-    cairo_pattern_set_extend (dots_pattern, CAIRO_EXTEND_REPEAT);
-    cairo_fill_preserve (cr);
-    cairo_pattern_destroy (dots_pattern);
-    cairo_surface_destroy (dots_surf);
-    cairo_destroy (dots_cr);*/
-
-    // draw highlight
-    /*cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    hl_pattern = cairo_pattern_create_radial (hl_x,
-      hl_y,
-      0.0f,
-      hl_x,
-      hl_y,
-      hl_size);
-    cairo_pattern_add_color_stop_rgba (hl_pattern,
-      0.0f,
-      1.0f,
-      1.0f,
-      1.0f,
-      0.65f);
-    cairo_pattern_add_color_stop_rgba (hl_pattern, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f);
-    cairo_set_source (cr, hl_pattern);
-    cairo_fill (cr);
-    cairo_pattern_destroy (hl_pattern);*/
+    cairo_fill (cr);
   }
 
   void _setup (cairo_surface_t** surf,
@@ -505,13 +451,6 @@
     gint              height,
     gboolean          negative)
   {
-//     // create context
-//     if (outline)
-//       *surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-//     else
-//       *surf = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
-//     *cr = cairo_create (*surf);
-
     // clear context
     cairo_scale (*cr, 1.0f, 1.0f);
     if (outline)
@@ -573,10 +512,6 @@
       return;
     }
 
-    //gint dynamic_size = height - 2*radius - 2*padding - anchor_height;
-    //gint upper_dynamic_size = upper_size;
-    //gint lower_dynamic_size = dynamic_size - upper_dynamic_size;
-
     if(upper_size >= 0)
     {
       if(upper_size > height - 2.0f * radius - anchor_height -2 * padding)
@@ -757,7 +692,6 @@
     _draw (cr, TRUE, line_width, rgba_shadow, FALSE, FALSE);
     ctk_surface_blur (surf, blur_coeff);
     compute_mask (cr);
-    //compute_outline (cr, line_width, rgba_line);
   }
 
   void compute_full_mask (