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

viewport: don't call gtk_style_context_set_background()

Browse Source
This commit is contained in:
Cosimo Cecchi
2015-06-27 12:50:50 -07:00
parent 15908cfdf9
commit d4ecdbd300
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtkviewport.c
View File

@ -108,7 +108,6 @@ static void gtk_viewport_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
gpointer data); gpointer data);
static void gtk_viewport_style_updated (GtkWidget *widget);
static void gtk_viewport_get_preferred_width (GtkWidget *widget, static void gtk_viewport_get_preferred_width (GtkWidget *widget,
gint *minimum_size, gint *minimum_size,
@ -156,7 +155,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
widget_class->unmap = gtk_viewport_unmap; widget_class->unmap = gtk_viewport_unmap;
widget_class->draw = gtk_viewport_draw; widget_class->draw = gtk_viewport_draw;
widget_class->size_allocate = gtk_viewport_size_allocate; widget_class->size_allocate = gtk_viewport_size_allocate;
widget_class->style_updated = gtk_viewport_style_updated;
widget_class->get_preferred_width = gtk_viewport_get_preferred_width; widget_class->get_preferred_width = gtk_viewport_get_preferred_width;
widget_class->get_preferred_height = gtk_viewport_get_preferred_height; widget_class->get_preferred_height = gtk_viewport_get_preferred_height;
widget_class->get_preferred_width_for_height = gtk_viewport_get_preferred_width_for_height; widget_class->get_preferred_width_for_height = gtk_viewport_get_preferred_width_for_height;
@ -724,7 +722,6 @@ gtk_viewport_realize (GtkWidget *widget)
GtkAdjustment *vadjustment = priv->vadjustment; GtkAdjustment *vadjustment = priv->vadjustment;
GtkAllocation allocation; GtkAllocation allocation;
GtkAllocation view_allocation; GtkAllocation view_allocation;
GtkStyleContext *context;
GtkWidget *child; GtkWidget *child;
GdkWindow *window; GdkWindow *window;
GdkWindowAttr attributes; GdkWindowAttr attributes;
@ -785,10 +782,6 @@ gtk_viewport_realize (GtkWidget *widget)
if (child) if (child)
gtk_widget_set_parent_window (child, priv->bin_window); gtk_widget_set_parent_window (child, priv->bin_window);
context = gtk_widget_get_style_context (widget);
gtk_style_context_set_background (context, window);
gtk_style_context_set_background (context, priv->bin_window);
gdk_window_show (priv->bin_window); gdk_window_show (priv->bin_window);
gdk_window_show (priv->view_window); gdk_window_show (priv->view_window);
} }
@ -862,9 +855,14 @@ gtk_viewport_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget))) if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
gtk_render_frame (context, cr, 0, 0, {
gdk_window_get_width (gtk_widget_get_window (widget)), gtk_render_background (context, cr, 0, 0,
gdk_window_get_height (gtk_widget_get_window (widget))); gdk_window_get_width (gtk_widget_get_window (widget)),
gdk_window_get_height (gtk_widget_get_window (widget)));
gtk_render_frame (context, cr, 0, 0,
gdk_window_get_width (gtk_widget_get_window (widget)),
gdk_window_get_height (gtk_widget_get_window (widget)));
}
if (gtk_cairo_should_draw_window (cr, priv->bin_window)) if (gtk_cairo_should_draw_window (cr, priv->bin_window))
{ {
@ -998,25 +996,6 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
} }
} }
static void
gtk_viewport_style_updated (GtkWidget *widget)
{
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->style_updated (widget);
if (gtk_widget_get_realized (widget) &&
gtk_widget_get_has_window (widget))
{
GtkStyleContext *context;
GtkViewport *viewport = GTK_VIEWPORT (widget);
GtkViewportPrivate *priv = viewport->priv;
context = gtk_widget_get_style_context (widget);
gtk_style_context_set_background (context, priv->bin_window);
gtk_style_context_set_background (context, gtk_widget_get_window (widget));
}
}
static void static void
gtk_viewport_get_preferred_size (GtkWidget *widget, gtk_viewport_get_preferred_size (GtkWidget *widget,
GtkOrientation orientation, GtkOrientation orientation,