diff options
| -rw-r--r-- | gtk/gtkdrawingarea.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index a9b659ee1c..36ec5b8db5 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -113,6 +113,7 @@ */ static void gtk_drawing_area_realize (GtkWidget *widget); +static void gtk_drawing_area_style_updated (GtkWidget *widget); static void gtk_drawing_area_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void gtk_drawing_area_send_configure (GtkDrawingArea *darea); @@ -126,6 +127,7 @@ gtk_drawing_area_class_init (GtkDrawingAreaClass *class) widget_class->realize = gtk_drawing_area_realize; widget_class->size_allocate = gtk_drawing_area_size_allocate; + widget_class->style_updated = gtk_drawing_area_style_updated; gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_DRAWING_AREA); } @@ -149,6 +151,33 @@ gtk_drawing_area_new (void) } static void +set_background (GtkWidget *widget) +{ + if (gtk_widget_get_realized (widget) && + gtk_widget_get_has_window (widget)) + { + /* We still need to call gtk_style_context_set_background() here for + * GtkDrawingArea, since clients expect backgrounds set on it (e.g. through + * gtk_widget_override_background_color) to be available even when they + * don't chain up from draw(). + * This should be revisited next time we have a major API break. + */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_style_context_set_background (gtk_widget_get_style_context (widget), + gtk_widget_get_window (widget)); + G_GNUC_END_IGNORE_DEPRECATIONS; + } +} + +static void +gtk_drawing_area_style_updated (GtkWidget *widget) +{ + GTK_WIDGET_CLASS (gtk_drawing_area_parent_class)->style_updated (widget); + + set_background (widget); +} + +static void gtk_drawing_area_realize (GtkWidget *widget) { GtkAllocation allocation; @@ -182,8 +211,7 @@ gtk_drawing_area_realize (GtkWidget *widget) gtk_widget_register_window (widget, window); gtk_widget_set_window (widget, window); - gtk_style_context_set_background (gtk_widget_get_style_context (widget), - window); + set_background (widget); } gtk_drawing_area_send_configure (GTK_DRAWING_AREA (widget)); |