summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-05-20 11:52:10 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-20 11:52:10 -0400
commite9eb1c825a982f3f4e8ee74992bcee6d6c5a99cd (patch)
treefb56bd748a06c03fc38f70a3e08923c63e81a667 /src
parentb24fde67871707bafea7d3e638bca70c6ef75de0 (diff)
Rename Efl.Orient -> Efl.Gfx.Orientation
Summary: And the Efl.Orientation interface -> Efl.Gfx.Orientable (with proper c_prefix so it is not too cumbersome to use from C). Also, turned the theme_rotation_apply() parameter into an int to avoid confusion. Fixes T7919 Depends on D8912 Test Plan: Everything continues to build and pass tests Reviewers: zmike, bu5hm4n, cedric, Hermet, Jaehyun_Cho Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7919 Differential Revision: https://phab.enlightenment.org/D8926
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_evas_mask.c6
-rw-r--r--src/examples/evas/evas-images5.c16
-rw-r--r--src/lib/efl/Efl.h6
-rw-r--r--src/lib/efl/interfaces/efl_gfx_orientable.eo (renamed from src/lib/efl/interfaces/efl_orientation.eo)7
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_ui_direction.eo4
-rw-r--r--src/lib/efl/interfaces/meson.build2
-rw-r--r--src/lib/elementary/efl_ui_image.c30
-rw-r--r--src/lib/elementary/efl_ui_image.eo4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c78
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_private.h4
-rw-r--r--src/lib/elementary/efl_ui_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo3
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo4
-rw-r--r--src/lib/evas/canvas/evas_image_private.h2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c40
19 files changed, 106 insertions, 110 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index f62bced764..a4f53e039a 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -48,7 +48,7 @@ efl_eolian_files = \
48 lib/efl/interfaces/efl_gfx_blur.eo \ 48 lib/efl/interfaces/efl_gfx_blur.eo \
49 lib/efl/interfaces/efl_gfx_hint.eo \ 49 lib/efl/interfaces/efl_gfx_hint.eo \
50 lib/efl/interfaces/efl_model.eo \ 50 lib/efl/interfaces/efl_model.eo \
51 lib/efl/interfaces/efl_orientation.eo \ 51 lib/efl/interfaces/efl_gfx_orientable.eo \
52 lib/efl/interfaces/efl_container.eo \ 52 lib/efl/interfaces/efl_container.eo \
53 lib/efl/interfaces/efl_content.eo \ 53 lib/efl/interfaces/efl_content.eo \
54 lib/efl/interfaces/efl_gfx_arrangement.eo \ 54 lib/efl/interfaces/efl_gfx_arrangement.eo \
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 223d657b4c..b432ee0225 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -93,12 +93,12 @@ _toggle_map(void *data, const Efl_Event *ev EINA_UNUSED)
93static void 93static void
94_rotate_win(void *data, const Efl_Event *ev EINA_UNUSED) 94_rotate_win(void *data, const Efl_Event *ev EINA_UNUSED)
95{ 95{
96 //Efl_Orient orient; 96 //Efl_Gfx_Orientation orient;
97 Eo *win = data; 97 Eo *win = data;
98 98
99 // FIXME: This is not implemented??? 99 // FIXME: This is not implemented???
100 //orient = efl_orientation_get(win); 100 //orient = efl_gfx_orientation_get(win);
101 //efl_orientation_set(win, (orient + 90) % 360); 101 //efl_gfx_orientation_set(win, (orient + 90) % 360);
102 elm_win_rotation_set(win, (elm_win_rotation_get(win) + 90) % 360); 102 elm_win_rotation_set(win, (elm_win_rotation_get(win) + 90) % 360);
103} 103}
104 104
diff --git a/src/examples/evas/evas-images5.c b/src/examples/evas/evas-images5.c
index fa2794e952..7632b7fde1 100644
--- a/src/examples/evas/evas-images5.c
+++ b/src/examples/evas/evas-images5.c
@@ -76,7 +76,7 @@ _on_keydown(void *data EINA_UNUSED,
76 void *einfo) 76 void *einfo)
77{ 77{
78 Evas_Event_Key_Down *ev = einfo; 78 Evas_Event_Key_Down *ev = einfo;
79 Efl_Orient orient = efl_orientation_get(d.img); 79 Efl_Gfx_Orientation orient = efl_gfx_orientation_get(d.img);
80 80
81 if (strcmp(ev->key, "h") == 0) /* print help */ 81 if (strcmp(ev->key, "h") == 0) /* print help */
82 { 82 {
@@ -110,25 +110,25 @@ _on_keydown(void *data EINA_UNUSED,
110 switch (key_val) 110 switch (key_val)
111 { 111 {
112 case 0: 112 case 0:
113 efl_orientation_set(d.img, EFL_ORIENT_UP | (orient & EFL_ORIENT_FLIP_BITMASK)); 113 efl_gfx_orientation_set(d.img, EFL_GFX_ORIENTATION_UP | (orient & EFL_GFX_ORIENTATION_FLIP_BITMASK));
114 break; 114 break;
115 case 1: 115 case 1:
116 efl_orientation_set(d.img, EFL_ORIENT_RIGHT | (orient & EFL_ORIENT_FLIP_BITMASK)); 116 efl_gfx_orientation_set(d.img, EFL_GFX_ORIENTATION_RIGHT | (orient & EFL_GFX_ORIENTATION_FLIP_BITMASK));
117 break; 117 break;
118 case 2: 118 case 2:
119 efl_orientation_set(d.img, EFL_ORIENT_DOWN | (orient & EFL_ORIENT_FLIP_BITMASK)); 119 efl_gfx_orientation_set(d.img, EFL_GFX_ORIENTATION_DOWN | (orient & EFL_GFX_ORIENTATION_FLIP_BITMASK));
120 break; 120 break;
121 case 3: 121 case 3:
122 efl_orientation_set(d.img, EFL_ORIENT_LEFT | (orient & EFL_ORIENT_FLIP_BITMASK)); 122 efl_gfx_orientation_set(d.img, EFL_GFX_ORIENTATION_LEFT | (orient & EFL_GFX_ORIENTATION_FLIP_BITMASK));
123 break; 123 break;
124 case 4: 124 case 4:
125 efl_orientation_set(d.img, (orient & EFL_ORIENT_ROTATION_BITMASK) | EFL_ORIENT_FLIP_HORIZONTAL); 125 efl_gfx_orientation_set(d.img, (orient & EFL_GFX_ORIENTATION_ROTATION_BITMASK) | EFL_GFX_ORIENTATION_FLIP_HORIZONTAL);
126 break; 126 break;
127 case 5: 127 case 5:
128 efl_orientation_set(d.img, (orient & EFL_ORIENT_ROTATION_BITMASK) | EFL_ORIENT_FLIP_VERTICAL); 128 efl_gfx_orientation_set(d.img, (orient & EFL_GFX_ORIENTATION_ROTATION_BITMASK) | EFL_GFX_ORIENTATION_FLIP_VERTICAL);
129 break; 129 break;
130 case 6: 130 case 6:
131 efl_orientation_set(d.img, (orient & EFL_ORIENT_ROTATION_BITMASK)); 131 efl_gfx_orientation_set(d.img, (orient & EFL_GFX_ORIENTATION_ROTATION_BITMASK));
132 break; 132 break;
133 } 133 }
134} 134}
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index c0651a861a..553f5901a7 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -90,12 +90,12 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
90#include "interfaces/efl_gfx_image.eo.h" 90#include "interfaces/efl_gfx_image.eo.h"
91#include "interfaces/efl_gfx_frame_controller.eo.h" 91#include "interfaces/efl_gfx_frame_controller.eo.h"
92#include "interfaces/efl_gfx_image_load_controller.eo.h" 92#include "interfaces/efl_gfx_image_load_controller.eo.h"
93#include "interfaces/efl_gfx_orientable.eo.h"
93#include "interfaces/efl_part.eo.h" 94#include "interfaces/efl_part.eo.h"
94#include "interfaces/efl_playable.eo.h" 95#include "interfaces/efl_playable.eo.h"
95#include "interfaces/efl_player.eo.h" 96#include "interfaces/efl_player.eo.h"
96#include "interfaces/efl_text.eo.h" 97#include "interfaces/efl_text.eo.h"
97#include "interfaces/efl_text_types.eot.h" 98#include "interfaces/efl_text_types.eot.h"
98#include "interfaces/efl_orientation.eo.h"
99#include "interfaces/efl_ui_i18n.eo.h" 99#include "interfaces/efl_ui_i18n.eo.h"
100#include "interfaces/efl_ui_direction.eo.h" 100#include "interfaces/efl_ui_direction.eo.h"
101#include "interfaces/efl_ui_direction_readonly.eo.h" 101#include "interfaces/efl_ui_direction_readonly.eo.h"
@@ -113,10 +113,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
113 113
114#include "interfaces/efl_screen.eo.h" 114#include "interfaces/efl_screen.eo.h"
115 115
116#define EFL_ORIENT_0 EFL_ORIENT_UP
117#define EFL_ORIENT_90 EFL_ORIENT_RIGHT
118#define EFL_ORIENT_180 EFL_ORIENT_DOWN
119#define EFL_ORIENT_270 EFL_ORIENT_LEFT
120 116
121/* Core interface */ 117/* Core interface */
122#include "interfaces/efl_interpolator.eo.h" 118#include "interfaces/efl_interpolator.eo.h"
diff --git a/src/lib/efl/interfaces/efl_orientation.eo b/src/lib/efl/interfaces/efl_gfx_orientable.eo
index be42be5eca..0c4d191727 100644
--- a/src/lib/efl/interfaces/efl_orientation.eo
+++ b/src/lib/efl/interfaces/efl_gfx_orientable.eo
@@ -1,6 +1,6 @@
1parse efl_ui_direction; 1parse efl_ui_direction;
2 2
3enum @beta Efl.Orient 3enum @beta Efl.Gfx.Orientation
4{ 4{
5 [[An orientation type, to rotate and flip images. 5 [[An orientation type, to rotate and flip images.
6 6
@@ -25,9 +25,10 @@ enum @beta Efl.Orient
25 flip_bitmask = 12 [[Bitmask that can be used to isolate flipping values, that is, $flip_vertical and $flip_horizontal.]] 25 flip_bitmask = 12 [[Bitmask that can be used to isolate flipping values, that is, $flip_vertical and $flip_horizontal.]]
26} 26}
27 27
28interface @beta Efl.Orientation 28interface @beta Efl.Gfx.Orientable
29{ 29{
30 [[Interface for objects which can be oriented.]] 30 [[Interface for objects which can be oriented.]]
31 c_prefix: efl_gfx_orientation;
31 methods { 32 methods {
32 @property orientation { 33 @property orientation {
33 [[Control the orientation (rotation and flipping) of a given object. 34 [[Control the orientation (rotation and flipping) of a given object.
@@ -36,7 +37,7 @@ interface @beta Efl.Orientation
36 instance. 37 instance.
37 ]] 38 ]]
38 values { 39 values {
39 dir: Efl.Orient(Efl.Orient.none); [[The rotation angle (CCW), see @Efl.Orient.]] 40 dir: Efl.Gfx.Orientation(Efl.Gfx.Orientation.none); [[The final orientation of the object.]]
40 } 41 }
41 } 42 }
42 } 43 }
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 4d7927f6f8..b01587cdda 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -32,6 +32,7 @@
32#include "interfaces/efl_gfx_stack.eo.c" 32#include "interfaces/efl_gfx_stack.eo.c"
33#include "interfaces/efl_gfx_fill.eo.c" 33#include "interfaces/efl_gfx_fill.eo.c"
34#include "interfaces/efl_gfx_view.eo.c" 34#include "interfaces/efl_gfx_view.eo.c"
35#include "interfaces/efl_gfx_orientable.eo.c"
35 36
36#include "interfaces/efl_gfx_text_class.eo.c" 37#include "interfaces/efl_gfx_text_class.eo.c"
37#include "interfaces/efl_gfx_size_class.eo.c" 38#include "interfaces/efl_gfx_size_class.eo.c"
@@ -59,7 +60,6 @@
59#include "interfaces/efl_gfx_arrangement.eo.c" 60#include "interfaces/efl_gfx_arrangement.eo.c"
60#include "interfaces/efl_model.eo.c" 61#include "interfaces/efl_model.eo.c"
61#include "interfaces/efl_interpolator.eo.c" 62#include "interfaces/efl_interpolator.eo.c"
62#include "interfaces/efl_orientation.eo.c"
63#include "interfaces/efl_ui_i18n.eo.c" 63#include "interfaces/efl_ui_i18n.eo.c"
64#include "interfaces/efl_ui_direction.eo.c" 64#include "interfaces/efl_ui_direction.eo.c"
65#include "interfaces/efl_ui_drag.eo.c" 65#include "interfaces/efl_ui_drag.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo
index a75872eb85..5e6706b67d 100644
--- a/src/lib/efl/interfaces/efl_ui_direction.eo
+++ b/src/lib/efl/interfaces/efl_ui_direction.eo
@@ -1,13 +1,13 @@
1// FIXME: Documentation lacks proper references due to cyclic imports. 1// FIXME: Documentation lacks proper references due to cyclic imports.
2// FIXME: What about AnyRTL? And other strange directions? 2// FIXME: What about AnyRTL? And other strange directions?
3 3
4parse efl_orientation; 4parse efl_gfx_orientable;
5 5
6enum @beta Efl.Ui.Dir 6enum @beta Efl.Ui.Dir
7{ 7{
8 [[Direction for UI objects and layouts. 8 [[Direction for UI objects and layouts.
9 9
10 Not to be confused with @Efl.Orient which is for images and canvases. This 10 Not to be confused with @Efl.Gfx.Orientation which is for images and canvases. This
11 enum is used to define how widgets should expand and orient themselves, 11 enum is used to define how widgets should expand and orient themselves,
12 not to rotate images. 12 not to rotate images.
13 13
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index d29af1cd6d..a88a6b78b4 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -64,7 +64,7 @@ pub_eo_files = [
64 'efl_gfx_hint.eo', 64 'efl_gfx_hint.eo',
65 'efl_model.eo', 65 'efl_model.eo',
66 'efl_interpolator.eo', 66 'efl_interpolator.eo',
67 'efl_orientation.eo', 67 'efl_gfx_orientable.eo',
68 'efl_container.eo', 68 'efl_container.eo',
69 'efl_content.eo', 69 'efl_content.eo',
70 'efl_pack.eo', 70 'efl_pack.eo',
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 687bdbcfec..6f46398348 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -807,7 +807,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
807 //Retained way. Nothing does, if either way hasn't been changed. 807 //Retained way. Nothing does, if either way hasn't been changed.
808 if (!sd->edje) 808 if (!sd->edje)
809 { 809 {
810 efl_orientation_set(sd->img, sd->orient); 810 efl_gfx_orientation_set(sd->img, sd->orient);
811 } 811 }
812 812
813 if (sd->img) 813 if (sd->img)
@@ -1364,7 +1364,7 @@ _efl_ui_image_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNU
1364} 1364}
1365 1365
1366EOLIAN static void 1366EOLIAN static void
1367_efl_ui_image_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Orient orient) 1367_efl_ui_image_efl_gfx_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Orientation orient)
1368{ 1368{
1369 if (sd->edje) return; 1369 if (sd->edje) return;
1370 if (sd->orient == orient) return; 1370 if (sd->orient == orient) return;
@@ -1373,8 +1373,8 @@ _efl_ui_image_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Ef
1373 _efl_ui_image_sizing_eval(obj); 1373 _efl_ui_image_sizing_eval(obj);
1374} 1374}
1375 1375
1376EOLIAN static Efl_Orient 1376EOLIAN static Efl_Gfx_Orientation
1377_efl_ui_image_efl_orientation_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1377_efl_ui_image_efl_gfx_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1378{ 1378{
1379 return sd->orient; 1379 return sd->orient;
1380} 1380}
@@ -2118,23 +2118,23 @@ elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disable)
2118EAPI void 2118EAPI void
2119elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient elm_orient) 2119elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient elm_orient)
2120{ 2120{
2121 // This array takes an Elm_Image_Orient and turns it into an Efl_Orient 2121 // This array takes an Elm_Image_Orient and turns it into an Efl_Gfx_Orientation
2122 static const Efl_Orient efl_orient[8] = { 2122 static const Efl_Gfx_Orientation efl_orient[8] = {
2123 EFL_ORIENT_NONE, 2123 EFL_GFX_ORIENTATION_NONE,
2124 EFL_ORIENT_RIGHT, 2124 EFL_GFX_ORIENTATION_RIGHT,
2125 EFL_ORIENT_DOWN, 2125 EFL_GFX_ORIENTATION_DOWN,
2126 EFL_ORIENT_LEFT, 2126 EFL_GFX_ORIENTATION_LEFT,
2127 EFL_ORIENT_FLIP_HORIZONTAL, 2127 EFL_GFX_ORIENTATION_FLIP_HORIZONTAL,
2128 EFL_ORIENT_FLIP_VERTICAL, 2128 EFL_GFX_ORIENTATION_FLIP_VERTICAL,
2129 EFL_ORIENT_LEFT | EFL_ORIENT_FLIP_VERTICAL, 2129 EFL_GFX_ORIENTATION_LEFT | EFL_GFX_ORIENTATION_FLIP_VERTICAL,
2130 EFL_ORIENT_RIGHT | EFL_ORIENT_FLIP_VERTICAL 2130 EFL_GFX_ORIENTATION_RIGHT | EFL_GFX_ORIENTATION_FLIP_VERTICAL
2131 }; 2131 };
2132 2132
2133 EFL_UI_IMAGE_CHECK(obj); 2133 EFL_UI_IMAGE_CHECK(obj);
2134 EFL_UI_IMAGE_DATA_GET(obj, sd); 2134 EFL_UI_IMAGE_DATA_GET(obj, sd);
2135 EINA_SAFETY_ON_FALSE_RETURN(elm_orient >= 0 && elm_orient < 8); 2135 EINA_SAFETY_ON_FALSE_RETURN(elm_orient >= 0 && elm_orient < 8);
2136 sd->image_orient = elm_orient; 2136 sd->image_orient = elm_orient;
2137 efl_orientation_set(obj, efl_orient[elm_orient]); 2137 efl_gfx_orientation_set(obj, efl_orient[elm_orient]);
2138} 2138}
2139 2139
2140EAPI Elm_Image_Orient 2140EAPI Elm_Image_Orient
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index d4e766e1b6..f80e2c356e 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -19,7 +19,7 @@ struct @beta Efl.Ui.Image_Error
19class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable, 19class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable,
20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View, 20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color, 21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
22 Efl.Orientation, 22 Efl.Gfx.Orientable,
23 Efl.Layout.Calc, 23 Efl.Layout.Calc,
24 Efl.Layout.Group, Efl.Layout.Signal 24 Efl.Layout.Group, Efl.Layout.Signal
25{ 25{
@@ -100,7 +100,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.
100 Efl.Gfx.Image_Load_Controller.load_size { get; set; } 100 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
101 Efl.Gfx.Image.smooth_scale { get; set; } 101 Efl.Gfx.Image.smooth_scale { get; set; }
102 Efl.Gfx.Image.scale_type { get; set; } 102 Efl.Gfx.Image.scale_type { get; set; }
103 Efl.Orientation.orientation { get; set; } 103 Efl.Gfx.Orientable.orientation { get; set; }
104 Efl.Player.playable { get; } 104 Efl.Player.playable { get; }
105 Efl.Player.play { get; set; } 105 Efl.Player.play { get; set; }
106 Efl.Layout.Signal.signal_emit; 106 Efl.Layout.Signal.signal_emit;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index d306608a46..108ab5651f 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -622,7 +622,7 @@ _grid_create(Evas_Object *obj)
622 g->grid[tn].img = 622 g->grid[tn].img =
623 evas_object_image_add(evas_object_evas_get(obj)); 623 evas_object_image_add(evas_object_evas_get(obj));
624 evas_object_image_load_orientation_set(g->grid[tn].img, EINA_TRUE); 624 evas_object_image_load_orientation_set(g->grid[tn].img, EINA_TRUE);
625 efl_orientation_set(g->grid[tn].img, sd->orient); 625 efl_gfx_orientation_set(g->grid[tn].img, sd->orient);
626 evas_object_image_scale_hint_set 626 evas_object_image_scale_hint_set
627 (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC); 627 (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
628 evas_object_pass_events_set(g->grid[tn].img, EINA_TRUE); 628 evas_object_pass_events_set(g->grid[tn].img, EINA_TRUE);
@@ -1321,7 +1321,7 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1321 } 1321 }
1322 } 1322 }
1323 1323
1324 efl_orientation_set(sd->img, sd->orient); 1324 efl_gfx_orientation_set(sd->img, sd->orient);
1325 evas_object_image_size_get(sd->img, &iw, &ih); 1325 evas_object_image_size_get(sd->img, &iw, &ih);
1326 sd->size.imw = iw; 1326 sd->size.imw = iw;
1327 sd->size.imh = ih; 1327 sd->size.imh = ih;
@@ -1331,8 +1331,8 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1331} 1331}
1332 1332
1333EOLIAN static void 1333EOLIAN static void
1334_efl_ui_image_zoomable_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, 1334_efl_ui_image_zoomable_efl_gfx_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd,
1335 Efl_Orient orient) 1335 Efl_Gfx_Orientation orient)
1336{ 1336{
1337 if (sd->orient == orient) return; 1337 if (sd->orient == orient) return;
1338 1338
@@ -1340,8 +1340,8 @@ _efl_ui_image_zoomable_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Image_Zoo
1340 _orient_apply(obj, sd); 1340 _orient_apply(obj, sd);
1341} 1341}
1342 1342
1343EOLIAN static Efl_Orient 1343EOLIAN static Efl_Gfx_Orientation
1344_efl_ui_image_zoomable_efl_orientation_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 1344_efl_ui_image_zoomable_efl_gfx_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1345{ 1345{
1346 return sd->orient; 1346 return sd->orient;
1347} 1347}
@@ -2056,7 +2056,7 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
2056 tz = sd->zoom; 2056 tz = sd->zoom;
2057 sd->zoom = 0.0; 2057 sd->zoom = 0.0;
2058 elm_photocam_zoom_set(obj, tz); 2058 elm_photocam_zoom_set(obj, tz);
2059 sd->orient = EFL_ORIENT_NONE; 2059 sd->orient = EFL_GFX_ORIENTATION_NONE;
2060 sd->orientation_changed = EINA_FALSE; 2060 sd->orientation_changed = EINA_FALSE;
2061 2061
2062 return 0; 2062 return 0;
@@ -2141,7 +2141,7 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Evas_Load_Error *ret
2141 tz = sd->zoom; 2141 tz = sd->zoom;
2142 sd->zoom = 0.0; 2142 sd->zoom = 0.0;
2143 elm_photocam_zoom_set(obj, tz); 2143 elm_photocam_zoom_set(obj, tz);
2144 sd->orient = EFL_ORIENT_NONE; 2144 sd->orient = EFL_GFX_ORIENTATION_NONE;
2145 sd->orientation_changed = EINA_FALSE; 2145 sd->orientation_changed = EINA_FALSE;
2146 2146
2147 if (ret) *ret = evas_object_image_load_error_get(sd->img); 2147 if (ret) *ret = evas_object_image_load_error_get(sd->img);
@@ -3172,45 +3172,45 @@ elm_photocam_add(Evas_Object *parent)
3172 return elm_legacy_add(EFL_UI_IMAGE_ZOOMABLE_LEGACY_CLASS, parent); 3172 return elm_legacy_add(EFL_UI_IMAGE_ZOOMABLE_LEGACY_CLASS, parent);
3173} 3173}
3174 3174
3175static inline Efl_Orient 3175static inline Efl_Gfx_Orientation
3176_evas_orient_to_efl_orient(const Evas_Image_Orient evas_orient) 3176_evas_orient_to_efl_orient(const Evas_Image_Orient evas_orient)
3177{ 3177{
3178 // This array takes an Elm_Image_Orient and turns it into an Efl_Orient 3178 // This array takes an Elm_Image_Orient and turns it into an Efl_Gfx_Orientation
3179 static const Efl_Orient efl_orient[8] = { 3179 static const Efl_Gfx_Orientation efl_orient[8] = {
3180 EFL_ORIENT_NONE, 3180 EFL_GFX_ORIENTATION_NONE,
3181 EFL_ORIENT_RIGHT, 3181 EFL_GFX_ORIENTATION_RIGHT,
3182 EFL_ORIENT_DOWN, 3182 EFL_GFX_ORIENTATION_DOWN,
3183 EFL_ORIENT_LEFT, 3183 EFL_GFX_ORIENTATION_LEFT,
3184 EFL_ORIENT_FLIP_HORIZONTAL, 3184 EFL_GFX_ORIENTATION_FLIP_HORIZONTAL,
3185 EFL_ORIENT_FLIP_VERTICAL, 3185 EFL_GFX_ORIENTATION_FLIP_VERTICAL,
3186 EFL_ORIENT_LEFT | EFL_ORIENT_FLIP_VERTICAL, 3186 EFL_GFX_ORIENTATION_LEFT | EFL_GFX_ORIENTATION_FLIP_VERTICAL,
3187 EFL_ORIENT_RIGHT | EFL_ORIENT_FLIP_VERTICAL 3187 EFL_GFX_ORIENTATION_RIGHT | EFL_GFX_ORIENTATION_FLIP_VERTICAL
3188 }; 3188 };
3189 EINA_SAFETY_ON_FALSE_RETURN_VAL(evas_orient >= 0 && evas_orient < 8, EFL_ORIENT_NONE); 3189 EINA_SAFETY_ON_FALSE_RETURN_VAL(evas_orient >= 0 && evas_orient < 8, EFL_GFX_ORIENTATION_NONE);
3190 return efl_orient[evas_orient]; 3190 return efl_orient[evas_orient];
3191} 3191}
3192 3192
3193static inline Evas_Image_Orient 3193static inline Evas_Image_Orient
3194_efl_orient_to_evas_orient(Efl_Orient efl_orient) 3194_efl_orient_to_evas_orient(Efl_Gfx_Orientation efl_orient)
3195{ 3195{
3196 // This array takes an Efl_Orient and turns it into an Elm_Image_Orient 3196 // This array takes an Efl_Gfx_Orientation and turns it into an Elm_Image_Orient
3197 static const Evas_Image_Orient evas_orient[16] = { 3197 static const Evas_Image_Orient evas_orient[16] = {
3198 EVAS_IMAGE_ORIENT_NONE, // EFL_ORIENT_NONE 3198 EVAS_IMAGE_ORIENT_NONE, // EFL_GFX_ORIENTATION_NONE
3199 EVAS_IMAGE_ORIENT_90, // EFL_ORIENT_RIGHT 3199 EVAS_IMAGE_ORIENT_90, // EFL_GFX_ORIENTATION_RIGHT
3200 EVAS_IMAGE_ORIENT_180, // EFL_ORIENT_DOWN 3200 EVAS_IMAGE_ORIENT_180, // EFL_GFX_ORIENTATION_DOWN
3201 EVAS_IMAGE_ORIENT_270, // EFL_ORIENT_LEFT 3201 EVAS_IMAGE_ORIENT_270, // EFL_GFX_ORIENTATION_LEFT
3202 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_ORIENT_NONE + FLIP_HOR 3202 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_GFX_ORIENTATION_NONE + FLIP_HOR
3203 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_ORIENT_RIGHT + FLIP_HOR 3203 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_GFX_ORIENTATION_RIGHT + FLIP_HOR
3204 EVAS_IMAGE_FLIP_VERTICAL, // EFL_ORIENT_DOWN + FLIP_HOR 3204 EVAS_IMAGE_FLIP_VERTICAL, // EFL_GFX_ORIENTATION_DOWN + FLIP_HOR
3205 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_ORIENT_LEFT + FLIP_HOR 3205 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_GFX_ORIENTATION_LEFT + FLIP_HOR
3206 EVAS_IMAGE_FLIP_VERTICAL, // EFL_ORIENT_NONE + FLIP_VER 3206 EVAS_IMAGE_FLIP_VERTICAL, // EFL_GFX_ORIENTATION_NONE + FLIP_VER
3207 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_ORIENT_RIGHT + FLIP_VER 3207 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_GFX_ORIENTATION_RIGHT + FLIP_VER
3208 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_ORIENT_DOWN + FLIP_VER 3208 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_GFX_ORIENTATION_DOWN + FLIP_VER
3209 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_ORIENT_LEFT + FLIP_VER 3209 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_GFX_ORIENTATION_LEFT + FLIP_VER
3210 EVAS_IMAGE_ORIENT_180, // EFL_ORIENT_NONE + FLIP_HOR + FLIP_VER 3210 EVAS_IMAGE_ORIENT_180, // EFL_GFX_ORIENTATION_NONE + FLIP_HOR + FLIP_VER
3211 EVAS_IMAGE_ORIENT_270, // EFL_ORIENT_RIGHT + FLIP_HOR + FLIP_VER 3211 EVAS_IMAGE_ORIENT_270, // EFL_GFX_ORIENTATION_RIGHT + FLIP_HOR + FLIP_VER
3212 EVAS_IMAGE_ORIENT_0, // EFL_ORIENT_DOWN + FLIP_HOR + FLIP_VER 3212 EVAS_IMAGE_ORIENT_0, // EFL_GFX_ORIENTATION_DOWN + FLIP_HOR + FLIP_VER
3213 EVAS_IMAGE_ORIENT_90 // EFL_ORIENT_LEFT + FLIP_HOR + FLIP_VER 3213 EVAS_IMAGE_ORIENT_90 // EFL_GFX_ORIENTATION_LEFT + FLIP_HOR + FLIP_VER
3214 }; 3214 };
3215 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_orient >= 0 && efl_orient < 16, EVAS_IMAGE_ORIENT_NONE); 3215 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_orient >= 0 && efl_orient < 16, EVAS_IMAGE_ORIENT_NONE);
3216 return evas_orient[efl_orient]; 3216 return evas_orient[efl_orient];
@@ -3219,7 +3219,7 @@ _efl_orient_to_evas_orient(Efl_Orient efl_orient)
3219EAPI void 3219EAPI void
3220elm_photocam_image_orient_set(Eo *obj, Evas_Image_Orient evas_orient) 3220elm_photocam_image_orient_set(Eo *obj, Evas_Image_Orient evas_orient)
3221{ 3221{
3222 efl_orientation_set(obj, _evas_orient_to_efl_orient(evas_orient)); 3222 efl_gfx_orientation_set(obj, _evas_orient_to_efl_orient(evas_orient));
3223} 3223}
3224 3224
3225EAPI Evas_Image_Orient 3225EAPI Evas_Image_Orient
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 42cab4661b..4f66bda9b0 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -65,7 +65,7 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
65 Efl.Access.Widget.Action.elm_actions { get; } 65 Efl.Access.Widget.Action.elm_actions { get; }
66 Efl.File.load; 66 Efl.File.load;
67 Efl.File.file { get; set; } 67 Efl.File.file { get; set; }
68 Efl.Orientation.orientation { get; set; } 68 Efl.Gfx.Orientable.orientation { get; set; }
69 Efl.Layout.Group.group_size_min { get; } 69 Efl.Layout.Group.group_size_min { get; }
70 Efl.Layout.Group.group_size_max { get; } 70 Efl.Layout.Group.group_size_max { get; }
71 Efl.Layout.Signal.signal_callback_add; 71 Efl.Layout.Signal.signal_callback_add;
diff --git a/src/lib/elementary/efl_ui_image_zoomable_private.h b/src/lib/elementary/efl_ui_image_zoomable_private.h
index 7787e30bbb..8bf1dffd72 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_private.h
+++ b/src/lib/elementary/efl_ui_image_zoomable_private.h
@@ -128,8 +128,8 @@ struct _Efl_Ui_Image_Zoomable_Data
128 int cur_frame; 128 int cur_frame;
129 int frame_count; 129 int frame_count;
130 130
131 Eina_List *grids; 131 Eina_List *grids;
132 Efl_Orient orient; 132 Efl_Gfx_Orientation orient;
133 133
134 Eina_Bool main_load_pending : 1; 134 Eina_Bool main_load_pending : 1;
135 Eina_Bool longpressed : 1; 135 Eina_Bool longpressed : 1;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index fa47bc1d1f..0260ae5d6a 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -2614,7 +2614,7 @@ _efl_ui_layout_base_automatic_theme_rotation_get(const Eo *obj EINA_UNUSED, Efl_
2614} 2614}
2615 2615
2616EOLIAN static void 2616EOLIAN static void
2617_efl_ui_layout_base_theme_rotation_apply(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Efl_Orient orientation) 2617_efl_ui_layout_base_theme_rotation_apply(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int orientation)
2618{ 2618{
2619 char prefix[4], buf[128]; 2619 char prefix[4], buf[128];
2620 2620
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index 1923bddefa..54a646c1bb 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -1,5 +1,4 @@
1import efl_ui; 1import efl_ui;
2import efl_orientation;
3 2
4abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container, 3abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
5 Efl.Ui.Factory_Bind, 4 Efl.Ui.Factory_Bind,
@@ -53,7 +52,7 @@ abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
53 theme_rotation_apply @beta { 52 theme_rotation_apply @beta {
54 [[Apply a new rotation value to this object.]] 53 [[Apply a new rotation value to this object.]]
55 params { 54 params {
56 orientation : Efl.Orient; [[The new rotation value.]] 55 orientation : int; [[The new rotation angle, in degrees.]]
57 } 56 }
58 } 57 }
59 } 58 }
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index 38afc71f84..8f3c67c4fd 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -65,7 +65,7 @@ struct _Efl_Ui_Image_Data
65 int cur_frame; 65 int cur_frame;
66 66
67 Elm_Image_Orient image_orient; // to support EAPI 67 Elm_Image_Orient image_orient; // to support EAPI
68 Efl_Orient orient; 68 Efl_Gfx_Orientation orient;
69 69
70 struct { 70 struct {
71 Ecore_Thread *th; 71 Ecore_Thread *th;
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 60d3b523d1..96ccc32d22 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -1,7 +1,7 @@
1abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Efl.Canvas.Filter.Internal, 1abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Efl.Canvas.Filter.Internal,
2 Efl.Gfx.Image, Efl.Gfx.Buffer, 2 Efl.Gfx.Image, Efl.Gfx.Buffer,
3 Efl.Gfx.Fill, Efl.Gfx.View, 3 Efl.Gfx.Fill, Efl.Gfx.View,
4 Efl.Orientation, Efl.File_Save 4 Efl.Gfx.Orientable, Efl.File_Save
5{ 5{
6 [[Efl canvas internal image class]] 6 [[Efl canvas internal image class]]
7 data: Evas_Image_Data; 7 data: Evas_Image_Data;
@@ -11,7 +11,7 @@ abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Ef
11 Efl.Object.finalize; 11 Efl.Object.finalize;
12 Efl.Object.debug_name_override; 12 Efl.Object.debug_name_override;
13 Efl.File_Save.save; 13 Efl.File_Save.save;
14 Efl.Orientation.orientation { get; set; } 14 Efl.Gfx.Orientable.orientation { get; set; }
15 Efl.Gfx.Image.smooth_scale { get; set; } 15 Efl.Gfx.Image.smooth_scale { get; set; }
16 Efl.Gfx.Image.ratio { get; } 16 Efl.Gfx.Image.ratio { get; }
17 Efl.Gfx.Image.border { get; set; } 17 Efl.Gfx.Image.border { get; set; }
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index 36b5ce5d65..e5b6805442 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -115,7 +115,7 @@ struct _Evas_Image_Data
115 115
116 Efl_Gfx_Image_Scale_Hint scale_hint; 116 Efl_Gfx_Image_Scale_Hint scale_hint;
117 Efl_Gfx_Image_Content_Hint content_hint; 117 Efl_Gfx_Image_Content_Hint content_hint;
118 Efl_Orient orient_value; 118 Efl_Gfx_Orientation orient_value;
119 119
120 struct { 120 struct {
121 short w, h; 121 short w, h;
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 6bec504038..788b96a48e 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -412,26 +412,26 @@ _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient or
412} 412}
413 413
414EOLIAN static void 414EOLIAN static void
415_efl_canvas_image_internal_efl_orientation_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Orient efl_orient) 415_efl_canvas_image_internal_efl_gfx_orientable_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Orientation efl_orient)
416{ 416{
417 // This array takes an Efl_Orient and turns it into an Elm_Image_Orient 417 // This array takes an Efl_Gfx_Orientation and turns it into an Elm_Image_Orient
418 static const Evas_Image_Orient evas_orient[16] = { 418 static const Evas_Image_Orient evas_orient[16] = {
419 EVAS_IMAGE_ORIENT_NONE, // EFL_ORIENT_NONE 419 EVAS_IMAGE_ORIENT_NONE, // EFL_GFX_ORIENTATION_NONE
420 EVAS_IMAGE_ORIENT_90, // EFL_ORIENT_RIGHT 420 EVAS_IMAGE_ORIENT_90, // EFL_GFX_ORIENTATION_RIGHT
421 EVAS_IMAGE_ORIENT_180, // EFL_ORIENT_DOWN 421 EVAS_IMAGE_ORIENT_180, // EFL_GFX_ORIENTATION_DOWN
422 EVAS_IMAGE_ORIENT_270, // EFL_ORIENT_LEFT 422 EVAS_IMAGE_ORIENT_270, // EFL_GFX_ORIENTATION_LEFT
423 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_ORIENT_NONE + FLIP_HOR 423 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_GFX_ORIENTATION_NONE + FLIP_HOR
424 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_ORIENT_RIGHT + FLIP_HOR 424 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_GFX_ORIENTATION_RIGHT + FLIP_HOR
425 EVAS_IMAGE_FLIP_VERTICAL, // EFL_ORIENT_DOWN + FLIP_HOR 425 EVAS_IMAGE_FLIP_VERTICAL, // EFL_GFX_ORIENTATION_DOWN + FLIP_HOR
426 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_ORIENT_LEFT + FLIP_HOR 426 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_GFX_ORIENTATION_LEFT + FLIP_HOR
427 EVAS_IMAGE_FLIP_VERTICAL, // EFL_ORIENT_NONE + FLIP_VER 427 EVAS_IMAGE_FLIP_VERTICAL, // EFL_GFX_ORIENTATION_NONE + FLIP_VER
428 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_ORIENT_RIGHT + FLIP_VER 428 EVAS_IMAGE_FLIP_TRANSVERSE, // EFL_GFX_ORIENTATION_RIGHT + FLIP_VER
429 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_ORIENT_DOWN + FLIP_VER 429 EVAS_IMAGE_FLIP_HORIZONTAL, // EFL_GFX_ORIENTATION_DOWN + FLIP_VER
430 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_ORIENT_LEFT + FLIP_VER 430 EVAS_IMAGE_FLIP_TRANSPOSE, // EFL_GFX_ORIENTATION_LEFT + FLIP_VER
431 EVAS_IMAGE_ORIENT_180, // EFL_ORIENT_NONE + FLIP_HOR + FLIP_VER 431 EVAS_IMAGE_ORIENT_180, // EFL_GFX_ORIENTATION_NONE + FLIP_HOR + FLIP_VER
432 EVAS_IMAGE_ORIENT_270, // EFL_ORIENT_RIGHT + FLIP_HOR + FLIP_VER 432 EVAS_IMAGE_ORIENT_270, // EFL_GFX_ORIENTATION_RIGHT + FLIP_HOR + FLIP_VER
433 EVAS_IMAGE_ORIENT_0, // EFL_ORIENT_DOWN + FLIP_HOR + FLIP_VER 433 EVAS_IMAGE_ORIENT_0, // EFL_GFX_ORIENTATION_DOWN + FLIP_HOR + FLIP_VER
434 EVAS_IMAGE_ORIENT_90 // EFL_ORIENT_LEFT + FLIP_HOR + FLIP_VER 434 EVAS_IMAGE_ORIENT_90 // EFL_GFX_ORIENTATION_LEFT + FLIP_HOR + FLIP_VER
435 }; 435 };
436 EINA_SAFETY_ON_FALSE_RETURN(efl_orient >= 0 && efl_orient < 16); 436 EINA_SAFETY_ON_FALSE_RETURN(efl_orient >= 0 && efl_orient < 16);
437 437
@@ -439,8 +439,8 @@ _efl_canvas_image_internal_efl_orientation_orientation_set(Eo *obj, Evas_Image_D
439 _evas_image_orientation_set(obj, o, evas_orient[efl_orient]); 439 _evas_image_orientation_set(obj, o, evas_orient[efl_orient]);
440} 440}
441 441
442EOLIAN static Efl_Orient 442EOLIAN static Efl_Gfx_Orientation
443_efl_canvas_image_internal_efl_orientation_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o) 443_efl_canvas_image_internal_efl_gfx_orientable_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o)
444{ 444{
445 return o->orient_value; 445 return o->orient_value;
446} 446}