Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_togg...

diff --git a/src/image-overlay.c b/src/image-overlay.c
index d76a43c..662cd16 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -77,6 +77,9 @@ static OSDIcon osd_icons[] = {
 
 #define HISTOGRAM_HEIGHT 140
 
+static void image_osd_timer_schedule(OverlayStateData *osd);
+
+
 void set_default_image_overlay_template_string(ConfOptions *options)
 {
        if (options->image_overlay.common.template_string) g_free(options->image_overlay.common.template_string);
@@ -114,9 +117,28 @@ void image_osd_histogram_log_toggle(ImageWindow *imd)
                histogram_set_mode(imd->histogram, !histogram_get_mode(imd->histogram));
 }
 
-
-
-static void image_osd_timer_schedule(OverlayStateData *osd);
+void image_osd_toggle(ImageWindow *imd)
+{
+       if (image_osd_get(imd, NULL, NULL))
+               {
+               if (image_osd_histogram_onoff_status(imd))
+                       {
+                       image_osd_histogram_onoff_toggle(imd, 0);
+                       image_osd_update(imd);
+                       }
+               else
+                       {
+                       image_osd_set(imd, FALSE, FALSE);
+                       }
+               }
+       else
+               {
+               image_osd_set(imd, TRUE, TRUE);
+               image_osd_icon(imd, IMAGE_OSD_ICON, -1);
+               image_osd_histogram_onoff_toggle(imd, 1);
+               image_osd_update(imd);
+               }
+}
 
 static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *vars)
 {

diff --git a/src/image-overlay.h b/src/image-overlay.h
index 793479c..51ab21e 100644 (file)
--- a/src/image-overlay.h
+++ b/src/image-overlay.h
@@ -38,4 +38,7 @@ gint image_osd_histogram_onoff_status(ImageWindow *);
 void image_osd_histogram_chan_toggle(ImageWindow *);
 void image_osd_histogram_log_toggle(ImageWindow *);
 
+void image_osd_toggle(ImageWindow *imd);
+
+
 #endif

diff --git a/src/img-view.c b/src/img-view.c
index fc6c921..5dd013f 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -725,16 +725,8 @@ static void view_overlay_toggle(ViewWindow *vw)
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
-
-       if (!image_osd_get(imd, NULL, NULL))
-               {
-               image_osd_set(imd, TRUE, TRUE);
-               image_osd_icon(imd, IMAGE_OSD_ICON, -1);
-               }
-       else
-               {
-               image_osd_set(imd, FALSE, FALSE);
-               }
+       
+       image_osd_toggle(imd);
 }
 
 static void view_slideshow_next(ViewWindow *vw)

diff --git a/src/layout_image.c b/src/layout_image.c
index 6c7752f..ed90b10 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -46,15 +46,8 @@ static void layout_image_set_buttons(LayoutWindow *lw);
 
 void layout_image_overlay_toggle(LayoutWindow *lw)
 {
-       if (image_osd_get(lw->image, NULL, NULL))
-               {
-               image_osd_set(lw->image, FALSE, FALSE);
-               }
-       else
-               {
-               image_osd_set(lw->image, (lw->full_screen != NULL), TRUE);
-               image_osd_icon(lw->image, IMAGE_OSD_ICON, -1);
-               }
+       if (!lw) return;
+       image_osd_toggle(lw->image);
 }
 
 void layout_image_overlay_update(LayoutWindow *lw)