From 6b56241c3a88f437ed045b10939591ec905e147a Mon Sep 17 00:00:00 2001 From: Jonathan Atton Date: Fri, 2 Oct 2009 13:03:57 +0000 Subject: [PATCH] elm photocam : add file_get()> elm slideshow test : fix a bug SVN revision: 42857 --- legacy/elementary/src/bin/test_slideshow.c | 2 +- legacy/elementary/src/lib/Elementary.h.in | 1 + legacy/elementary/src/lib/elm_photocam.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/src/bin/test_slideshow.c b/legacy/elementary/src/bin/test_slideshow.c index dec7d010e8..19ea456234 100644 --- a/legacy/elementary/src/bin/test_slideshow.c +++ b/legacy/elementary/src/bin/test_slideshow.c @@ -109,7 +109,7 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info) bx = elm_box_add(win); elm_box_horizontal_set(bx, 1); elm_notify_content_set(notify, bx); - evas_object_show(bt); + evas_object_show(bx); evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in, notify); evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_OUT, _mouse_out, notify); diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 778888787f..e442676d41 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -881,6 +881,7 @@ extern "C" { } Elm_Photocam_Zoom_Mode; EAPI Evas_Object *elm_photocam_add(Evas_Object *parent); EAPI int elm_photocam_file_set(Evas_Object *obj, const char *file); + EAPI const char * elm_photocam_file_get(Evas_Object *obj); EAPI void elm_photocam_zoom_set(Evas_Object *obj, int zoom); EAPI int elm_photocam_zoom_get(Evas_Object *obj); EAPI void elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode); diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 5782296a9c..b1850ca32a 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -979,6 +979,20 @@ elm_photocam_file_set(Evas_Object *obj, const char *file) return evas_object_image_load_error_get(wd->img); } +/* + * Returns the path of the current image file + * + * @param obj The photocam object + * @return Returns the path + * + * @ingroup Photocam + */ +EAPI const char * elm_photocam_file_get(Evas_Object *obj) +{ + Widget_Data *wd = elm_widget_data_get(obj); + return wd->file; +} + /** * Set the zoom level of the photo *