Mercurial > geeqie.yaz

diff src/layout_image.c @ 117:0c2e1f0a001b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net> * image-overlay.[ch]: Rewrite most of the information overlay code to be more flexible and easily extended. * image.[ch], typedefs.h: Remove image_new_func, and replace it with image_state_func callback which is much more informative. * img-view.c, layout.c, layout_image.c: Updates for new image overlay function names.
author gqview
date Wed, 29 Nov 2006 19:38:25 +0000
parents 55166d93498d
children e2a8b7f2165b
line wrap: on
line diff
--- a/src/layout_image.c	Tue Nov 28 18:20:56 2006 +0000
+++ b/src/layout_image.c	Wed Nov 29 19:38:25 2006 +0000
@@ -49,27 +49,14 @@
 
 	if (!lw->full_screen) return;
 
-	if (enable)
-		{
-		if (lw->full_screen_overlay_id == -1)
-			{
-			lw->full_screen_overlay_id = image_overlay_info_enable(lw->image);
-			}
-		}
-	else
-		{
-		if (lw->full_screen_overlay_id != -1)
-			{
-			image_overlay_info_disable(lw->image, lw->full_screen_overlay_id);
-			lw->full_screen_overlay_id = -1;
-			}
-		}
+	image_osd_set(lw->image, enable, enable);
 }
 
 void layout_image_overlay_update(LayoutWindow *lw)
 {
 	if (!lw || !lw->full_screen) return;
-	if (lw->full_screen_overlay_id != -1) image_overlay_update(lw->image, lw->full_screen_overlay_id);
+
+	image_osd_update(lw->image);
 }
 
 /*
@@ -344,7 +331,6 @@
 		}
 
 	lw->full_screen = NULL;
-	lw->full_screen_overlay_id = -1;
 }
 
 void layout_image_full_screen_start(LayoutWindow *lw)