Mercurial > hg > forks > geeqie

changeset 2091:f8e5de56fc04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dropped renderer->overlay_draw
author Vladimir Nadvornik <nadvornik@suse.cz>
date Sat, 18 Aug 2012 18:12:50 +0200
parents 3f0bbd79773c
children a997cdfc1008
files src/pixbuf-renderer.c src/pixbuf-renderer.h src/renderer-clutter.c src/renderer-tiles.c
diffstat 4 files changed, 2 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/pixbuf-renderer.c	Sat Aug 18 18:05:20 2012 +0200
+++ b/src/pixbuf-renderer.c	Sat Aug 18 18:12:50 2012 +0200
@@ -2344,18 +2344,8 @@
 
 		box = GTK_WIDGET(pr);
 
-#if GTK_CHECK_VERSION(2,20,0)
-		if (gtk_widget_get_realized(box))
-#else
-		if (GTK_WIDGET_REALIZED(box))
-#endif
-			{
-#if !GTK_CHECK_VERSION(3,0,0)
-			gdk_window_clear(gtk_widget_get_window(box));
-#endif
-			pr->renderer->overlay_draw(pr->renderer, 0, 0, pr->viewport_width, pr->viewport_height);
-			if (pr->renderer2) pr->renderer2->overlay_draw(pr->renderer2, 0, 0, pr->viewport_width, pr->viewport_height);
-			}
+		pr->renderer->update_pixbuf(pr->renderer, flags & PR_ZOOM_LAZY);
+		if (pr->renderer2) pr->renderer2->update_pixbuf(pr->renderer2, flags & PR_ZOOM_LAZY);
 
 		pr_update_signal(pr);
 
--- a/src/pixbuf-renderer.h	Sat Aug 18 18:05:20 2012 +0200
+++ b/src/pixbuf-renderer.h	Sat Aug 18 18:12:50 2012 +0200
@@ -84,7 +84,6 @@
 	gint (*overlay_add)(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags);
 	void (*overlay_set)(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y);
 	gboolean (*overlay_get)(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y);
-	void (*overlay_draw)(void *renderer, gint x, gint y, gint w, gint h);
 
 	void (*stereo_set)(void *renderer, gint stereo_mode); /* set stereo mode */
 
--- a/src/renderer-clutter.c	Sat Aug 18 18:05:20 2012 +0200
+++ b/src/renderer-clutter.c	Sat Aug 18 18:12:50 2012 +0200
@@ -631,11 +631,6 @@
 		}
 }
 
-
-static void rc_overlay_draw(void *renderer, gint x, gint y, gint w, gint h)
-{
-}
-
 static gint rc_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags)
 {
 	RendererClutter *rc = (RendererClutter *)renderer;
@@ -833,7 +828,6 @@
 	rc->f.overlay_add = rc_overlay_add;
 	rc->f.overlay_set = rc_overlay_set;
 	rc->f.overlay_get = rc_overlay_get;
-	rc->f.overlay_draw = rc_overlay_draw;
 
 	rc->f.stereo_set = rc_stereo_set;
 	
--- a/src/renderer-tiles.c	Sat Aug 18 18:05:20 2012 +0200
+++ b/src/renderer-tiles.c	Sat Aug 18 18:12:50 2012 +0200
@@ -2072,11 +2072,6 @@
 	rt_tile_invalidate_region((RendererTiles *)renderer, x, y, w, h);
 }
 
-static void renderer_overlay_draw(void *renderer, gint x, gint y, gint w, gint h)
-{
-	rt_overlay_draw((RendererTiles *)renderer, x, y, w, h, NULL);
-}
-
 static void renderer_update_viewport(void *renderer)
 {
 	RendererTiles *rt = (RendererTiles *)renderer;
@@ -2216,7 +2211,6 @@
 	rt->f.overlay_add = renderer_tiles_overlay_add;
 	rt->f.overlay_set = renderer_tiles_overlay_set;
 	rt->f.overlay_get = renderer_tiles_overlay_get;
-	rt->f.overlay_draw = renderer_overlay_draw;
 
 	rt->f.stereo_set = renderer_stereo_set;