comparison src/img-view.c @ 614:b2898f04c82e

image_osd_get() and image_osd_set() now uses flags.

613:d06f422a6673

{
	if (force_off && !vw->fs) return;

	if (vw->fs)
		{
		if (image_osd_get(vw->fs->imd, NULL, NULL))
			{
			image_osd_set(vw->imd, TRUE, TRUE);
			}

		fullscreen_stop(vw->fs);
		}
	else

		g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
				 G_CALLBACK(view_window_key_press_cb), vw);

		if (vw->ss) vw->ss->imd = vw->fs->imd;

		if (image_osd_get(vw->imd, NULL, NULL))
			{
			image_osd_set(vw->imd, FALSE, FALSE);
			image_osd_set(vw->fs->imd, TRUE, TRUE);
			}
		}
}

static void view_overlay_toggle(ViewWindow *vw)

614:b2898f04c82e

{
	if (force_off && !vw->fs) return;

	if (vw->fs)
		{
		if (image_osd_get(vw->fs->imd, NULL))
			{
			image_osd_set(vw->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
			}

		fullscreen_stop(vw->fs);
		}
	else

		g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
				 G_CALLBACK(view_window_key_press_cb), vw);

		if (vw->ss) vw->ss->imd = vw->fs->imd;

		if (image_osd_get(vw->imd, NULL))
			{
			image_osd_set(vw->imd, OSD_SHOW_NOTHING);
			image_osd_set(vw->fs->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
			}
		}
}

static void view_overlay_toggle(ViewWindow *vw)