AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

menuitem: Move paint function into expose function

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 20:33:39 +02:00
parent 1f640d127e
commit e6d1c8aeab
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkmenuitem.c
View File

@ -90,8 +90,6 @@ static gboolean gtk_menu_item_enter (GtkWidget *widget,
GdkEventCrossing *event); GdkEventCrossing *event);
static gboolean gtk_menu_item_leave (GtkWidget *widget, static gboolean gtk_menu_item_leave (GtkWidget *widget,
GdkEventCrossing *event); GdkEventCrossing *event);
static void gtk_menu_item_paint (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_menu_item_expose (GtkWidget *widget, static gint gtk_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static void gtk_menu_item_parent_set (GtkWidget *widget, static void gtk_menu_item_parent_set (GtkWidget *widget,
@ -1507,9 +1505,9 @@ gtk_menu_item_leave (GtkWidget *widget,
return gtk_widget_event (gtk_widget_get_parent (widget), (GdkEvent*) event); return gtk_widget_event (gtk_widget_get_parent (widget), (GdkEvent*) event);
} }
static void static gboolean
gtk_menu_item_paint (GtkWidget *widget, gtk_menu_item_expose (GtkWidget *widget,
GdkRectangle *area) GdkEventExpose *event)
{ {
GtkAllocation allocation; GtkAllocation allocation;
GtkMenuItem *menu_item; GtkMenuItem *menu_item;
@ -1547,7 +1545,7 @@ gtk_menu_item_paint (GtkWidget *widget,
window, window,
GTK_STATE_PRELIGHT, GTK_STATE_PRELIGHT,
selected_shadow_type, selected_shadow_type,
area, widget, "menuitem", &event->area, widget, "menuitem",
x, y, width, height); x, y, width, height);
} }
@ -1586,7 +1584,7 @@ gtk_menu_item_paint (GtkWidget *widget,
gtk_paint_arrow (style, window, gtk_paint_arrow (style, window,
state_type, shadow_type, state_type, shadow_type,
area, widget, "menuitem", &event->area, widget, "menuitem",
arrow_type, TRUE, arrow_type, TRUE,
arrow_x, arrow_y, arrow_x, arrow_y,
arrow_size, arrow_size); arrow_size, arrow_size);
@ -1606,31 +1604,18 @@ gtk_menu_item_paint (GtkWidget *widget,
if (wide_separators) if (wide_separators)
gtk_paint_box (style, window, gtk_paint_box (style, window,
GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_OUT, GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_OUT,
area, widget, "hseparator", &event->area, widget, "hseparator",
allocation.x + horizontal_padding + style->xthickness, allocation.x + horizontal_padding + style->xthickness,
allocation.y + (allocation.height - separator_height - style->ythickness) / 2, allocation.y + (allocation.height - separator_height - style->ythickness) / 2,
allocation.width - 2 * (horizontal_padding + style->xthickness), allocation.width - 2 * (horizontal_padding + style->xthickness),
separator_height); separator_height);
else else
gtk_paint_hline (style, window, gtk_paint_hline (style, window,
GTK_STATE_NORMAL, area, widget, "menuitem", GTK_STATE_NORMAL, &event->area, widget, "menuitem",
allocation.x + horizontal_padding + style->xthickness, allocation.x + horizontal_padding + style->xthickness,
allocation.x + allocation.width - horizontal_padding - style->xthickness - 1, allocation.x + allocation.width - horizontal_padding - style->xthickness - 1,
allocation.y + (allocation.height - style->ythickness) / 2); allocation.y + (allocation.height - style->ythickness) / 2);
} }
}
}
static gint
gtk_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (GTK_IS_MENU_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (gtk_widget_is_drawable (widget))
{
gtk_menu_item_paint (widget, &event->area);
GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->expose_event (widget, event); GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->expose_event (widget, event);
} }