menuitem: properly respect padding when drawing the separators

Use the padding when calculating the draw coordinates of the separator.

https://bugzilla.gnome.org/show_bug.cgi?id=666242

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index e9c2bea56c74124578e29e90cb8d7acc5713efdb..9c9dea3a3cf77f831b0a97b055c6bf77fa2c7e62 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1765,16 +1765,16 @@ gtk_menu_item_draw (GtkWidget *widget,
                             NULL);
       if (wide_separators)
         gtk_render_frame (context, cr,
-                          horizontal_padding + padding.left,
-                          (height - separator_height - padding.top) / 2,
-                          width - (2 * horizontal_padding) - padding.left - padding.right,
+                          x + horizontal_padding + padding.left,
+                          y + padding.top,
+                          w - (2 * horizontal_padding) - padding.left - padding.right,
                           separator_height);
       else
         gtk_render_line (context, cr,
-                         horizontal_padding + padding.left,
-                         (height - padding.top) / 2,
-                         width - horizontal_padding - padding.right - 1,
-                         (height - padding.top) / 2);
+                         x + horizontal_padding + padding.left,
+                         y + padding.top,
+                         x + w - horizontal_padding - padding.right - 1,
+                         y + padding.top);
     }
 
   GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->draw (widget, cr);