vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

photocam: merge image_region_show() into image_region 

and mark this API as legacy

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
This commit is contained in:
Amitesh Singh 2017-05-17 13:02:31 +09:00
parent ef4cae6c7f
commit bf31dcd2d0
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/elementary/elm_photocam.c
View File

@ -2186,7 +2186,7 @@ _elm_photocam_image_region_get(Eo *obj, Elm_Photocam_Data *sd, int *x, int *y, i
} }
EOLIAN static void EOLIAN static void
_elm_photocam_image_region_show(Eo *obj, Elm_Photocam_Data *sd, int x, int y, int w, int h) _elm_photocam_image_region_set(Eo *obj, Elm_Photocam_Data *sd, int x, int y, int w, int h)
{ {
int rx, ry, rw, rh; int rx, ry, rw, rh;
@ -2206,6 +2206,12 @@ _elm_photocam_image_region_show(Eo *obj, Elm_Photocam_Data *sd, int x, int y, in
elm_interface_scrollable_content_region_show(obj, rx, ry, rw, rh); elm_interface_scrollable_content_region_show(obj, rx, ry, rw, rh);
} }
EAPI void
elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h)
{
elm_obj_photocam_image_region_set(obj, x, y, w, h);
}
EAPI void EAPI void
elm_photocam_image_region_bring_in(Evas_Object *obj, elm_photocam_image_region_bring_in(Evas_Object *obj,
int x, int x,

28
src/lib/elementary/elm_photocam.eo
View File

@ -115,14 +115,20 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
get { get {
[[Get the region of the image that is currently shown [[Get the region of the image that is currently shown
See also @.image_region_show. See also @.image_region.set.
]]
}
set {
[[Set the viewed region of the image
This shows the region of the image without using animation.
]] ]]
} }
values { values {
x: int; [[A pointer to the X-coordinate of region]] x: int; [[X-coordinate of region in image original pixels]]
y: int; [[A pointer to the Y-coordinate of region]] y: int; [[Y-coordinate of region in image original pixels]]
w: int; [[A pointer to the width]] w: int; [[Width of region in image original pixels]]
h: int; [[A pointer to the height]] h: int; [[Height of region in image original pixels]]
} }
} }
@property image_size { @property image_size {
@ -139,18 +145,6 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
h: int; [[A pointer to the height return]] h: int; [[A pointer to the height return]]
} }
} }
image_region_show {
[[Set the viewed region of the image
This shows the region of the image without using animation.
]]
params {
@in x: int; [[X-coordinate of region in image original pixels]]
@in y: int; [[Y-coordinate of region in image original pixels]]
@in w: int; [[Width of region in image original pixels]]
@in h: int; [[Height of region in image original pixels]]
}
}
} }
implements { implements {
class.constructor; class.constructor;

14
src/lib/elementary/elm_photocam_legacy.h
View File

@ -94,4 +94,18 @@ EAPI Evas_Image_Orient elm_photocam_image_orient_get(const Evas_Object *obj);
*/ */
EAPI Evas_Object* elm_photocam_internal_image_get(const Evas_Object *obj); EAPI Evas_Object* elm_photocam_internal_image_get(const Evas_Object *obj);
/**
* @brief Set the viewed region of the image
*
* This shows the region of the image without using animation.
*
* @param[in] x X-coordinate of region in image original pixels
* @param[in] y Y-coordinate of region in image original pixels
* @param[in] w Width of region in image original pixels
* @param[in] h Height of region in image original pixels
*
* @ingroup Elm_Photocam
*/
EAPI void elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h);
#include "elm_photocam.eo.legacy.h" #include "elm_photocam.eo.legacy.h"