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

gtkpixelcache: Fix possibly ignoring queued redraw

Browse Source 
If a queue_redraw() (invalidating a region, or the whole widget) was
called from the draw() call, it could get ignored if surface_dirty
existed, as it would then be updated, but destroyed right at the end of
the _gtk_pixel_cache_repaint(), leading the next call to
_gtk_pixel_cache_draw() have its call to repaint() be a no-op
(since there's no surface_dirty) and then simply draw from (non
updated) surface.

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

https://bugzilla.gnome.org/show_bug.cgi?id=711545
This commit is contained in:
Olivier Brunel 2013-11-05 19:21:28 +01:00 committed by Matthias Clasen
parent fbfeb00545
commit fc8be96163
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkpixelcache.c
View File

@ -327,13 +327,15 @@ _gtk_pixel_cache_repaint (GtkPixelCache *cache,
gpointer user_data) gpointer user_data)
{ {
cairo_t *backing_cr; cairo_t *backing_cr;
cairo_region_t *region_dirty = cache->surface_dirty;
cache->surface_dirty = NULL;
if (cache->surface && if (cache->surface &&
cache->surface_dirty && region_dirty &&
!cairo_region_is_empty (cache->surface_dirty)) !cairo_region_is_empty (region_dirty))
{ {
backing_cr = cairo_create (cache->surface); backing_cr = cairo_create (cache->surface);
gdk_cairo_region (backing_cr, cache->surface_dirty); gdk_cairo_region (backing_cr, region_dirty);
cairo_clip (backing_cr); cairo_clip (backing_cr);
cairo_translate (backing_cr, cairo_translate (backing_cr,
-cache->surface_x - canvas_rect->x - view_rect->x, -cache->surface_x - canvas_rect->x - view_rect->x,
@ -370,11 +372,8 @@ _gtk_pixel_cache_repaint (GtkPixelCache *cache,
cairo_destroy (backing_cr); cairo_destroy (backing_cr);
} }
if (cache->surface_dirty) if (region_dirty)
{ cairo_region_destroy (region_dirty);
cairo_region_destroy (cache->surface_dirty);
cache->surface_dirty = NULL;
}
} }
static gboolean static gboolean