AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 02:40:07 +00:00
Code Issues Projects Releases Wiki Activity

color swatch: Use right allocation for window

Browse Source 
Generally, input-only windows that correspond to CSS boxes
should be sized to the border allocation of the gadget.
This commit is contained in:
Matthias Clasen 2016-01-13 13:58:52 -05:00
parent e8b11778a8
commit 1f65f1b746
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcolorswatch.c
View File

@ -507,13 +507,6 @@ swatch_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 (swatch->priv->event_window,
allocation->x,
allocation->y,
allocation->width,
allocation->height);
gtk_css_gadget_allocate (swatch->priv->gadget, gtk_css_gadget_allocate (swatch->priv->gadget,
allocation, allocation,
gtk_widget_get_allocated_baseline (widget), gtk_widget_get_allocated_baseline (widget),
@ -526,6 +519,18 @@ swatch_size_allocate (GtkWidget *widget,
gdk_rectangle_union (&clip, &clip2, &clip); gdk_rectangle_union (&clip, &clip2, &clip);
gtk_widget_set_clip (widget, &clip); gtk_widget_set_clip (widget, &clip);
if (gtk_widget_get_realized (widget))
{
GtkAllocation border_allocation;
gtk_css_gadget_get_border_allocation(swatch->priv->gadget, &border_allocation, NULL);
gdk_window_move_resize (swatch->priv->event_window,
border_allocation.x,
border_allocation.y,
border_allocation.width,
border_allocation.height);
}
} }
static void static void