Mercurial > geeqie

diff src/img-view.c @ 621:734b6b0a3356

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
image_osd_get() now returns OsdShowFlags.
author zas_
date Sat, 10 May 2008 14:22:18 +0000
parents b2898f04c82e
children e34c1002e553
line wrap: on
line diff
--- a/src/img-view.c	Sat May 10 13:54:25 2008 +0000
+++ b/src/img-view.c	Sat May 10 14:22:18 2008 +0000
@@ -695,11 +695,9 @@
 
 	if (vw->fs)
 		{
-		if (image_osd_get(vw->fs->imd, NULL))
-			{
-			image_osd_set(vw->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
-			}
-
+		if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
+			image_osd_set(vw->imd, image_osd_get(vw->fs->imd));
+		
 		fullscreen_stop(vw->fs);
 		}
 	else
@@ -712,10 +710,10 @@
 
 		if (vw->ss) vw->ss->imd = vw->fs->imd;
 
-		if (image_osd_get(vw->imd, NULL))
+		if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
 			{
+			image_osd_set(vw->fs->imd, image_osd_get(vw->imd));
 			image_osd_set(vw->imd, OSD_SHOW_NOTHING);
-			image_osd_set(vw->fs->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
 			}
 		}
 }