forked from AuroraMiddleware/gtk
If the menu is scrolled down or up, and some of the widget area is empty,
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or up, and some of the widget area is empty, don't fill it in with GTK_SHADOW_IN rectangles that make it looks strange. Fixes #72695.
This commit is contained in:
parent
f642876f0c
commit
ff784b978b
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2002-05-16 Ettore Perazzoli <ettore@ximian.com>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
|
||||||
|
up, and some of the widget area is empty, don't fill it in with
|
||||||
|
GTK_SHADOW_IN rectangles that make it looks strange. Fixes
|
||||||
|
#72695.
|
||||||
|
|
||||||
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
Wed May 15 18:15:45 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't
|
||||||
|
@ -1680,35 +1680,6 @@ gtk_menu_paint (GtkWidget *widget,
|
|||||||
MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
|
MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (event->window == menu->view_window)
|
|
||||||
{
|
|
||||||
gint menu_height;
|
|
||||||
gint top_pos;
|
|
||||||
|
|
||||||
if (menu->scroll_offset < 0)
|
|
||||||
gtk_paint_box (widget->style,
|
|
||||||
menu->view_window,
|
|
||||||
GTK_STATE_ACTIVE,
|
|
||||||
GTK_SHADOW_IN,
|
|
||||||
NULL, widget, "menu",
|
|
||||||
0, 0,
|
|
||||||
-1,
|
|
||||||
-menu->scroll_offset);
|
|
||||||
|
|
||||||
menu_height = widget->requisition.height - 2*border_y;
|
|
||||||
top_pos = height - 2*border_y - (menu->upper_arrow_visible ? MENU_SCROLL_ARROW_HEIGHT : 0);
|
|
||||||
|
|
||||||
if (menu_height - menu->scroll_offset < top_pos)
|
|
||||||
gtk_paint_box (widget->style,
|
|
||||||
menu->view_window,
|
|
||||||
GTK_STATE_ACTIVE,
|
|
||||||
GTK_SHADOW_IN,
|
|
||||||
NULL, widget, "menu",
|
|
||||||
0,
|
|
||||||
menu_height - menu->scroll_offset,
|
|
||||||
-1,
|
|
||||||
top_pos - (menu_height - menu->scroll_offset));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
Loading…
Reference in New Issue
Block a user