diff src/img-view.c @ 122:e2a8b7f2165b

Sat Dec 2 16:44:48 2006 John Ellis <[e-mail]> * image-overlay.[ch]: More work on osd icons. * image.c: Use correct flag when setting auto rotation state, and set the state again after the rotation so that osd can update. * img-view.c: Show osd icon when overlay is enabled. * layout.c, layout_image.[ch]: Enable overlay regardless of the full screen state, only difference now is that image description text is only shown when in full screen but icons will always appear. * layout_util.c: Make I key toggle overlay from windowed mode too. * typedefs.h (LayoutWindow): Remove no longer used full_screen_overlay_on.

--- a/src/img-view.c	Fri Dec 01 19:41:45 2006 +0000
+++ b/src/img-view.c	Sat Dec 02 21:57:12 2006 +0000
@@ -688,15 +688,13 @@
 
 static void view_fullscreen_toggle(ViewWindow *vw, gint force_off)
 {
-	gint info, status;
-
 	if (force_off && !vw->fs) return;
 
 	if (vw->fs)
 		{
-		if (image_osd_get(vw->fs->imd, &info, &status))
+		if (image_osd_get(vw->fs->imd, NULL, NULL))
 			{
-			image_osd_set(vw->imd, info, status);
+			image_osd_set(vw->imd, TRUE, TRUE);
 			}
 
 		fullscreen_stop(vw->fs);
@@ -711,10 +709,10 @@
 
 		if (vw->ss) vw->ss->imd = vw->fs->imd;
 
-		if (image_osd_get(vw->imd, &info, &status))
+		if (image_osd_get(vw->imd, NULL, NULL))
 			{
 			image_osd_set(vw->imd, FALSE, FALSE);
-			image_osd_set(vw->fs->imd, info, status);
+			image_osd_set(vw->fs->imd, TRUE, TRUE);
 			}
 		}
 }
@@ -728,6 +726,7 @@
 	if (!image_osd_get(imd, NULL, NULL))
 		{
 		image_osd_set(imd, TRUE, TRUE);
+		image_osd_icon(imd, IMAGE_OSD_ICON, -1);
 		}
 	else
 		{