comparison src/layout_image.c @ 117:0c2e1f0a001b

Wed Nov 29 14:28:30 2006 John Ellis <[e-mail]> * image-overlay.[ch]: Rewrite most of the information overlay code to be more flexible and easily extended. * image.[ch], typedefs.h: Remove image_new_func, and replace it with image_state_func callback which is much more informative. * img-view.c, layout.c, layout_image.c: Updates for new image overlay function names.

116:1bd40943dc2a

{
	lw->full_screen_overlay_on = enable;

	if (!lw->full_screen) return;

	if (enable)
		{
		if (lw->full_screen_overlay_id == -1)
			{
			lw->full_screen_overlay_id = image_overlay_info_enable(lw->image);
			}
		}
	else
		{
		if (lw->full_screen_overlay_id != -1)
			{
			image_overlay_info_disable(lw->image, lw->full_screen_overlay_id);
			lw->full_screen_overlay_id = -1;
			}
		}
}

void layout_image_overlay_update(LayoutWindow *lw)
{
	if (!lw || !lw->full_screen) return;
	if (lw->full_screen_overlay_id != -1) image_overlay_update(lw->image, lw->full_screen_overlay_id);
}

/*
 *----------------------------------------------------------------------------
 * full screen

		{
		lw->slideshow->imd = lw->image;
		}

	lw->full_screen = NULL;
	lw->full_screen_overlay_id = -1;
}

void layout_image_full_screen_start(LayoutWindow *lw)
{
	if (!layout_valid(&lw)) return;

117:0c2e1f0a001b

{
	lw->full_screen_overlay_on = enable;

	if (!lw->full_screen) return;

	image_osd_set(lw->image, enable, enable);
}

void layout_image_overlay_update(LayoutWindow *lw)
{
	if (!lw || !lw->full_screen) return;

	image_osd_update(lw->image);
}

/*
 *----------------------------------------------------------------------------
 * full screen

		{
		lw->slideshow->imd = lw->image;
		}

	lw->full_screen = NULL;
}

void layout_image_full_screen_start(LayoutWindow *lw)
{
	if (!layout_valid(&lw)) return;