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

viewport: Turn into no-window widget

Browse Source 
While doing so, get rid of the GdkWindow instead of keeping it.
This commit is contained in:
Benjamin Otte 2016-11-02 21:56:51 +01:00
parent bb8b24da47
commit d818f3fcd4
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkviewport.c
View File

@ -462,7 +462,7 @@ gtk_viewport_init (GtkViewport *viewport)
priv = viewport->priv; priv = viewport->priv;
widget = GTK_WIDGET (viewport); widget = GTK_WIDGET (viewport);
gtk_widget_set_has_window (widget, TRUE); gtk_widget_set_has_window (widget, FALSE);
gtk_widget_set_redraw_on_allocate (widget, FALSE); gtk_widget_set_redraw_on_allocate (widget, FALSE);
priv->shadow_type = GTK_SHADOW_IN; priv->shadow_type = GTK_SHADOW_IN;
@ -675,29 +675,18 @@ gtk_viewport_realize (GtkWidget *widget)
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
GtkAdjustment *hadjustment = priv->hadjustment; GtkAdjustment *hadjustment = priv->hadjustment;
GtkAdjustment *vadjustment = priv->vadjustment; GtkAdjustment *vadjustment = priv->vadjustment;
GtkAllocation allocation;
GtkAllocation view_allocation; GtkAllocation view_allocation;
GtkWidget *child; GtkWidget *child;
GdkWindow *window;
gint event_mask; gint event_mask;
gtk_widget_set_realized (widget, TRUE); GTK_WIDGET_CLASS (gtk_viewport_parent_class)->realize (widget);
gtk_widget_get_allocation (widget, &allocation);
event_mask = gtk_widget_get_events (widget); event_mask = gtk_widget_get_events (widget);
window = gdk_window_new_child (gtk_widget_get_parent_window (widget),
event_mask | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK,
&allocation);
gtk_widget_set_window (widget, window);
gtk_widget_register_window (widget, window);
gtk_css_gadget_get_content_allocation (priv->gadget, gtk_css_gadget_get_content_allocation (priv->gadget,
&view_allocation, NULL); &view_allocation, NULL);
priv->view_window = gdk_window_new_child (window, priv->view_window = gdk_window_new_child (gtk_widget_get_window (widget),
0, event_mask | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK,
&view_allocation); &view_allocation);
gtk_widget_register_window (widget, priv->view_window); gtk_widget_register_window (widget, priv->view_window);
@ -784,22 +773,12 @@ gtk_viewport_size_allocate (GtkWidget *widget,
gtk_widget_set_allocation (widget, allocation); gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x,
allocation->y,
allocation->width,
allocation->height);
content_allocation = *allocation; content_allocation = *allocation;
content_allocation.x = content_allocation.y = 0;
gtk_css_gadget_allocate (priv->gadget, gtk_css_gadget_allocate (priv->gadget,
&content_allocation, &content_allocation,
gtk_widget_get_allocated_baseline (widget), gtk_widget_get_allocated_baseline (widget),
&clip); &clip);
clip.x += allocation->x;
clip.y += allocation->y;
gtk_widget_set_clip (widget, &clip); gtk_widget_set_clip (widget, &clip);
} }