diff options
author | Matthias Clasen <mclasen@redhat.com> | 2007-01-05 18:25:56 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-05 18:25:56 +0000 |
commit | 6dfbc8d8a8fe837a6eb1cd387fae0fe91b577e01 (patch) | |
tree | e81463f84365029a0fd6f5d264438fd0a6153f9b | |
parent | a67a600ef03f888765921d56a869da6fd6638bbc (diff) | |
download | gdk-pixbuf-6dfbc8d8a8fe837a6eb1cd387fae0fe91b577e01.tar.gz |
Take the scroll arrow into account when drawing the background. (#393166,
2007-01-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Take the scroll arrow into
account when drawing the background. (#393166, Benjamin Berg)
svn path=/branches/gtk-2-10/; revision=17085
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gtk/gtkmenu.c | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-01-05 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_paint): Take the scroll arrow into + account when drawing the background. (#393166, Benjamin Berg) + 2007-01-05 Behdad Esfahbod <behdad@gnome.org> * gtk/gtklabel.c (get_layout_location): Fix broken width computation, diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 9d7eaf613..4d3ae6d24 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2512,12 +2512,17 @@ gtk_menu_paint (GtkWidget *widget, } else if (event->window == menu->bin_window) { + gint y = -border_y + menu->scroll_offset; + + if (menu->upper_arrow_visible && !menu->tearoff_active) + y -= scroll_arrow_height; + gtk_paint_box (widget->style, menu->bin_window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, widget, "menu", - - border_x, menu->scroll_offset - border_y, + - border_x, y, width, height); } } |