callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API: checkmenuitem: Port to draw vfunc

Browse Source 
Requires changing the draw_indicator vfunc to take a cairo_t.
This commit is contained in:
Benjamin Otte 2010-09-08 00:03:42 +02:00
parent 79477e097d
commit c9c9d2ac15
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkcheckmenuitem.c
View File

@ -55,15 +55,13 @@ enum {
PROP_DRAW_AS_RADIO PROP_DRAW_AS_RADIO
}; };
static gint gtk_check_menu_item_expose (GtkWidget *widget, static gint gtk_check_menu_item_draw (GtkWidget *widget,
GdkEventExpose *event); cairo_t *cr);
static void gtk_check_menu_item_activate (GtkMenuItem *menu_item); static void gtk_check_menu_item_activate (GtkMenuItem *menu_item);
static void gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item, static void gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition); gint *requisition);
static void gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area);
static void gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, static void gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area); cairo_t *cr);
static void gtk_check_menu_item_set_property (GObject *object, static void gtk_check_menu_item_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
@ -134,7 +132,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
13, 13,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
widget_class->expose_event = gtk_check_menu_item_expose; widget_class->draw = gtk_check_menu_item_draw;
menu_item_class->activate = gtk_check_menu_item_activate; menu_item_class->activate = gtk_check_menu_item_activate;
menu_item_class->hide_on_activate = FALSE; menu_item_class->hide_on_activate = FALSE;
@ -418,13 +416,16 @@ gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
} }
static gint static gint
gtk_check_menu_item_expose (GtkWidget *widget, gtk_check_menu_item_draw (GtkWidget *widget,
GdkEventExpose *event) cairo_t *cr)
{ {
if (GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event) GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (widget);
GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->expose_event (widget, event);
gtk_check_menu_item_draw_indicator (GTK_CHECK_MENU_ITEM (widget), &event->area); if (GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->draw)
GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->draw (widget, cr);
if (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator)
GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator (check_menu_item, cr);
return FALSE; return FALSE;
} }
@ -447,17 +448,9 @@ gtk_check_menu_item_activate (GtkMenuItem *menu_item)
g_object_notify (G_OBJECT (check_menu_item), "active"); g_object_notify (G_OBJECT (check_menu_item), "active");
} }
static void
gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area)
{
if (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator)
GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item)->draw_indicator (check_menu_item, area);
}
static void static void
gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area) cairo_t *cr)
{ {
GtkCheckMenuItemPrivate *priv = check_menu_item->priv; GtkCheckMenuItemPrivate *priv = check_menu_item->priv;
GtkWidget *widget; GtkWidget *widget;
@ -493,17 +486,17 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
{ {
x = allocation.x + offset + horizontal_padding + x = offset + horizontal_padding +
(toggle_size - toggle_spacing - indicator_size) / 2; (toggle_size - toggle_spacing - indicator_size) / 2;
} }
else else
{ {
x = allocation.x + allocation.width - x = allocation.width -
offset - horizontal_padding - toggle_size + toggle_spacing + offset - horizontal_padding - toggle_size + toggle_spacing +
(toggle_size - toggle_spacing - indicator_size) / 2; (toggle_size - toggle_spacing - indicator_size) / 2;
} }
y = allocation.y + (allocation.height - indicator_size) / 2; y = (allocation.height - indicator_size) / 2;
if (priv->active || if (priv->active ||
priv->always_show_toggle || priv->always_show_toggle ||
@ -526,16 +519,16 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
if (priv->draw_as_radio) if (priv->draw_as_radio)
{ {
gtk_paint_option (style, window, gtk_cairo_paint_option (style, cr,
state_type, shadow_type, state_type, shadow_type,
area, widget, "option", widget, "option",
x, y, indicator_size, indicator_size); x, y, indicator_size, indicator_size);
} }
else else
{ {
gtk_paint_check (style, window, gtk_cairo_paint_check (style, cr,
state_type, shadow_type, state_type, shadow_type,
area, widget, "check", widget, "check",
x, y, indicator_size, indicator_size); x, y, indicator_size, indicator_size);
} }
} }

2
gtk/gtkcheckmenuitem.h
View File

@ -63,7 +63,7 @@ struct _GtkCheckMenuItemClass
void (* toggled) (GtkCheckMenuItem *check_menu_item); void (* toggled) (GtkCheckMenuItem *check_menu_item);
void (* draw_indicator) (GtkCheckMenuItem *check_menu_item, void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area); cairo_t *cr);
/* Padding for future expansion */ /* Padding for future expansion */
void (*_gtk_reserved1) (void); void (*_gtk_reserved1) (void);