summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-05-17 14:33:48 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-05-17 14:40:07 +0900
commit311c06c35b62e1866e15a2a6903bd3df6aae81ef (patch)
tree0e1d607ac2cc5fd46697ec35e36fc0c2c4456ec6
parenta888f0a7c5d69fa502b03356fbbbda7ff483a175 (diff)
downloadefl-311c06c35b62e1866e15a2a6903bd3df6aae81ef.tar.gz
photocam: rename 'paused' API to 'zoom_animation'devs/ami/photocam_cleanup
and mark paused_set/get as legacy APIs. Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
-rw-r--r--src/lib/elementary/elm_photocam.c16
-rw-r--r--src/lib/elementary/elm_photocam.eo10
-rw-r--r--src/lib/elementary/elm_photocam_legacy.h24
3 files changed, 43 insertions, 7 deletions
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index f09bd5e2c0..fd62c800e4 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -2245,7 +2245,7 @@ _elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Dat
}
EOLIAN static void
-_elm_photocam_paused_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused)
+_elm_photocam_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused)
{
paused = !!paused;
@@ -2258,7 +2258,7 @@ _elm_photocam_paused_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused)
}
EOLIAN static Eina_Bool
-_elm_photocam_paused_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
+_elm_photocam_zoom_animation_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
{
return sd->paused;
}
@@ -2466,3 +2466,15 @@ elm_photocam_image_size_get(const Evas_Object *obj, int *w, int *h)
{
efl_gfx_view_size_get(obj, w, h);
}
+
+EAPI Eina_Bool
+elm_photocam_paused_get(const Evas_Object *obj)
+{
+ return elm_obj_photocam_zoom_animation_get(obj);
+}
+
+EAPI void
+elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused)
+{
+ elm_obj_photocam_zoom_animation_set(obj, paused);
+}
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index 4225e47276..f27d595f8d 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -18,20 +18,20 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
eo_prefix: elm_obj_photocam;
event_prefix: elm_photocam;
methods {
- @property paused {
+ @property zoom_animation {
set {
- [[Set the paused state for photocam
+ [[Enable zoom animation
- This sets the paused state to on or off for photocam. The
+ This sets the zoom animation state to on or off for photocam. The
default is off. This will stop zooming using animation on
zoom level changes and change instantly. This will stop any
existing animations that are running.
]]
}
get {
- [[Get the paused state for photocam
+ [[Disable zoom animation
- This gets the current paused state for the photocam object.
+ This gets the current zoom animation state for the photocam object.
]]
}
values {
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index 3c2d09ba52..2ea43e0ffe 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -121,4 +121,28 @@ EAPI void elm_photocam_image_region_show(Evas_Object *obj, int x, i
*/
EAPI void elm_photocam_image_size_get(const Evas_Object *obj, int *w, int *h);
+/**
+ * @brief Get the paused state for photocam
+ *
+ * This gets the current paused state for the photocam object.
+ *
+ * @return The pause state.
+ *
+ * @ingroup Elm_Photocam
+ */
+EAPI Eina_Bool elm_photocam_paused_get(const Evas_Object *obj);
+
+/**
+ * @brief Set the paused state for photocam
+ *
+ * This sets the paused state to on or off for photocam. The default is off.
+ * This will stop zooming using animation on zoom level changes and change
+ * instantly. This will stop any existing animations that are running.
+ *
+ * @param[in] paused The pause state.
+ *
+ * @ingroup Elm_Photocam
+ */
+EAPI void elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused);
+
#include "elm_photocam.eo.legacy.h"