changeset 1750:c71126e3b2f9

Fix osd zoom level refreshing (it was broken since some times).

--- a/src/image-overlay.c	Wed Jan 13 19:49:39 2010 +0000
+++ b/src/image-overlay.c	Sun Jan 17 13:34:48 2010 +0000
@@ -283,7 +283,6 @@
 		else
 			{
 			data = g_strdup(g_hash_table_lookup(vars, name));
-			if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
 			if (!data)
 				data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
 			}
@@ -827,8 +826,6 @@
 {
 	OverlayStateData *osd = data;
 
-	osd->imd->overlay_show_zoom = FALSE;
-
 	if (osd->show & OSD_SHOW_INFO)
 		{
 		/* redraw when the image was changed, 

--- a/src/image.c	Wed Jan 13 19:49:39 2010 +0000
+++ b/src/image.c	Sun Jan 17 13:34:48 2010 +0000
@@ -91,15 +91,6 @@
 	if (imd->func_update) imd->func_update(imd, imd->data_update);
 }
 
-static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
-{
-	ImageWindow *imd = data;
-
-	if (imd->title_show_zoom) image_update_title(imd);
-	if (imd->overlay_show_zoom) image_osd_update(imd);
-
-	image_update_util(imd);
-}
 
 static void image_complete_util(ImageWindow *imd, gboolean preload)
 {
@@ -140,6 +131,15 @@
 	if (imd->func_state) imd->func_state(imd, state, imd->data_state);
 }
 
+static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
+{
+	ImageWindow *imd = data;
+
+	if (imd->title_show_zoom) image_update_title(imd);
+	image_state_set(imd, IMAGE_STATE_IMAGE);
+	image_update_util(imd);
+}
+
 /*
  *-------------------------------------------------------------------
  * misc

--- a/src/typedefs.h	Wed Jan 13 19:49:39 2010 +0000
+++ b/src/typedefs.h	Sun Jan 17 13:34:48 2010 +0000
@@ -436,8 +436,6 @@
 	gboolean delay_flip;
 	gint orientation;
 	gboolean desaturate;
-
-	gboolean overlay_show_zoom; /* set to true if overlay is showing zoom ratio */
 };
 
 #define FILEDATA_MARKS_SIZE 6