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

Make GtkAccelLabel use GtkStyleContext.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-12-21 14:47:17 +01:00
parent 5e74427dee
commit 1cecb10584
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkaccellabel.c
View File

@ -392,6 +392,7 @@ gtk_accel_label_draw (GtkWidget *widget,
if (allocation.width >= requisition.width + ac_width) if (allocation.width >= requisition.width + ac_width)
{ {
GtkStyleContext *context;
PangoLayout *label_layout; PangoLayout *label_layout;
PangoLayout *accel_layout; PangoLayout *accel_layout;
GtkLabel *label = GTK_LABEL (widget); GtkLabel *label = GTK_LABEL (widget);
@ -400,6 +401,7 @@ gtk_accel_label_draw (GtkWidget *widget,
gint y; gint y;
gint xpad; gint xpad;
context = gtk_widget_get_style_context (widget);
label_layout = gtk_label_get_layout (GTK_LABEL (accel_label)); label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
cairo_save (cr); cairo_save (cr);
@ -440,14 +442,12 @@ gtk_accel_label_draw (GtkWidget *widget,
y += get_first_baseline (label_layout) - get_first_baseline (accel_layout) - allocation.y; y += get_first_baseline (label_layout) - get_first_baseline (accel_layout) - allocation.y;
gtk_paint_layout (gtk_widget_get_style (widget), gtk_style_context_save (context);
cr, gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR);
gtk_widget_get_state (widget), gtk_style_context_set_state (context, gtk_widget_get_state_flags (widget));
FALSE,
widget, gtk_render_layout (context, cr, x, y, accel_layout);
"accellabel", gtk_style_context_restore (context);
x, y,
accel_layout);
g_object_unref (accel_layout); g_object_unref (accel_layout);
} }