summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi-Youn Park <jy0703.park@samsung.com>2016-03-24 17:54:05 +0830
committerJi-Youn Park <jy0703.park@samsung.com>2016-03-24 17:54:08 +0830
commitc66d478ebb2c1a0aff52571467d7a6b87a533382 (patch)
tree505a14e1ced21ed23ece42083ac7791fa9f9b851
parentae64b6366713c3e579f8a6905ee444dd97149f75 (diff)
Elm_image: remove Elm_Image_Orient and orient property from EO.HEADmaster
-rw-r--r--src/lib/elm_image.c18
-rw-r--r--src/lib/elm_image.eo35
-rw-r--r--src/lib/elm_image_legacy.h45
-rw-r--r--src/lib/elm_widget_image.h2
4 files changed, 63 insertions, 37 deletions
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index c5ebf5f..4c3a9c0 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1265,7 +1265,7 @@ _elm_image_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd,
1265} 1265}
1266 1266
1267EOLIAN static void 1267EOLIAN static void
1268_elm_image_orient_set(Eo *obj, Elm_Image_Data *sd, Elm_Image_Orient orient) 1268_elm_image_efl_image_orientation_set(Eo *obj, Elm_Image_Data *sd, Efl_Gfx_Orientation orient)
1269{ 1269{
1270 if (sd->edje) return; 1270 if (sd->edje) return;
1271 if (sd->orient == orient) return; 1271 if (sd->orient == orient) return;
@@ -1275,8 +1275,8 @@ _elm_image_orient_set(Eo *obj, Elm_Image_Data *sd, Elm_Image_Orient orient)
1275 _elm_image_internal_sizing_eval(obj, sd); 1275 _elm_image_internal_sizing_eval(obj, sd);
1276} 1276}
1277 1277
1278EOLIAN static Elm_Image_Orient 1278EOLIAN static Efl_Gfx_Orientation
1279_elm_image_orient_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd) 1279_elm_image_efl_image_orientation_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
1280{ 1280{
1281 return sd->orient; 1281 return sd->orient;
1282} 1282}
@@ -1672,4 +1672,16 @@ elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disable)
1672 } 1672 }
1673} 1673}
1674 1674
1675EAPI void
1676elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
1677{
1678 efl_image_orientation_set(obj, (Efl_Gfx_Orientation) orient);
1679}
1680
1681EAPI Elm_Image_Orient
1682elm_image_orient_get(const Evas_Object *obj)
1683{
1684 return (Elm_Image_Orient) efl_image_orientation_get(obj);
1685}
1686
1675#include "elm_image.eo.c" 1687#include "elm_image.eo.c"
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index a65eca8..9d12d95 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -1,26 +1,5 @@
1import evas_image; 1import evas_image;
2 2
3enum Elm.Image_Orient
4{
5 [[
6 Using Evas_Image_Orient enums.
7 @since 1.14
8 ]]
9 legacy: elm_image;
10 orient_none = Evas.Image_Orient.orient_none,
11 orient_0 = Evas.Image_Orient.orient_0,
12 rotate_90 = Evas.Image_Orient.orient_90,
13 orient_90 = Evas.Image_Orient.orient_90,
14 rotate_180 = Evas.Image_Orient.orient_180,
15 orient_180 = Evas.Image_Orient.orient_180,
16 rotate_270 = Evas.Image_Orient.orient_270,
17 orient_270 = Evas.Image_Orient.orient_270,
18 flip_horizontal = Evas.Image_Orient.flip_horizontal,
19 flip_vertical = Evas.Image_Orient.flip_vertical,
20 flip_transpose = Evas.Image_Orient.flip_transpose,
21 flip_transverse = Evas.Image_Orient.flip_transverse
22}
23
24struct Elm.Image_Progress 3struct Elm.Image_Progress
25{ 4{
26 [[ 5 [[
@@ -128,18 +107,6 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image_Load, Evas.Clickable_Interface,
128 fixed: bool; [[$true if the image should retain the aspect, $false otherwise.]] 107 fixed: bool; [[$true if the image should retain the aspect, $false otherwise.]]
129 } 108 }
130 } 109 }
131 @property orient {
132 [[Contrtol the image orientation.
133
134 This function allows to rotate or flip the given image.]]
135 set {
136 }
137 get {
138 }
139 values {
140 orient: Elm.Image_Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]]
141 }
142 }
143 @property resizable { 110 @property resizable {
144 [[Control if the object is (up/down) resizable. 111 [[Control if the object is (up/down) resizable.
145 112
@@ -200,6 +167,8 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image_Load, Evas.Clickable_Interface,
200 Efl.Image_Load.load_size.get; 167 Efl.Image_Load.load_size.get;
201 Efl.Image.smooth_scale.set; 168 Efl.Image.smooth_scale.set;
202 Efl.Image.smooth_scale.get; 169 Efl.Image.smooth_scale.get;
170 Efl.Image.orientation.set;
171 Efl.Image.orientation.get;
203 Efl.Player.playable.get; 172 Efl.Player.playable.get;
204 Efl.Player.play.set; 173 Efl.Player.play.set;
205 Efl.Player.play.get; 174 Efl.Player.play.get;
diff --git a/src/lib/elm_image_legacy.h b/src/lib/elm_image_legacy.h
index 4d4e1d8..dddbb71 100644
--- a/src/lib/elm_image_legacy.h
+++ b/src/lib/elm_image_legacy.h
@@ -374,5 +374,50 @@ EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
374 */ 374 */
375EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled); 375EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);
376 376
377/** Using Evas_Image_Orient enums.
378 *
379 * @since 1.14
380 *
381 * @ingroup Elm_Image
382 */
383typedef enum _Elm_Image_Orient_Type
384{
385 ELM_IMAGE_ORIENT_NONE = 0 /* Evas.Image_Orient.orient_none */,
386 ELM_IMAGE_ORIENT_0 = 0 /* Evas.Image_Orient.orient_0 */,
387 ELM_IMAGE_ROTATE_90 = 1 /* Evas.Image_Orient.orient_90 */,
388 ELM_IMAGE_ORIENT_90 = 1 /* Evas.Image_Orient.orient_90 */,
389 ELM_IMAGE_ROTATE_180 = 2 /* Evas.Image_Orient.orient_180 */,
390 ELM_IMAGE_ORIENT_180 = 2 /* Evas.Image_Orient.orient_180 */,
391 ELM_IMAGE_ROTATE_270 = 3 /* Evas.Image_Orient.orient_270 */,
392 ELM_IMAGE_ORIENT_270 = 3 /* Evas.Image_Orient.orient_270 */,
393 ELM_IMAGE_FLIP_HORIZONTAL = 4 /* Evas.Image_Orient.flip_horizontal */,
394 ELM_IMAGE_FLIP_VERTICAL = 5 /* Evas.Image_Orient.flip_vertical */,
395 ELM_IMAGE_FLIP_TRANSPOSE = 6 /* Evas.Image_Orient.flip_transpose */,
396 ELM_IMAGE_FLIP_TRANSVERSE = 7 /* Evas.Image_Orient.flip_transverse */
397} Elm_Image_Orient;
398
399/**
400 * @brief Contrtol the image orientation.
401 *
402 * This function allows to rotate or flip the given image.
403 *
404 * @param[in] orient The image orientation Elm.Image.Orient Default is
405 * #ELM_IMAGE_ORIENT_NONE.
406 *
407 * @ingroup Elm_Image
408 */
409EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient);
410
411/**
412 * @brief Contrtol the image orientation.
413 *
414 * This function allows to rotate or flip the given image.
415 *
416 * @return The image orientation Elm.Image.Orient Default is
417 * #ELM_IMAGE_ORIENT_NONE.
418 *
419 * @ingroup Elm_Image
420 */
421EAPI Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj);
377 422
378#include "elm_image.eo.legacy.h" 423#include "elm_image.eo.legacy.h"
diff --git a/src/lib/elm_widget_image.h b/src/lib/elm_widget_image.h
index 7836d90..1439824 100644
--- a/src/lib/elm_widget_image.h
+++ b/src/lib/elm_widget_image.h
@@ -61,7 +61,7 @@ struct _Elm_Image_Data
61 int frame_count; 61 int frame_count;
62 int cur_frame; 62 int cur_frame;
63 63
64 Elm_Image_Orient orient; 64 Efl_Gfx_Orientation orient;
65 65
66 struct { 66 struct {
67 Ecore_Thread *th; 67 Ecore_Thread *th;