[gtk+] menuitem: deprecate horizontal-padding style property

[Cosimo Cecchi <cosimoc src gnome org>]

commit a69619edbc2b36aadbff200918ea9f11885d6109
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Nov 27 08:57:23 2012 -0500

    menuitem: deprecate horizontal-padding style property
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689168

 gtk/gtkmenuitem.c |   85 ++++++++++++----------------------------------------
 1 files changed, 20 insertions(+), 65 deletions(-)
---
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index bf2d3bb..5be3489 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -464,14 +464,24 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                                      GTK_PARAM_READABLE),
                                                   gtk_rc_property_parse_enum);
 
+  /**
+   * GtkMenuItem:horizontal-padding:
+   *
+   * Padding to left and right of the menu item.
+   *
+   * Deprecated: 3.8: use the standard padding CSS property (through objects
+   *   like #GtkStyleContext and #GtkCssProvider); the value of this style
+   *   property is ignored.
+   */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("horizontal-padding",
                                                              "Horizontal Padding",
                                                              "Padding to left and right of the menu item",
                                                              0,
                                                              G_MAXINT,
-                                                             3,
-                                                             GTK_PARAM_READABLE));
+                                                             0,
+                                                             GTK_PARAM_READABLE |
+                                                             G_PARAM_DEPRECATED));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("toggle-spacing",
@@ -839,7 +849,6 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
   GtkWidget *child;
   GtkWidget *parent;
   guint accel_width;
-  guint horizontal_padding;
   guint border_width;
   GtkPackDirection pack_dir;
   GtkPackDirection child_pack_dir;
@@ -849,11 +858,6 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
   GtkBorder padding;
 
   min_width = nat_width = 0;
-
-  gtk_widget_style_get (widget,
-                        "horizontal-padding", &horizontal_padding,
-                        NULL);
-
   bin = GTK_BIN (widget);
   parent = gtk_widget_get_parent (widget);
 
@@ -875,13 +879,8 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
   gtk_style_context_get_padding (context, state, &padding);
 
   min_width = (border_width * 2) + padding.left + padding.right;
-
-  if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
-      (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
-    min_width += 2 * horizontal_padding;
-
   nat_width = min_width;
-	  
+
   child = gtk_bin_get_child (bin);
 
   if (child != NULL && gtk_widget_get_visible (child))
@@ -936,7 +935,6 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
   GtkWidget *child;
   GtkWidget *parent;
   guint accel_width;
-  guint horizontal_padding;
   guint border_width;
   GtkPackDirection pack_dir;
   GtkPackDirection child_pack_dir;
@@ -949,10 +947,6 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
   state = gtk_widget_get_state_flags (widget);
   gtk_style_context_get_padding (context, state, &padding);
 
-  gtk_widget_style_get (widget,
-                        "horizontal-padding", &horizontal_padding,
-                        NULL);
-
   bin = GTK_BIN (widget);
   parent = gtk_widget_get_parent (widget);
 
@@ -970,18 +964,10 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   min_height   = (border_width * 2) + padding.top + padding.bottom;
 
-  if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
-      (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT))
-    min_height += 2 * horizontal_padding;
-
   if (for_size != -1)
     {
       avail_size = for_size;
       avail_size -= (border_width * 2) + padding.left + padding.right;
-
-      if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
-          (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
-        avail_size -= 2 * horizontal_padding;
     }
 
   nat_height = min_height;
@@ -1524,17 +1510,12 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
       GtkStyleContext *context;
       GtkStateFlags state;
       GtkBorder padding;
-      guint horizontal_padding;
       guint border_width;
 
       context = gtk_widget_get_style_context (widget);
       state = gtk_widget_get_state_flags (widget);
       gtk_style_context_get_padding (context, state, &padding);
 
-      gtk_widget_style_get (widget,
-                            "horizontal-padding", &horizontal_padding,
-                            NULL);
-
       border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
       child_allocation.x = border_width + padding.left;
       child_allocation.y = border_width + padding.top;
@@ -1544,19 +1525,6 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
       child_allocation.height = allocation->height - (border_width * 2) -
         padding.top - padding.bottom;
 
-      if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
-          (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
-        {
-          child_allocation.x += horizontal_padding;
-          child_allocation.width -= 2 * horizontal_padding;
-        }
-      else if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
-               (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT))
-        {
-          child_allocation.y += horizontal_padding;
-          child_allocation.height -= 2 * horizontal_padding;
-        }
-
       if (child_pack_dir == GTK_PACK_DIRECTION_LTR ||
           child_pack_dir == GTK_PACK_DIRECTION_RTL)
         {
@@ -1726,26 +1694,20 @@ gtk_menu_item_draw (GtkWidget *widget,
     {
       gint arrow_x, arrow_y;
       gint arrow_size;
-      guint horizontal_padding;
       GtkTextDirection direction;
       gdouble angle;
 
       direction = gtk_widget_get_direction (widget);
-
-      gtk_widget_style_get (widget,
-                            "horizontal-padding", &horizontal_padding,
-                            NULL);
-
       get_arrow_size (widget, child, &arrow_size, NULL);
 
       if (direction == GTK_TEXT_DIR_LTR)
         {
-          arrow_x = x + w - horizontal_padding - arrow_size;
+          arrow_x = x + w - arrow_size;
           angle = G_PI / 2;
         }
       else
         {
-          arrow_x = x + horizontal_padding;
+          arrow_x = x;
           angle = (3 * G_PI) / 2;
         }
 
@@ -1757,24 +1719,22 @@ gtk_menu_item_draw (GtkWidget *widget,
     {
       gboolean wide_separators;
       gint     separator_height;
-      guint    horizontal_padding;
 
       gtk_widget_style_get (widget,
                             "wide-separators",    &wide_separators,
                             "separator-height",   &separator_height,
-                            "horizontal-padding", &horizontal_padding,
                             NULL);
       if (wide_separators)
         gtk_render_frame (context, cr,
-                          x + horizontal_padding + padding.left,
+                          x + padding.left,
                           y + padding.top,
-                          w - (2 * horizontal_padding) - padding.left - padding.right,
+                          w - padding.left - padding.right,
                           separator_height);
       else
         gtk_render_line (context, cr,
-                         x + horizontal_padding + padding.left,
+                         x + padding.left,
                          y + padding.top,
-                         x + w - horizontal_padding - padding.right - 1,
+                         x + w - padding.right - 1,
                          y + padding.top);
     }
 
@@ -2125,8 +2085,6 @@ get_offsets (GtkMenu *menu,
              gint    *horizontal_offset,
              gint    *vertical_offset)
 {
-  gint vertical_padding;
-  gint horizontal_padding;
   GtkStyleContext *context;
   GtkStateFlags state;
   GtkBorder padding;
@@ -2134,8 +2092,6 @@ get_offsets (GtkMenu *menu,
   gtk_widget_style_get (GTK_WIDGET (menu),
                         "horizontal-offset", horizontal_offset,
                         "vertical-offset", vertical_offset,
-                        "horizontal-padding", &horizontal_padding,
-                        "vertical-padding", &vertical_padding,
                         NULL);
 
   context = gtk_widget_get_style_context (GTK_WIDGET (menu));
@@ -2143,8 +2099,7 @@ get_offsets (GtkMenu *menu,
   gtk_style_context_get_padding (context, state, &padding);
 
   *vertical_offset -= padding.top;
-  *vertical_offset -= vertical_padding;
-  *horizontal_offset += horizontal_padding;
+  *horizontal_offset += padding.left;
 }
 
 static void