Mercurial > geeqie

diff src/pixbuf-renderer.c @ 32:96ac60a9c0f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wed Apr 6 02:43:40 2005 John Ellis <johne@verizon.net> * pan-view.c: Reimplement pixbuf_draw_triangle for efficiency. * pixbuf-renderer.c: Fix pr_queue_to_tiles only_existing argument to only have effect on tiles that not currently visible. Remove use of hard coded PR_TILE_SIZE from tile size calculations, as it is only supposed to be used as the default value. ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. #####
author gqview
date Wed, 06 Apr 2005 06:49:23 +0000
parents c42544f31030
children a41ecbb26a96
line wrap: on
line diff
--- a/src/pixbuf-renderer.c	Tue Apr 05 09:13:51 2005 +0000
+++ b/src/pixbuf-renderer.c	Wed Apr 06 06:49:23 2005 +0000
@@ -1245,10 +1245,10 @@
 
 	if (!st) return FALSE;
 
-	x1 = (pr->x_scroll / PR_TILE_SIZE) * PR_TILE_SIZE;
-	y1 = (pr->y_scroll / PR_TILE_SIZE) * PR_TILE_SIZE;
-	x2 = ((pr->x_scroll + pr->vis_width) / PR_TILE_SIZE) * PR_TILE_SIZE + PR_TILE_SIZE;
-	y2 = ((pr->y_scroll + pr->vis_height) / PR_TILE_SIZE) * PR_TILE_SIZE + PR_TILE_SIZE;
+	x1 = (pr->x_scroll / pr->tile_width) * pr->tile_width;
+	y1 = (pr->y_scroll / pr->tile_height) * pr->tile_height;
+	x2 = ((pr->x_scroll + pr->vis_width) / pr->tile_width) * pr->tile_width + pr->tile_width;
+	y2 = ((pr->y_scroll + pr->vis_height) / pr->tile_height) * pr->tile_height + pr->tile_height;
 
 	return !((double)st->x * pr->scale > (double)x2 ||
 		 (double)(st->x + pr->source_tile_width) * pr->scale < (double)x1 ||
@@ -1733,8 +1733,8 @@
 		{
 		gint tiles;
 
-		tiles = (pr->vis_width / PR_TILE_SIZE + 1) * (pr->vis_width / PR_TILE_SIZE + 1);
-		tile_max = MAX(tiles * PR_TILE_SIZE * PR_TILE_SIZE * 3,
+		tiles = (pr->vis_width / pr->tile_width + 1) * (pr->vis_height / pr->tile_height + 1);
+		tile_max = MAX(tiles * pr->tile_width * pr->tile_height * 3,
 			       (gint)((double)pr->tile_cache_max * 1048576.0 * pr->scale));
 		}
 	else
@@ -2021,8 +2021,8 @@
 
 static gint pr_tile_is_visible(PixbufRenderer *pr, ImageTile *it)
 {
-	return (it->x + it->w >= pr->x_scroll && it->x <= pr->x_scroll + pr->window_width - pr->x_offset * 2 &&
-		it->y + it->h >= pr->y_scroll && it->y <= pr->y_scroll + pr->window_height - pr->y_offset * 2);
+	return (it->x + it->w >= pr->x_scroll && it->x < pr->x_scroll + pr->vis_width &&
+		it->y + it->h >= pr->y_scroll && it->y < pr->y_scroll + pr->vis_height);
 }
 
 /*
@@ -2233,7 +2233,12 @@
 			{
 			ImageTile *it;
 
-			it = pr_tile_get(pr, i, j, only_existing);
+			it = pr_tile_get(pr, i, j,
+					 (only_existing &&
+					  i + pr->tile_width < pr->x_scroll &&
+					  i > pr->x_scroll + pr->vis_width &&
+					  j + pr->tile_height < pr->y_scroll &&
+					  j > pr->y_scroll +pr->vis_height));
 			if (it)
 				{
 				QueueData *qd;