Mercurial > geeqie.yaz
comparison src/img-view.c @ 621:734b6b0a3356
image_osd_get() now returns OsdShowFlags.
| author | zas_ |
|---|---|
| date | Sat, 10 May 2008 14:22:18 +0000 |
| parents | b2898f04c82e |
| children | e34c1002e553 |
comparison
equal
deleted
inserted
replaced
| 620:f335373f44e5 | 621:734b6b0a3356 |
|---|---|
| 693 { | 693 { |
| 694 if (force_off && !vw->fs) return; | 694 if (force_off && !vw->fs) return; |
| 695 | 695 |
| 696 if (vw->fs) | 696 if (vw->fs) |
| 697 { | 697 { |
| 698 if (image_osd_get(vw->fs->imd, NULL)) | 698 if (image_osd_get(vw->imd) & OSD_SHOW_INFO) |
| 699 { | 699 image_osd_set(vw->imd, image_osd_get(vw->fs->imd)); |
| 700 image_osd_set(vw->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS); | 700 |
| 701 } | |
| 702 | |
| 703 fullscreen_stop(vw->fs); | 701 fullscreen_stop(vw->fs); |
| 704 } | 702 } |
| 705 else | 703 else |
| 706 { | 704 { |
| 707 vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw); | 705 vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw); |
| 710 g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event", | 708 g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event", |
| 711 G_CALLBACK(view_window_key_press_cb), vw); | 709 G_CALLBACK(view_window_key_press_cb), vw); |
| 712 | 710 |
| 713 if (vw->ss) vw->ss->imd = vw->fs->imd; | 711 if (vw->ss) vw->ss->imd = vw->fs->imd; |
| 714 | 712 |
| 715 if (image_osd_get(vw->imd, NULL)) | 713 if (image_osd_get(vw->imd) & OSD_SHOW_INFO) |
| 716 { | 714 { |
| 715 image_osd_set(vw->fs->imd, image_osd_get(vw->imd)); | |
| 717 image_osd_set(vw->imd, OSD_SHOW_NOTHING); | 716 image_osd_set(vw->imd, OSD_SHOW_NOTHING); |
| 718 image_osd_set(vw->fs->imd, OSD_SHOW_INFO | OSD_SHOW_STATUS); | |
| 719 } | 717 } |
| 720 } | 718 } |
| 721 } | 719 } |
| 722 | 720 |
| 723 static void view_overlay_toggle(ViewWindow *vw) | 721 static void view_overlay_toggle(ViewWindow *vw) |