AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 03:10:09 +00:00
Code Issues Projects Releases Wiki Activity

widget: Fix math screwups in clip calculation

Browse Source 
We need so subtract the allocation from the clip to get the clip offset,
not the other way around.

This was screwing in particular with marks on GtkScale, because GtkScale
mark clip computation is broken and always returns (0,0) which makes
scales have a waaaaay too large clip.
But that's another bug.
This commit is contained in:
Benjamin Otte 2016-11-17 23:16:14 +01:00
parent c162b87ebd
commit 9a06b0fd5f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwidget.c
View File

@ -6413,13 +6413,13 @@ gtk_widget_draw_internal (GtkWidget *widget,
GskRenderNode *node;
graphene_rect_init (&viewport,
widget->priv->allocation.x - widget->priv->clip.x,
widget->priv->allocation.y - widget->priv->clip.y,
widget->priv->clip.x - widget->priv->allocation.x,
widget->priv->clip.y - widget->priv->allocation.y,
widget->priv->clip.width,
widget->priv->clip.height);
clip = cairo_region_create_rectangle (&(cairo_rectangle_int_t) {
widget->priv->allocation.x - widget->priv->clip.x,
widget->priv->allocation.y - widget->priv->clip.y,
widget->priv->clip.x - widget->priv->allocation.x,
widget->priv->clip.y - widget->priv->allocation.y,
widget->priv->clip.width,
widget->priv->clip.height});
fallback = gsk_renderer_create_fallback (renderer, &viewport, cr);
@ -15656,7 +15656,7 @@ gtk_widget_snapshot (GtkWidget *widget,
gtk_widget_get_clip (widget, &clip);
_gtk_widget_get_allocation (widget, &alloc);
graphene_rect_init (&bounds, alloc.x - clip.x, alloc.y - clip.y, clip.width, clip.height);
graphene_rect_init (&bounds, clip.x - alloc.x, clip.y - alloc.y, clip.width, clip.height);
if (gtk_snapshot_clips_rect (snapshot, &bounds))
return;