Mercurial > geeqie

diff src/layout_image.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 8268cbe682f1
line wrap: on
line diff
--- a/src/layout_image.c	Sat May 10 13:54:25 2008 +0000
+++ b/src/layout_image.c	Sat May 10 14:22:18 2008 +0000
@@ -358,9 +358,9 @@
 	if (lw->tools) gtk_widget_set_sensitive(lw->tools, FALSE);
 #endif
 
-	if (image_osd_get(lw->full_screen->normal_imd, NULL))
+	if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
 		{
-		image_osd_set(lw->image, OSD_SHOW_INFO | OSD_SHOW_STATUS);
+		image_osd_set(lw->image, image_osd_get(lw->full_screen->normal_imd));
 		image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_NOTHING);
 		}
 }
@@ -370,10 +370,9 @@
 	if (!layout_valid(&lw)) return;
 	if (!lw->full_screen) return;
 
-	if (image_osd_get(lw->image, NULL))
-		{
-		image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_STATUS);
-		}
+	if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
+		image_osd_set(lw->full_screen->normal_imd, image_osd_get(lw->image));
+
 	fullscreen_stop(lw->full_screen);
 
 #if 0