summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 16:38:33 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 18:03:34 +0900
commit0c46fc71033edda92f4e86b86f6d1d62751f8998 (patch)
treed1db3b1aea5e24c97f234b4edfb1ff8022bf192d /src
parenta9732948205906120caef2445aac409b3bf1bfad (diff)
evas: Use Eina_Rectangle internally
Instead of Evas_Coord_Rectangle which is exactly the same thing but with a different name and typedefs.
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_ctxpopup.c2
-rw-r--r--src/lib/elementary/elc_ctxpopup.c16
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_gesture_layer.c6
-rw-r--r--src/lib/evas/Evas_Common.h4
-rw-r--r--src/lib/evas/canvas/evas_events.c12
-rw-r--r--src/lib/evas/canvas/evas_image_private.h2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c6
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c6
-rw-r--r--src/lib/evas/canvas/evas_polygon_private.h2
-rw-r--r--src/lib/evas/canvas/evas_render.c6
-rw-r--r--src/lib/evas/include/evas_private.h10
12 files changed, 37 insertions, 37 deletions
diff --git a/src/bin/elementary/test_ctxpopup.c b/src/bin/elementary/test_ctxpopup.c
index 8fc85f8f5d..f7512bffcd 100644
--- a/src/bin/elementary/test_ctxpopup.c
+++ b/src/bin/elementary/test_ctxpopup.c
@@ -77,7 +77,7 @@ _ctxpopup_item_new(Evas_Object *obj, const char *label, const char *icon)
77static void 77static void
78_geometry_update(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) 78_geometry_update(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
79{ 79{
80 Evas_Coord_Rectangle *geom = event_info; 80 Eina_Rectangle *geom = event_info;
81 printf("ctxpopup geometry(%d %d %d %d)\n", geom->x, geom->y, geom->w, geom->h); 81 printf("ctxpopup geometry(%d %d %d %d)\n", geom->x, geom->y, geom->w, geom->h);
82} 82}
83 83
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 80437bc6dc..2e908f1dc4 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -146,7 +146,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
146static void 146static void
147_x_pos_adjust(Evas_Coord_Point *pos, 147_x_pos_adjust(Evas_Coord_Point *pos,
148 Evas_Coord_Point *base_size, 148 Evas_Coord_Point *base_size,
149 Evas_Coord_Rectangle *hover_area) 149 Eina_Rectangle *hover_area)
150{ 150{
151 pos->x -= (base_size->x / 2); 151 pos->x -= (base_size->x / 2);
152 152
@@ -165,7 +165,7 @@ _x_pos_adjust(Evas_Coord_Point *pos,
165static void 165static void
166_y_pos_adjust(Evas_Coord_Point *pos, 166_y_pos_adjust(Evas_Coord_Point *pos,
167 Evas_Coord_Point *base_size, 167 Evas_Coord_Point *base_size,
168 Evas_Coord_Rectangle *hover_area) 168 Eina_Rectangle *hover_area)
169{ 169{
170 pos->y -= (base_size->y / 2); 170 pos->y -= (base_size->y / 2);
171 171
@@ -183,10 +183,10 @@ _y_pos_adjust(Evas_Coord_Point *pos,
183 183
184static Elm_Ctxpopup_Direction 184static Elm_Ctxpopup_Direction
185_base_geometry_calc(Evas_Object *obj, 185_base_geometry_calc(Evas_Object *obj,
186 Evas_Coord_Rectangle *rect) 186 Eina_Rectangle *rect)
187{ 187{
188 Elm_Ctxpopup_Direction dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; 188 Elm_Ctxpopup_Direction dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
189 Evas_Coord_Rectangle hover_area; 189 Eina_Rectangle hover_area;
190 Evas_Coord_Point pos = {0, 0}; 190 Evas_Coord_Point pos = {0, 0};
191 Evas_Coord_Point arrow_size; 191 Evas_Coord_Point arrow_size;
192 Evas_Coord_Point base_size; 192 Evas_Coord_Point base_size;
@@ -364,9 +364,9 @@ _base_geometry_calc(Evas_Object *obj,
364static void 364static void
365_arrow_update(Evas_Object *obj, 365_arrow_update(Evas_Object *obj,
366 Elm_Ctxpopup_Direction dir, 366 Elm_Ctxpopup_Direction dir,
367 Evas_Coord_Rectangle base_size) 367 Eina_Rectangle base_size)
368{ 368{
369 Evas_Coord_Rectangle arrow_size; 369 Eina_Rectangle arrow_size;
370 Evas_Coord x, y; 370 Evas_Coord x, y;
371 double drag; 371 double drag;
372 372
@@ -568,7 +568,7 @@ _hide_signals_emit(Evas_Object *obj,
568static void 568static void
569_base_shift_by_arrow(Evas_Object *arrow, 569_base_shift_by_arrow(Evas_Object *arrow,
570 Elm_Ctxpopup_Direction dir, 570 Elm_Ctxpopup_Direction dir,
571 Evas_Coord_Rectangle *rect) 571 Eina_Rectangle *rect)
572{ 572{
573 Evas_Coord arrow_w, arrow_h; 573 Evas_Coord arrow_w, arrow_h;
574 574
@@ -608,7 +608,7 @@ _elm_ctxpopup_elm_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd E
608EOLIAN static void 608EOLIAN static void
609_elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd) 609_elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
610{ 610{
611 Evas_Coord_Rectangle rect = { 0, 0, 1, 1 }; 611 Eina_Rectangle rect = { 0, 0, 1, 1 };
612 Evas_Coord_Point list_size = { 0, 0 }, parent_size = {0, 0}; 612 Evas_Coord_Point list_size = { 0, 0 }, parent_size = {0, 0};
613 613
614 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 614 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 0b0ac9b5ca..db3dce349c 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -221,6 +221,6 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action,
221 } 221 }
222 events { 222 events {
223 dismissed; [[Called when context popup was dismissed]] 223 dismissed; [[Called when context popup was dismissed]]
224 geometry,update; [[Called when context popup geometry was updated]] 224 geometry,update: const(ptr(Eina.Rectangle)); [[Called when context popup geometry was updated]]
225 } 225 }
226} 226}
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index 750e7e7370..92c561ab7a 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -1613,7 +1613,7 @@ _pointer_event_record(Taps_Type *st,
1613 * @ingroup Elm_Gesture_Layer 1613 * @ingroup Elm_Gesture_Layer
1614 */ 1614 */
1615static Eina_Bool 1615static Eina_Bool
1616_taps_rect_get(Eina_List *taps, int idx, Evas_Coord_Rectangle *r) 1616_taps_rect_get(Eina_List *taps, int idx, Eina_Rectangle *r)
1617{ /* Build a rect bounding all taps at index idx */ 1617{ /* Build a rect bounding all taps at index idx */
1618 Eina_List *l; 1618 Eina_List *l;
1619 Evas_Coord bx = 0, by = 0; 1619 Evas_Coord bx = 0, by = 0;
@@ -1665,8 +1665,8 @@ _tap_gesture_check_finish(Gesture_Info *gesture, Evas_Coord tap_finger_size)
1665 Taps_Type *st = gesture->data; 1665 Taps_Type *st = gesture->data;
1666 Eina_List *l; 1666 Eina_List *l;
1667 Eina_List *pe_list; 1667 Eina_List *pe_list;
1668 Evas_Coord_Rectangle base = {0, 0, 0, 0}; 1668 Eina_Rectangle base = {0, 0, 0, 0};
1669 Evas_Coord_Rectangle tmp = {0, 0, 0, 0}; 1669 Eina_Rectangle tmp = {0, 0, 0, 0};
1670 if (!tap_finger_size) /* Use system default if not set by user */ 1670 if (!tap_finger_size) /* Use system default if not set by user */
1671 tap_finger_size = elm_config_finger_size_get(); 1671 tap_finger_size = elm_config_finger_size_get();
1672 1672
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 9fa88a9463..8ee99427f3 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -95,7 +95,8 @@ typedef Efl_Callback_Priority Evas_Callback_Priority;
95typedef short Evas_Callback_Priority; 95typedef short Evas_Callback_Priority;
96#endif 96#endif
97 97
98typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */ 98// TODO: Mark as EINA_DEPRECATED
99typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle. @deprecated Use Eina_Rectangle instead */
99typedef struct _Evas_Point Evas_Point; /**< integer point */ 100typedef struct _Evas_Point Evas_Point; /**< integer point */
100 101
101typedef struct _Evas_Coord_Point Evas_Coord_Point; /**< Evas_Coord point */ 102typedef struct _Evas_Coord_Point Evas_Coord_Point; /**< Evas_Coord point */
@@ -185,6 +186,7 @@ typedef void Evas_Performance; /**< An Evas Performance h
185typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */ 186typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */
186typedef int Evas_Angle; /**< A type for angle */ 187typedef int Evas_Angle; /**< A type for angle */
187 188
189// FIXME: This can be a simple alias to Eina_Rectangle instead.
188struct _Evas_Coord_Rectangle /** A rectangle in Evas_Coord */ 190struct _Evas_Coord_Rectangle /** A rectangle in Evas_Coord */
189{ 191{
190 Evas_Coord x; /**< top-left x co-ordinate of rectangle */ 192 Evas_Coord x; /**< top-left x co-ordinate of rectangle */
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 30d60d1004..ebb0705c6c 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -106,7 +106,7 @@ walk_clippers_print(int spaces, Evas_Object_Protected_Data *obj)
106#endif 106#endif
107 107
108static void 108static void
109clip_calc(Evas_Object_Protected_Data *obj, Evas_Coord_Rectangle *c) 109clip_calc(Evas_Object_Protected_Data *obj, Eina_Rectangle *c)
110{ 110{
111 if (!obj) return; 111 if (!obj) return;
112 RECTS_CLIP_TO_RECT(c->x, c->y, c->w, c->h, 112 RECTS_CLIP_TO_RECT(c->x, c->y, c->w, c->h,
@@ -119,7 +119,7 @@ static Eina_List *
119_evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data *obj, Eina_List *in, Evas_Object *stop, 119_evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data *obj, Eina_List *in, Evas_Object *stop,
120 int x, int y, int *no_rep, Eina_Bool source, int spaces EINA_UNUSED) 120 int x, int y, int *no_rep, Eina_Bool source, int spaces EINA_UNUSED)
121{ 121{
122 Evas_Coord_Rectangle c; 122 Eina_Rectangle c;
123 int inside; 123 int inside;
124 Evas_Object *eo_obj = obj->object; 124 Evas_Object *eo_obj = obj->object;
125 if (eo_obj == stop) 125 if (eo_obj == stop)
@@ -147,7 +147,7 @@ _evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data
147 { 147 {
148 if (obj->is_smart) 148 if (obj->is_smart)
149 { 149 {
150 Evas_Coord_Rectangle bounding_box = { 0, 0, 0, 0 }; 150 Eina_Rectangle bounding_box = { 0, };
151 151
152 evas_object_smart_bounding_box_update(obj); 152 evas_object_smart_bounding_box_update(obj);
153 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL); 153 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL);
@@ -166,7 +166,7 @@ _evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data
166#ifdef DDD_DO 166#ifdef DDD_DO
167 if (obj->is_smart) 167 if (obj->is_smart)
168 { 168 {
169 Evas_Coord_Rectangle bounding_box = { 0, 0, 0, 0 }; 169 Eina_Rectangle bounding_box = { 0, 0, 0, 0 };
170 170
171 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL); 171 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL);
172 DDD("___ %p g[%6i %6i %6ix%6i] c[%6i %6i %6ix%6i] b[%6i %6i %6ix%6i] %s\n", 172 DDD("___ %p g[%6i %6i %6ix%6i] c[%6i %6i %6ix%6i] b[%6i %6i %6ix%6i] %s\n",
@@ -202,7 +202,7 @@ _evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data
202 { 202 {
203 if (obj->is_smart) 203 if (obj->is_smart)
204 { 204 {
205 Evas_Coord_Rectangle bounding_box = { 0, 0, 0, 0 }; 205 Eina_Rectangle bounding_box = { 0, 0, 0, 0 };
206 206
207 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL); 207 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL);
208 DDD("OBJ %p g[%6i %6i %6ix%6i] c[%6i %6i %6ix%6i] b[%6i %6i %6ix%6i] %s\n", 208 DDD("OBJ %p g[%6i %6i %6ix%6i] c[%6i %6i %6ix%6i] b[%6i %6i %6ix%6i] %s\n",
@@ -279,7 +279,7 @@ _evas_event_object_list_raw_in_get_single(Evas *eo_e, Evas_Object_Protected_Data
279 } 279 }
280 else 280 else
281 { 281 {
282 Evas_Coord_Rectangle bounding_box = { 0, 0, 0, 0 }; 282 Eina_Rectangle bounding_box = { 0, };
283 283
284 if (!obj->child_has_map) 284 if (!obj->child_has_map)
285 evas_object_smart_bounding_box_update(obj); 285 evas_object_smart_bounding_box_update(obj);
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index 4c35d5ca62..b4299eb920 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -69,7 +69,7 @@ struct _Evas_Object_Image_Pixels
69 69
70struct _Evas_Object_Image_State 70struct _Evas_Object_Image_State
71{ 71{
72 Evas_Coord_Rectangle fill; 72 Eina_Rectangle fill;
73 struct { 73 struct {
74 short w, h, stride; 74 short w, h, stride;
75 } image; 75 } image;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2134998e27..056adff0aa 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -263,7 +263,7 @@ evas_object_clip_recalc_do(Evas_Object_Protected_Data *obj, Evas_Object_Protecte
263 { 263 {
264 if (obj->is_smart) 264 if (obj->is_smart)
265 { 265 {
266 Evas_Coord_Rectangle bounding_box; 266 Eina_Rectangle bounding_box;
267 267
268 evas_object_smart_bounding_box_update(obj); 268 evas_object_smart_bounding_box_update(obj);
269 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL); 269 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL);
@@ -2476,11 +2476,11 @@ _efl_canvas_object_pointer_inside_by_device_get(Eo *eo_obj EINA_UNUSED, Evas_Obj
2476EOLIAN static Eina_Bool 2476EOLIAN static Eina_Bool
2477_efl_canvas_object_pointer_coords_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord x, Evas_Coord y) 2477_efl_canvas_object_pointer_coords_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord x, Evas_Coord y)
2478{ 2478{
2479 Evas_Coord_Rectangle c; 2479 Eina_Rectangle c;
2480 2480
2481 if (obj->is_smart) 2481 if (obj->is_smart)
2482 { 2482 {
2483 Evas_Coord_Rectangle bounding_box = { 0, 0, 0, 0 }; 2483 Eina_Rectangle bounding_box = { 0, };
2484 2484
2485 evas_object_smart_bounding_box_update(obj); 2485 evas_object_smart_bounding_box_update(obj);
2486 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL); 2486 evas_object_smart_bounding_box_get(obj, &bounding_box, NULL);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 43c1847ecf..31004ba5f5 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -20,7 +20,7 @@ static Eina_Hash *_evas_smart_class_names_hash_table = NULL;
20struct _Evas_Smart_Data 20struct _Evas_Smart_Data
21{ 21{
22 struct { 22 struct {
23 Evas_Coord_Rectangle bounding_box; 23 Eina_Rectangle bounding_box;
24 } cur, prev; 24 } cur, prev;
25 Evas_Object *object; 25 Evas_Object *object;
26 void *engine_data; 26 void *engine_data;
@@ -1455,8 +1455,8 @@ evas_object_update_bounding_box(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
1455 1455
1456void 1456void
1457evas_object_smart_bounding_box_get(Evas_Object_Protected_Data *obj, 1457evas_object_smart_bounding_box_get(Evas_Object_Protected_Data *obj,
1458 Evas_Coord_Rectangle *cur_bounding_box, 1458 Eina_Rectangle *cur_bounding_box,
1459 Evas_Coord_Rectangle *prev_bounding_box) 1459 Eina_Rectangle *prev_bounding_box)
1460{ 1460{
1461 Evas_Smart_Data *s = obj->private_data; 1461 Evas_Smart_Data *s = obj->private_data;
1462 1462
diff --git a/src/lib/evas/canvas/evas_polygon_private.h b/src/lib/evas/canvas/evas_polygon_private.h
index b6da8167d1..7e5735a496 100644
--- a/src/lib/evas/canvas/evas_polygon_private.h
+++ b/src/lib/evas/canvas/evas_polygon_private.h
@@ -10,7 +10,7 @@ struct _Efl_Canvas_Polygon_Data
10 struct { 10 struct {
11 int x, y; 11 int x, y;
12 } offset; 12 } offset;
13 Evas_Coord_Rectangle geometry; 13 Eina_Rectangle geometry;
14 Eina_Bool changed : 1; 14 Eina_Bool changed : 1;
15}; 15};
16#endif 16#endif
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index a5e0b8031f..fc6f8b15ff 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1622,7 +1622,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj, Efl_Canva
1622static Eina_Bool 1622static Eina_Bool
1623_proxy_context_clip(Evas_Public_Data *evas, void *ctx, Evas_Proxy_Render_Data *proxy_render_data, Evas_Object_Protected_Data *obj, int off_x, int off_y) 1623_proxy_context_clip(Evas_Public_Data *evas, void *ctx, Evas_Proxy_Render_Data *proxy_render_data, Evas_Object_Protected_Data *obj, int off_x, int off_y)
1624{ 1624{
1625 const Evas_Coord_Rectangle *clip; 1625 const Eina_Rectangle *clip;
1626 Evas_Object_Protected_Data *clipper; 1626 Evas_Object_Protected_Data *clipper;
1627 int cw, ch; 1627 int cw, ch;
1628 1628
@@ -2165,7 +2165,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
2165 } 2165 }
2166 else 2166 else
2167 { 2167 {
2168 const Evas_Coord_Rectangle *clip = &obj->cur->geometry; 2168 const Eina_Rectangle *clip = &obj->cur->geometry;
2169 ENFN->context_clip_clip(ENC, ctx, clip->x + off_x, clip->y + off_y, clip->w, clip->h); 2169 ENFN->context_clip_clip(ENC, ctx, clip->x + off_x, clip->y + off_y, clip->w, clip->h);
2170 2170
2171 if (obj->cur->clipper && (mapped > 1)) 2171 if (obj->cur->clipper && (mapped > 1))
@@ -2757,7 +2757,7 @@ _is_obj_in_rect(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
2757{ 2757{
2758 if (obj->is_smart && !_evas_render_has_map(obj)) 2758 if (obj->is_smart && !_evas_render_has_map(obj))
2759 { 2759 {
2760 Evas_Coord_Rectangle rect; 2760 Eina_Rectangle rect;
2761 2761
2762 evas_object_smart_bounding_box_get(obj, &rect, NULL); 2762 evas_object_smart_bounding_box_get(obj, &rect, NULL);
2763 if (RECTS_INTERSECT(x, y, w, h, rect.x, rect.y, rect.w, rect.h)) 2763 if (RECTS_INTERSECT(x, y, w, h, rect.x, rect.y, rect.w, rect.h))
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index eef174fd99..8b31dca0fb 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -818,7 +818,7 @@ struct _Evas_Post_Callback
818typedef struct 818typedef struct
819{ 819{
820#ifdef INLINE_ACTIVE_GEOM 820#ifdef INLINE_ACTIVE_GEOM
821 Evas_Coord_Rectangle rect; 821 Eina_Rectangle rect;
822#endif 822#endif
823 Evas_Object_Protected_Data *obj; 823 Evas_Object_Protected_Data *obj;
824} Evas_Active_Entry; 824} Evas_Active_Entry;
@@ -1037,7 +1037,7 @@ struct _Evas_Map
1037{ 1037{
1038 DATA32 magic; 1038 DATA32 magic;
1039 int count; // num of points 1039 int count; // num of points
1040 Evas_Coord_Rectangle normal_geometry; // bounding box of map geom actually 1040 Eina_Rectangle normal_geometry; // bounding box of map geom actually
1041// void *surface; // surface holding map if needed 1041// void *surface; // surface holding map if needed
1042// int surface_w, surface_h; // current surface w & h alloc 1042// int surface_w, surface_h; // current surface w & h alloc
1043 double mx, my; // mouse x, y after conversion to map space 1043 double mx, my; // mouse x, y after conversion to map space
@@ -1119,7 +1119,7 @@ struct _Evas_Object_Protected_State
1119{ 1119{
1120 Evas_Object_Protected_Data *clipper; 1120 Evas_Object_Protected_Data *clipper;
1121 1121
1122 Evas_Coord_Rectangle geometry; 1122 Eina_Rectangle geometry;
1123 struct { 1123 struct {
1124 struct { 1124 struct {
1125 Evas_Coord x, y, w, h; 1125 Evas_Coord x, y, w, h;
@@ -1715,9 +1715,7 @@ void _evas_object_image_video_overlay_do(Evas_Object *obj);
1715Eina_Bool _evas_object_image_can_use_plane(Evas_Object_Protected_Data *obj, Efl_Canvas_Output *output); 1715Eina_Bool _evas_object_image_can_use_plane(Evas_Object_Protected_Data *obj, Efl_Canvas_Output *output);
1716void _evas_object_image_plane_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Efl_Canvas_Output *output); 1716void _evas_object_image_plane_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Efl_Canvas_Output *output);
1717void _evas_object_image_free(Evas_Object *obj); 1717void _evas_object_image_free(Evas_Object *obj);
1718void evas_object_smart_bounding_box_get(Evas_Object_Protected_Data *obj, 1718void evas_object_smart_bounding_box_get(Evas_Object_Protected_Data *obj, Eina_Rectangle *cur_bounding_box, Eina_Rectangle *prev_bounding_box);
1719 Evas_Coord_Rectangle *cur_bounding_box,
1720 Evas_Coord_Rectangle *prev_bounding_box);
1721void evas_object_smart_del(Evas_Object *obj); 1719void evas_object_smart_del(Evas_Object *obj);
1722void evas_object_smart_cleanup(Evas_Object *obj); 1720void evas_object_smart_cleanup(Evas_Object *obj);
1723void evas_object_smart_member_raise(Evas_Object *member); 1721void evas_object_smart_member_raise(Evas_Object *member);