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

pixelcache: use factor instead of margin

Browse Source 
Instead of using a fixed size, use a factor of the surface size. This
helps in situations where animations of surrounding widgets are used
and cause a rapid rate of surface destroy/create cycles.
This commit is contained in:
Christian Hergert
2015-09-13 21:08:57 -07:00
parent 28484e3a39
commit e55a8b6aef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkpixelcache.c
View File

@ -29,8 +29,8 @@
/* When resizing viewport we allow this extra /* When resizing viewport we allow this extra
size to avoid constantly reallocating when resizing */ size to avoid constantly reallocating when resizing */
#define ALLOW_SMALLER_SIZE 32 #define ALLOW_SMALLER_SIZE_FACTOR 0.5
#define ALLOW_LARGER_SIZE 32 #define ALLOW_LARGER_SIZE_FACTOR 1.25
struct _GtkPixelCache { struct _GtkPixelCache {
cairo_surface_t *surface; cairo_surface_t *surface;
@ -213,10 +213,10 @@ _gtk_pixel_cache_create_surface_if_needed (GtkPixelCache *cache,
/* If current surface can't fit view_rect or is too large, kill it */ /* If current surface can't fit view_rect or is too large, kill it */
if (cache->surface != NULL && if (cache->surface != NULL &&
(cairo_surface_get_content (cache->surface) != content || (cairo_surface_get_content (cache->surface) != content ||
cache->surface_w < MAX(view_rect->width, surface_w - ALLOW_SMALLER_SIZE) || cache->surface_w < MAX(view_rect->width, surface_w * ALLOW_SMALLER_SIZE_FACTOR) ||
cache->surface_w > surface_w + ALLOW_LARGER_SIZE || cache->surface_w > surface_w * ALLOW_LARGER_SIZE_FACTOR ||
cache->surface_h < MAX(view_rect->height, surface_h - ALLOW_SMALLER_SIZE) || cache->surface_h < MAX(view_rect->height, surface_h * ALLOW_SMALLER_SIZE_FACTOR) ||
cache->surface_h > surface_h + ALLOW_LARGER_SIZE || cache->surface_h > surface_h * ALLOW_LARGER_SIZE_FACTOR ||
cache->surface_scale != gdk_window_get_scale_factor (window))) cache->surface_scale != gdk_window_get_scale_factor (window)))
{ {
cairo_surface_destroy (cache->surface); cairo_surface_destroy (cache->surface);