Mercurial > geeqie

comparison src/layout_image.c @ 117:0c2e1f0a001b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net> * 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.
author gqview
date Wed, 29 Nov 2006 19:38:25 +0000
parents 55166d93498d
children e2a8b7f2165b
comparison
equal deleted inserted replaced
116:1bd40943dc2a 117:0c2e1f0a001b
47 { 47 {
48 lw->full_screen_overlay_on = enable; 48 lw->full_screen_overlay_on = enable;
49 49
50 if (!lw->full_screen) return; 50 if (!lw->full_screen) return;
51 51
52 if (enable) 52 image_osd_set(lw->image, enable, enable);
53 {
54 if (lw->full_screen_overlay_id == -1)
55 {
56 lw->full_screen_overlay_id = image_overlay_info_enable(lw->image);
57 }
58 }
59 else
60 {
61 if (lw->full_screen_overlay_id != -1)
62 {
63 image_overlay_info_disable(lw->image, lw->full_screen_overlay_id);
64 lw->full_screen_overlay_id = -1;
65 }
66 }
67 } 53 }
68 54
69 void layout_image_overlay_update(LayoutWindow *lw) 55 void layout_image_overlay_update(LayoutWindow *lw)
70 { 56 {
71 if (!lw || !lw->full_screen) return; 57 if (!lw || !lw->full_screen) return;
72 if (lw->full_screen_overlay_id != -1) image_overlay_update(lw->image, lw->full_screen_overlay_id); 58
59 image_osd_update(lw->image);
73 } 60 }
74 61
75 /* 62 /*
76 *---------------------------------------------------------------------------- 63 *----------------------------------------------------------------------------
77 * full screen 64 * full screen
342 { 329 {
343 lw->slideshow->imd = lw->image; 330 lw->slideshow->imd = lw->image;
344 } 331 }
345 332
346 lw->full_screen = NULL; 333 lw->full_screen = NULL;
347 lw->full_screen_overlay_id = -1;
348 } 334 }
349 335
350 void layout_image_full_screen_start(LayoutWindow *lw) 336 void layout_image_full_screen_start(LayoutWindow *lw)
351 { 337 {
352 if (!layout_valid(&lw)) return; 338 if (!layout_valid(&lw)) return;