comparison src/image-overlay.c @ 481:67a612985686

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

480:805c3258d228

#define IMAGE_OSD_DEFAULT_DURATION 30

#define HISTOGRAM_HEIGHT 140

void set_default_image_overlay_template_string(ConfOptions *options)
{
	if (options->image_overlay.common.template_string) g_free(options->image_overlay.common.template_string);
	options->image_overlay.common.template_string = g_strdup(DEFAULT_OVERLAY_INFO);
}

{
	if (imd->histogram)
		histogram_set_mode(imd->histogram, !histogram_get_mode(imd->histogram));
}



static void image_osd_timer_schedule(OverlayStateData *osd);

static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *vars)
{
	gchar delim = '%', imp = '|', sep[] = " - ";
	gchar *start, *end;

481:67a612985686

#define IMAGE_OSD_DEFAULT_DURATION 30

#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);
	options->image_overlay.common.template_string = g_strdup(DEFAULT_OVERLAY_INFO);
}

{
	if (imd->histogram)
		histogram_set_mode(imd->histogram, !histogram_get_mode(imd->histogram));
}

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)
{
	gchar delim = '%', imp = '|', sep[] = " - ";
	gchar *start, *end;