diff src/image.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/image.c	Fri Dec 01 19:41:45 2006 +0000
+++ b/src/image.c	Sat Dec 02 21:57:12 2006 +0000
@@ -264,6 +264,8 @@
 						    (gint)((gdouble)y / pr->scale),
 						    0.50, 0.50);
 		}
+
+	if (exif_rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
 }
 
 static void image_post_process_alter(ImageWindow *imd, gint clamp)
@@ -460,7 +462,7 @@
 					break;
 				}
 
-			if (rotate) image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
+			if (rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
 			}
 		}