Merge lp:~unity-team/unity/unity.fix-607251 into lp:unity

[Mirco Müller]

This branch implements custom checkmark- and radiobutton-items for quicklists. The design is based on a mockup image I received from Otto (via Neil) and some discussions with Otto during the Prague platform sprint.

Image-items are not meant to be used in quicklists I was told by Design.

Since there are still unanswered questions about item-alignment, but I don't want to further keep this defering I propose a merge now. Alignment questions, once answered by Design, can be addressed in a later branch.

[Gord Allott (gordallott)]

approved, couldn't test the radio items (lack of apps with radio items) but everything else seems to work fine :)

=== modified file 'unity-private/launcher/quicklist-check-menu-item.vala'
--- unity-private/launcher/quicklist-check-menu-item.vala	2010-07-22 19:32:14 +0000
+++ unity-private/launcher/quicklist-check-menu-item.vala	2010-08-05 14:54:49 +0000
@@ -51,11 +51,11 @@
       int width;
       int height;
       Gtk.Settings settings = Gtk.Settings.get_default ();
-      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
-                                                      this.label + " ☐",
-                                                      out width,
-                                                      out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      Unity.QuicklistRendering.get_text_extents (settings.gtk_font_name,
+                                                 this.label,
+                                                 out width,
+                                                 out height);
+      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN) + 30.0f;
       natural_width_p = min_width_p;
     }
 
@@ -125,21 +125,20 @@
 
       string formatted_label = Utils.strip_characters (label, "", "_", "_");
 
-      if (active)
-        formatted_label = "☑ " + formatted_label;
-      else
-        formatted_label = "☐ " + formatted_label;
-
-      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
-                                                 this.last_width,
-                                                 this.last_height,
-                                                 settings.gtk_font_name,
-                                                 formatted_label);
-      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
-                                                   this.last_width,
-                                                   this.last_height,
-                                                   settings.gtk_font_name,
-                                                   formatted_label);
+      //Unity.QuicklistRendering.RadioItem.normal_mask (normal_cr,
+      Unity.QuicklistRendering.CheckmarkItem.normal_mask (normal_cr,
+                                                          this.last_width,
+                                                          this.last_height,
+                                                          settings.gtk_font_name,
+                                                          formatted_label,
+                                                          active);
+      //Unity.QuicklistRendering.RadioItem.selected_mask (selected_cr,
+      Unity.QuicklistRendering.CheckmarkItem.selected_mask (selected_cr,
+                                                            this.last_width,
+                                                            this.last_height,
+                                                            settings.gtk_font_name,
+                                                            formatted_label,
+                                                            active);
 
       normal_layer.set_mask_from_surface (normal_surf);
       normal_layer.set_color (white_color);

=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala	2010-08-05 11:29:25 +0000
+++ unity-private/launcher/quicklist-controller.vala	2010-08-05 14:54:49 +0000
@@ -334,7 +334,8 @@
 
       else
         {
-          warning ("not a menu item we understand, %s", dbusmenuitem.property_get ("type"));
+          warning ("not a menu item we understand, %s",
+                   dbusmenuitem.property_get ("type"));
           return null;
         }
 

=== modified file 'unity-private/launcher/quicklist-image-menu-item.vala'
--- unity-private/launcher/quicklist-image-menu-item.vala	2010-07-22 19:32:14 +0000
+++ unity-private/launcher/quicklist-image-menu-item.vala	2010-08-05 14:54:49 +0000
@@ -52,10 +52,10 @@
       int width;
       int height;
       Gtk.Settings settings = Gtk.Settings.get_default ();
-      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
-                                                      this.label,
-                                                      out width,
-                                                      out height);
+      Unity.QuicklistRendering.get_text_extents (settings.gtk_font_name,
+                                                 this.label,
+                                                 out width,
+                                                 out height);
       min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
       natural_width_p = min_width_p;
     }

=== modified file 'unity-private/launcher/quicklist-menu-item.vala'
--- unity-private/launcher/quicklist-menu-item.vala	2010-07-22 19:32:14 +0000
+++ unity-private/launcher/quicklist-menu-item.vala	2010-08-05 14:54:49 +0000
@@ -53,10 +53,10 @@
       int width;
       int height;
       Gtk.Settings settings = Gtk.Settings.get_default ();
-      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
-                                                      this.label,
-                                                      out width,
-                                                      out height);
+      Unity.QuicklistRendering.get_text_extents (settings.gtk_font_name,
+                                                 this.label,
+                                                 out width,
+                                                 out height);
       min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
       natural_width_p = min_width_p;
     }

=== modified file 'unity-private/launcher/quicklist-radio-menu-item.vala'
--- unity-private/launcher/quicklist-radio-menu-item.vala	2010-07-22 19:32:14 +0000
+++ unity-private/launcher/quicklist-radio-menu-item.vala	2010-08-05 14:54:49 +0000
@@ -51,11 +51,11 @@
       int width;
       int height;
       Gtk.Settings settings = Gtk.Settings.get_default ();
-      Unity.QuicklistRendering.Item.get_text_extents (settings.gtk_font_name,
-                                                      this.label + " ☐",
-                                                      out width,
-                                                      out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      Unity.QuicklistRendering.get_text_extents (settings.gtk_font_name,
+                                                 this.label,
+                                                 out width,
+                                                 out height);
+      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN) + 30.0f;
       natural_width_p = min_width_p;
     }
 
@@ -125,21 +125,18 @@
 
       string formatted_label = Utils.strip_characters (label, "", "_", "_");
 
-      if (active)
-        formatted_label =  "◉ " + formatted_label;
-      else
-        formatted_label =  "○ " + formatted_label;
-
-      Unity.QuicklistRendering.Item.normal_mask (normal_cr,
-                                                 this.last_width,
-                                                 this.last_height,
-                                                 settings.gtk_font_name,
-                                                 formatted_label);
-      Unity.QuicklistRendering.Item.selected_mask (selected_cr,
-                                                   this.last_width,
-                                                   this.last_height,
-                                                   settings.gtk_font_name,
-                                                   formatted_label);
+      Unity.QuicklistRendering.RadioItem.normal_mask (normal_cr,
+                                                      this.last_width,
+                                                      this.last_height,
+                                                      settings.gtk_font_name,
+                                                      formatted_label,
+                                                      active);
+      Unity.QuicklistRendering.RadioItem.selected_mask (selected_cr,
+                                                        this.last_width,
+                                                        this.last_height,
+                                                        settings.gtk_font_name,
+                                                        formatted_label,
+                                                        active);
 
       normal_layer.set_mask_from_surface (normal_surf);
       normal_layer.set_color (white_color);

=== modified file 'unity/quicklist-rendering.vala'
--- unity/quicklist-rendering.vala	2010-06-30 11:39:35 +0000
+++ unity/quicklist-rendering.vala	2010-08-05 14:54:49 +0000
@@ -40,6 +40,99 @@
   const float ANCHOR_WIDTH           = 0.75f;
   const float ANCHOR_WIDTH_ABS       = 10.0f;
 
+  private static double
+  _align (double val)
+  {
+    double fract = val - (int) val;
+
+    if (fract != 0.5f)
+      return (double) ((int) val + 0.5f);
+    else
+      return val;
+  }
+
+  public static void
+  get_text_extents (string  font,
+                    string  text,
+                    out int width,
+                    out int height)
+  {
+    Cairo.Surface surface = new Cairo.ImageSurface (Cairo.Format.A1, 1, 1);
+    Cairo.Context cr = new Cairo.Context (surface);
+    Pango.Layout layout = Pango.cairo_create_layout (cr);
+    Gtk.Settings settings = Gtk.Settings.get_default ();
+    Pango.FontDescription desc = Pango.FontDescription.from_string (font);
+    desc.set_weight (Pango.Weight.NORMAL);
+    layout.set_font_description (desc);
+    layout.set_wrap (Pango.WrapMode.WORD_CHAR);
+    layout.set_ellipsize (Pango.EllipsizeMode.END);
+    layout.set_text (text, -1);
+    Pango.Context pango_context = layout.get_context ();
+    Gdk.Screen screen = Gdk.Screen.get_default ();
+    Pango.cairo_context_set_font_options (pango_context,
+                                          screen.get_font_options ());
+    Pango.cairo_context_set_resolution (pango_context,
+                                        (float) settings.gtk_xft_dpi /
+                                        (float) Pango.SCALE);
+    layout.context_changed ();
+    Pango.Rectangle log_rect;
+    layout.get_extents (null, out log_rect);
+    width  = log_rect.width / Pango.SCALE;
+    height = log_rect.height / Pango.SCALE;
+  }
+
+  private static void
+  _round_rect (Cairo.Context cr,
+               double        aspect,        // aspect-ratio
+               double        x,             // top-left corner
+               double        y,             // top-left corner
+               double        corner_radius, // "size" of the corners
+               double        width,         // width of the rectangle
+               double        height)        // height of the rectangle
+  {
+    double radius = corner_radius / aspect;
+
+    // top-left, right of the corner
+    cr.move_to (x + radius, y);
+
+    // top-right, left of the corner
+    cr.line_to (x + width - radius, y);
+
+    // top-right, below the corner
+    cr.arc (x + width - radius,
+            y + radius,
+            radius,
+            -90.0f * GLib.Math.PI / 180.0f,
+            0.0f * GLib.Math.PI / 180.0f);
+
+    // bottom-right, above the corner
+    cr.line_to (x + width, y + height - radius);
+
+    // bottom-right, left of the corner
+    cr.arc (x + width - radius,
+            y + height - radius,
+            radius,
+            0.0f * GLib.Math.PI / 180.0f,
+            90.0f * GLib.Math.PI / 180.0f);
+
+    // bottom-left, right of the corner
+    cr.line_to (x + radius, y + height);
+
+    // bottom-left, above the corner
+    cr.arc (x + radius,
+            y + height - radius,
+            radius,
+            90.0f * GLib.Math.PI / 180.0f,
+            180.0f * GLib.Math.PI / 180.0f);
+
+    // top-left, right of the corner
+    cr.arc (x + radius,
+            y + radius,
+            radius,
+            180.0f * GLib.Math.PI / 180.0f,
+            270.0f * GLib.Math.PI / 180.0f);
+  }
+
   public class Seperator : GLib.Object
   {
     public static void
@@ -87,90 +180,333 @@
     }
   }
 
+  public class CheckmarkItem : GLib.Object
+  {
+    public static void
+    normal_mask (Cairo.Context cr,
+                 int           w,
+                 int           h,
+                 string        font,
+                 string        text,
+                 bool          enabled)
+    {
+      // clear context
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      // setup correct filled-drawing
+      cr.set_operator (Cairo.Operator.SOURCE);
+      cr.scale (1.0f, 1.0f);
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+      cr.set_line_width (1.0f);
+
+      // draw checkmark
+      cr.save ();
+      cr.translate (_align ((30.0f - 16.0f) / 2.0f),
+                    _align (((double) h - 16.0f) / 2.0f));
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
+      _round_rect (cr,
+                   1.0f,   // aspect
+                   0.0f,   // top-left corner
+                   0.0f,   // top-left corner
+                   3.0f,   // "size" of the corners
+                   16.0f,  // width of the rectangle
+                   16.0f); // height of the rectangle
+      cr.stroke ();
+
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+
+      if (enabled)
+        {
+          cr.translate (3.0f, 1.0f);
+
+          cr.move_to (0.0f, 6.0f);
+          cr.line_to (0.0f, 8.0f);
+          cr.line_to (4.0f, 12.0f);
+          cr.line_to (6.0f, 12.0f);
+          cr.line_to (15.0f, 1.0f);
+          cr.line_to (15.0f, 0.0f);
+          cr.line_to (14.0f, 0.0f);
+          cr.line_to (5.0f, 9.0f);
+          cr.line_to (1.0f, 5.0f);
+          cr.close_path ();
+          cr.fill ();
+        }
+      cr.restore ();
+
+      // draw text
+      Pango.Layout layout = Pango.cairo_create_layout (cr);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Pango.FontDescription desc = Pango.FontDescription.from_string (font);
+      desc.set_weight (Pango.Weight.NORMAL);
+      layout.set_font_description (desc);
+      layout.set_wrap (Pango.WrapMode.WORD_CHAR);
+      layout.set_ellipsize (Pango.EllipsizeMode.END);
+      layout.set_text (text, -1);
+      Pango.Context pango_context = layout.get_context ();
+      Gdk.Screen screen = Gdk.Screen.get_default ();
+      Pango.cairo_context_set_font_options (pango_context,
+                                            screen.get_font_options ());
+      Pango.cairo_context_set_resolution (pango_context,
+                                          (float) settings.gtk_xft_dpi /
+                                          (float) Pango.SCALE);
+      layout.context_changed ();
+
+      int text_width;
+      int text_height;
+      get_text_extents (font, text, out text_width, out text_height);
+      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+                  (float) (h - text_height) / 2.0f);
+
+      Pango.cairo_show_layout (cr, layout);
+    }
+
+    public static void
+    selected_mask (Cairo.Context cr,
+                   int           w,
+                   int           h,
+                   string        font,
+                   string        text,
+                   bool          enabled)
+    {
+      // clear context
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      // setup correct filled-drawing
+      cr.set_operator (Cairo.Operator.SOURCE);
+      cr.scale (1.0f, 1.0f);
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+      cr.set_line_width (1.0f);
+
+      // draw rounded rectangle
+      _round_rect (cr,
+                   1.0f,
+                   0.5f,
+                   0.5f,
+                   ITEM_CORNER_RADIUS_ABS,
+                   w - 1.0f,
+                   h - 1.0f);
+      cr.fill ();
+
+      cr.set_source_rgba (0.0f, 0.0f, 0.0f, 0.0f);
+
+      // draw checkmark
+      cr.save ();
+      cr.translate (_align ((30.0f - 16.0f) / 2.0f),
+                    _align (((double) h - 16.0f) / 2.0f));
+
+      _round_rect (cr,
+                   1.0f,   // aspect
+                   0.0f,   // top-left corner
+                   0.0f,   // top-left corner
+                   3.0f,   // "size" of the corners
+                   16.0f,  // width of the rectangle
+                   16.0f); // height of the rectangle
+      cr.stroke ();
+
+      if (enabled)
+        {
+          cr.translate (3.0f, 1.0f);
+
+          cr.move_to (0.0f, 6.0f);
+          cr.line_to (0.0f, 8.0f);
+          cr.line_to (4.0f, 12.0f);
+          cr.line_to (6.0f, 12.0f);
+          cr.line_to (15.0f, 1.0f);
+          cr.line_to (15.0f, 0.0f);
+          cr.line_to (14.0f, 0.0f);
+          cr.line_to (5.0f, 9.0f);
+          cr.line_to (1.0f, 5.0f);
+          cr.close_path ();
+          cr.fill ();
+        }
+      cr.restore ();
+
+      // draw text
+      Pango.Layout layout = Pango.cairo_create_layout (cr);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Pango.FontDescription desc = Pango.FontDescription.from_string (font);
+      desc.set_weight (Pango.Weight.NORMAL);
+      layout.set_font_description (desc);
+      layout.set_wrap (Pango.WrapMode.WORD_CHAR);
+      layout.set_ellipsize (Pango.EllipsizeMode.END);
+      layout.set_text (text, -1);
+      Pango.Context pango_context = layout.get_context ();
+      Gdk.Screen screen = Gdk.Screen.get_default ();
+      Pango.cairo_context_set_font_options (pango_context,
+                                            screen.get_font_options ());
+      Pango.cairo_context_set_resolution (pango_context,
+                                          (float) settings.gtk_xft_dpi /
+                                          (float) Pango.SCALE);
+      layout.context_changed ();
+
+      int text_width;
+      int text_height;
+      get_text_extents (font, text, out text_width, out text_height);
+      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+                  (float) (h - text_height) / 2.0f);
+
+      Pango.cairo_show_layout (cr, layout);
+    }
+
+  }
+
+  public class RadioItem : GLib.Object
+  {
+    public static void
+    normal_mask (Cairo.Context cr,
+                 int           w,
+                 int           h,
+                 string        font,
+                 string        text,
+                 bool          enabled)
+    {
+      // clear context
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      // setup correct filled-drawing
+      cr.set_operator (Cairo.Operator.SOURCE);
+      cr.scale (1.0f, 1.0f);
+      cr.set_line_width (1.0f);
+
+      double x  = _align (15.0f);
+      double y  = _align ((double) h / 2.0f);
+      double r1 = 3.5f;
+      double r2 = 8.5f;
+
+      // draw radio button
+      if (enabled)
+        {
+          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+          cr.arc (x, y, r1, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.fill ();
+          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
+          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.stroke ();
+        }
+      else
+        {
+          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
+          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.stroke ();
+        }
+
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+
+      // draw text
+      Pango.Layout layout = Pango.cairo_create_layout (cr);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Pango.FontDescription desc = Pango.FontDescription.from_string (font);
+      desc.set_weight (Pango.Weight.NORMAL);
+      layout.set_font_description (desc);
+      layout.set_wrap (Pango.WrapMode.WORD_CHAR);
+      layout.set_ellipsize (Pango.EllipsizeMode.END);
+      layout.set_text (text, -1);
+      Pango.Context pango_context = layout.get_context ();
+      Gdk.Screen screen = Gdk.Screen.get_default ();
+      Pango.cairo_context_set_font_options (pango_context,
+                                            screen.get_font_options ());
+      Pango.cairo_context_set_resolution (pango_context,
+                                          (float) settings.gtk_xft_dpi /
+                                          (float) Pango.SCALE);
+      layout.context_changed ();
+
+      int text_width;
+      int text_height;
+      get_text_extents (font, text, out text_width, out text_height);
+      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+                  (float) (h - text_height) / 2.0f);
+
+      Pango.cairo_show_layout (cr, layout);
+    }
+
+    public static void
+    selected_mask (Cairo.Context cr,
+                   int           w,
+                   int           h,
+                   string        font,
+                   string        text,
+                   bool          enabled)
+    {
+      // clear context
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      // setup correct filled-drawing
+      cr.set_operator (Cairo.Operator.SOURCE);
+      cr.scale (1.0f, 1.0f);
+      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
+
+      // draw rounded rectangle
+      _round_rect (cr,
+                   1.0f,
+                   0.5f,
+                   0.5f,
+                   ITEM_CORNER_RADIUS_ABS,
+                   w - 1.0f,
+                   h - 1.0f);
+      cr.fill ();
+
+      double x  = _align (15.0f);
+      double y  = _align ((double) h / 2.0f);
+      double r1 = 3.5f;
+      double r2 = 8.5f;
+
+      cr.set_source_rgba (0.0f, 0.0f, 0.0f, 0.0f);
+
+      // draw radio button
+      if (enabled)
+        {
+          cr.arc (x, y, r1, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.fill ();
+          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.stroke ();
+        }
+      else
+       {
+          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
+                            360.0f * (GLib.Math.PI / 180.0f));
+          cr.stroke ();
+       }
+
+      // draw text
+      Pango.Layout layout = Pango.cairo_create_layout (cr);
+      Gtk.Settings settings = Gtk.Settings.get_default ();
+      Pango.FontDescription desc = Pango.FontDescription.from_string (font);
+      desc.set_weight (Pango.Weight.NORMAL);
+      layout.set_font_description (desc);
+      layout.set_wrap (Pango.WrapMode.WORD_CHAR);
+      layout.set_ellipsize (Pango.EllipsizeMode.END);
+      layout.set_text (text, -1);
+
+      Pango.Context pango_context = layout.get_context ();
+      Gdk.Screen screen = Gdk.Screen.get_default ();
+      Pango.cairo_context_set_font_options (pango_context,
+                                            screen.get_font_options ());
+      Pango.cairo_context_set_resolution (pango_context,
+                                          (float) settings.gtk_xft_dpi /
+                                          (float) Pango.SCALE);
+      layout.context_changed ();
+
+      int text_width;
+      int text_height;
+      get_text_extents (font, text, out text_width, out text_height);
+      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+                  (float) (h - text_height) / 2.0f);
+
+      Pango.cairo_show_layout (cr, layout);
+    }
+  }
+
   public class Item : GLib.Object
   {
-    private static void
-    _round_rect (Cairo.Context cr,
-                 double        aspect,        // aspect-ratio
-                 double        x,             // top-left corner
-                 double        y,             // top-left corner
-                 double        corner_radius, // "size" of the corners
-                 double        width,         // width of the rectangle
-                 double        height)        // height of the rectangle
-    {
-      double radius = corner_radius / aspect;
-
-      // top-left, right of the corner
-      cr.move_to (x + radius, y);
-
-      // top-right, left of the corner
-      cr.line_to (x + width - radius, y);
-
-      // top-right, below the corner
-      cr.arc (x + width - radius,
-              y + radius,
-              radius,
-              -90.0f * GLib.Math.PI / 180.0f,
-              0.0f * GLib.Math.PI / 180.0f);
-
-      // bottom-right, above the corner
-      cr.line_to (x + width, y + height - radius);
-
-      // bottom-right, left of the corner
-      cr.arc (x + width - radius,
-              y + height - radius,
-              radius,
-              0.0f * GLib.Math.PI / 180.0f,
-              90.0f * GLib.Math.PI / 180.0f);
-
-      // bottom-left, right of the corner
-      cr.line_to (x + radius, y + height);
-
-      // bottom-left, above the corner
-      cr.arc (x + radius,
-              y + height - radius,
-              radius,
-              90.0f * GLib.Math.PI / 180.0f,
-              180.0f * GLib.Math.PI / 180.0f);
-
-      // top-left, right of the corner
-      cr.arc (x + radius,
-              y + radius,
-              radius,
-              180.0f * GLib.Math.PI / 180.0f,
-              270.0f * GLib.Math.PI / 180.0f);
-    }
-
-    public static void
-    get_text_extents (string  font,
-                      string  text,
-                      out int width,
-                      out int height)
-    {
-      Cairo.Surface surface = new Cairo.ImageSurface (Cairo.Format.A1, 1, 1);
-      Cairo.Context cr = new Cairo.Context (surface);
-      Pango.Layout layout = Pango.cairo_create_layout (cr);
-      Gtk.Settings settings = Gtk.Settings.get_default ();
-      Pango.FontDescription desc = Pango.FontDescription.from_string (font);
-      desc.set_weight (Pango.Weight.NORMAL);
-      layout.set_font_description (desc);
-      layout.set_wrap (Pango.WrapMode.WORD_CHAR);
-      layout.set_ellipsize (Pango.EllipsizeMode.END);
-      layout.set_text (text, -1);
-      Pango.Context pango_context = layout.get_context ();
-      Gdk.Screen screen = Gdk.Screen.get_default ();
-      Pango.cairo_context_set_font_options (pango_context,
-                                            screen.get_font_options ());
-      Pango.cairo_context_set_resolution (pango_context,
-                                          (float) settings.gtk_xft_dpi /
-                                          (float) Pango.SCALE);
-      layout.context_changed ();
-      Pango.Rectangle log_rect;
-      layout.get_extents (null, out log_rect);
-      width  = log_rect.width / Pango.SCALE;
-      height = log_rect.height / Pango.SCALE;
-    }
-
     public static void
     normal_mask (Cairo.Context cr,
                  int           w,
@@ -271,17 +607,6 @@
 
   public class Menu : GLib.Object
   {
-    private static double
-    _align (double val)
-    {
-      double fract = val - (int) val;
-
-      if (fract != 0.5f)
-        return (double) ((int) val + 0.5f);
-      else
-        return val;
-    }
-
     private static void
     _setup (out Cairo.Surface surf,
             out Cairo.Context cr,