Use image_osd_toggle() in layout_menu_overlay_cb().

Drop layout_image_overlay_update().
BestImageViewer · Apr 22, 2008 · b38d66e · b38d66e
1 parent 996cf10
commit b38d66e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 28 deletions.
diff --git a/src/image-overlay.c b/src/image-overlay.c
@@ -108,13 +108,19 @@ gint image_osd_histogram_onoff_status(ImageWindow *imd)
 void image_osd_histogram_chan_toggle(ImageWindow *imd)
 {
 	if (imd->histogram)
+		{
 		histogram_set_channel(imd->histogram, (histogram_get_channel(imd->histogram) +1)%HCHAN_COUNT);
+		image_osd_update(imd);
+		}
 }
 
 void image_osd_histogram_log_toggle(ImageWindow *imd)
 {
 	if (imd->histogram)
+		{
 		histogram_set_mode(imd->histogram, !histogram_get_mode(imd->histogram));
+		image_osd_update(imd);
+		}
 }
 
 void image_osd_toggle(ImageWindow *imd)

diff --git a/src/layout.c b/src/layout.c
@@ -15,6 +15,7 @@
 
 #include "image.h"
 #include "color-man.h"
+#include "image-overlay.h"
 #include "layout_config.h"
 #include "layout_image.h"
 #include "layout_util.h"
@@ -559,7 +560,7 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
 
 		text = buf;
 
-		layout_image_overlay_update(lw);
+		image_osd_update(lw->image);
 		}
 
 	gtk_label_set_text(GTK_LABEL(lw->info_status), text);

diff --git a/src/layout_image.c b/src/layout_image.c
@@ -50,13 +50,6 @@ void layout_image_overlay_toggle(LayoutWindow *lw)
 	image_osd_toggle(lw->image);
 }
 
-void layout_image_overlay_update(LayoutWindow *lw)
-{
-	if (!lw) return;
-
-	image_osd_update(lw->image);
-}
-
 /*
  *----------------------------------------------------------------------------
  * full screen

diff --git a/src/layout_image.h b/src/layout_image.h
@@ -76,8 +76,6 @@ gint layout_image_slideshow_paused(LayoutWindow *lw);
 
 
 void layout_image_overlay_toggle(LayoutWindow *lw);
-void layout_image_overlay_update(LayoutWindow *lw);
-
 
 void layout_image_maint_renamed(LayoutWindow *lw, FileData *fd);
 void layout_image_maint_removed(LayoutWindow *lw, FileData *fd);

diff --git a/src/layout_util.c b/src/layout_util.c
@@ -550,38 +550,21 @@ static void layout_menu_overlay_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
 
-	if (image_osd_get(lw->image, NULL, NULL))
-		{
-		if (image_osd_histogram_onoff_status(lw->image))
-			{
-			image_osd_histogram_onoff_toggle(lw->image, 0);
-			layout_image_overlay_update(lw);
-			}
-		else
-			layout_image_overlay_toggle(lw);
-		}
-	else
-		{
-		layout_image_overlay_toggle(lw);
-		image_osd_histogram_onoff_toggle(lw->image, 1);
-		layout_image_overlay_update(lw);
-		}
+	image_osd_toggle(lw->image);
 }
 
 static void layout_menu_histogram_chan_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
 
 	image_osd_histogram_chan_toggle(lw->image);
-	layout_image_overlay_update(lw);
 }
 
 static void layout_menu_histogram_log_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
 
 	image_osd_histogram_log_toggle(lw->image);
-	layout_image_overlay_update(lw);
 }
 
 static void layout_menu_refresh_cb(GtkAction *action, gpointer data)