Mercurial > geeqie
comparison src/image-overlay.c @ 621:734b6b0a3356
image_osd_get() now returns OsdShowFlags.
| author | zas_ |
|---|---|
| date | Sat, 10 May 2008 14:22:18 +0000 |
| parents | f335373f44e5 |
| children | 54e20abb5c6d |
comparison
equal
deleted
inserted
replaced
| 620:f335373f44e5 | 621:734b6b0a3356 |
|---|---|
| 843 } | 843 } |
| 844 | 844 |
| 845 image_osd_enable(imd, show); | 845 image_osd_enable(imd, show); |
| 846 } | 846 } |
| 847 | 847 |
| 848 gint image_osd_get(ImageWindow *imd, OsdShowFlags *show) | 848 OsdShowFlags image_osd_get(ImageWindow *imd) |
| 849 { | 849 { |
| 850 OverlayStateData *osd = image_get_osd_data(imd); | 850 OverlayStateData *osd = image_get_osd_data(imd); |
| 851 | 851 |
| 852 if (!osd) | 852 return osd ? osd->show : OSD_SHOW_NOTHING; |
| 853 { | |
| 854 if (show) *show = OSD_SHOW_NOTHING; | |
| 855 return FALSE; | |
| 856 } | |
| 857 | |
| 858 if (show) *show = osd->show; | |
| 859 | |
| 860 return TRUE; | |
| 861 } | 853 } |
| 862 | 854 |
| 863 /* duration: | 855 /* duration: |
| 864 0 = hide | 856 0 = hide |
| 865 1 = show | 857 1 = show |