Take GtkMenu::horizontal-padding into account when placing submenus

2006-06-09  Benjamin Berg  <benjamin@sipsolutions.net>

	* gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding
	into account when placing submenus (#344290)

diff --git a/ChangeLog b/ChangeLog
index 3c2ff9383250f3cc075877b3c99d2902a2e6df59..b70a6a05bb79db86e2c08ed7d3f52d8a4989ccd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-09  Benjamin Berg  <benjamin@sipsolutions.net>
+
+       * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding
+       into account when placing submenus (#344290)
+
 2006-06-09  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkrange.c: added new style properties "trough-side-details"

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3c2ff9383250f3cc075877b3c99d2902a2e6df59..b70a6a05bb79db86e2c08ed7d3f52d8a4989ccd2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-09  Benjamin Berg  <benjamin@sipsolutions.net>
+
+       * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding
+       into account when placing submenus (#344290)
+
 2006-06-09  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkrange.c: added new style properties "trough-side-details"

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 64dc6fb29bf6ebe66f0e8d13d2f9d1bf7f317286..ae87c0530443abe2c318c8ab6a4b93f501ea9e96 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1072,15 +1072,18 @@ get_offsets (GtkMenu *menu,
             gint    *vertical_offset)
 {
   gint vertical_padding;
+  gint horizontal_padding;
   
   gtk_widget_style_get (GTK_WIDGET (menu),
                        "horizontal-offset", horizontal_offset,
                        "vertical-offset", vertical_offset,
+                       "horizontal-padding", &horizontal_padding,
                        "vertical-padding", &vertical_padding,
                        NULL);
 
   *vertical_offset -= GTK_WIDGET (menu)->style->ythickness;
   *vertical_offset -= vertical_padding;
+  *horizontal_offset += horizontal_padding;
 }
 
 static void