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

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 769ccf6..6cde4d8 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -321,7 +321,6 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
                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);
                        }
@@ -865,8 +864,6 @@ static gboolean image_osd_update_cb(gpointer data)
 {
        OverlayStateData *osd = data;
 
-       osd->imd->overlay_show_zoom = FALSE;
-
        if (osd->show & OSD_SHOW_INFO)
                {
                /* redraw when the image was changed, 

diff --git a/src/image.c b/src/image.c
index a5c596e..5ab56bd 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -91,15 +91,6 @@ static void image_update_util(ImageWindow *imd)
        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 @@ static void image_state_unset(ImageWindow *imd, ImageState state)
        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

diff --git a/src/typedefs.h b/src/typedefs.h
index 86fc4ea..b54d3d8 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -440,8 +440,6 @@ struct _ImageWindow
        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