summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-10-19 16:07:39 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-10-19 16:32:54 -0700
commitb55c96fe0479448a9d220a8976d88c1aa0f9f63e (patch)
treecbcb2205300a561df26468b422d82bfd9b0036f1 /src/lib/evas
parent93c570b5ddcabb1b84c3cf7eacd3af2a96672053 (diff)
evas: propagate object data to evas_object_inform_call_resize instead of fetching it again.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_map.c2
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c3
-rw-r--r--src/lib/evas/canvas/evas_object_line.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c4
-rw-r--r--src/lib/evas/canvas/evas_object_text.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c2
-rw-r--r--src/lib/evas/include/evas_private.h2
8 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 0283762e2d..e05ad97323 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -17,7 +17,7 @@ _evas_map_calc_geom_change(Evas_Object *eo_obj)
17 } 17 }
18 } 18 }
19 evas_object_inform_call_move(eo_obj, obj); 19 evas_object_inform_call_move(eo_obj, obj);
20 evas_object_inform_call_resize(eo_obj); 20 evas_object_inform_call_resize(eo_obj, obj);
21} 21}
22 22
23void 23void
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index cf180b14e0..3daffaaa2c 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -32,9 +32,8 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
32} 32}
33 33
34void 34void
35evas_object_inform_call_resize(Evas_Object *eo_obj) 35evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
36{ 36{
37 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
38 int event_id = _evas_object_event_new(); 37 int event_id = _evas_object_event_new();
39 38
40 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_EVENT_RESIZE); 39 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_EVENT_RESIZE);
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 4d588e0816..1790fbf8b1 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -176,7 +176,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord x1, Evas_Coord y1,
176 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL); 176 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
177 eina_list_free(was); 177 eina_list_free(was);
178 evas_object_inform_call_move(eo_obj, obj); 178 evas_object_inform_call_move(eo_obj, obj);
179 evas_object_inform_call_resize(eo_obj); 179 evas_object_inform_call_resize(eo_obj, obj);
180} 180}
181 181
182EOLIAN static void 182EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 323bc9041a..acc8de92d9 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1537,7 +1537,7 @@ _efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1537 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL); 1537 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
1538 } 1538 }
1539 eina_list_free(was); 1539 eina_list_free(was);
1540 evas_object_inform_call_resize(eo_obj); 1540 evas_object_inform_call_resize(eo_obj, obj);
1541} 1541}
1542 1542
1543EOLIAN Eina_Rect 1543EOLIAN Eina_Rect
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index bbf21f639a..bc135d90e4 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -190,7 +190,7 @@ _efl_canvas_polygon_point_add(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd, Eina_Pos
190 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL); 190 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
191 eina_list_free(was); 191 eina_list_free(was);
192 evas_object_inform_call_move(eo_obj, obj); 192 evas_object_inform_call_move(eo_obj, obj);
193 evas_object_inform_call_resize(eo_obj); 193 evas_object_inform_call_resize(eo_obj, obj);
194} 194}
195 195
196EOLIAN static void 196EOLIAN static void
@@ -227,7 +227,7 @@ _efl_canvas_polygon_points_clear(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd)
227 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL); 227 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL);
228 eina_list_free(was); 228 eina_list_free(was);
229 evas_object_inform_call_move(eo_obj, obj); 229 evas_object_inform_call_move(eo_obj, obj);
230 evas_object_inform_call_resize(eo_obj); 230 evas_object_inform_call_resize(eo_obj, obj);
231} 231}
232 232
233/* all nice and private */ 233/* all nice and private */
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 5108aad00e..5cd0da45ce 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -462,7 +462,7 @@ _evas_text_font_reload(Eo *eo_obj, Evas_Text_Data *o)
462 if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible) 462 if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible)
463 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL); 463 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
464 eina_list_free(was); 464 eina_list_free(was);
465 evas_object_inform_call_resize(eo_obj); 465 evas_object_inform_call_resize(eo_obj, obj);
466} 466}
467 467
468EOLIAN static void 468EOLIAN static void
@@ -1101,7 +1101,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text)
1101 if (obj->cur->visible) 1101 if (obj->cur->visible)
1102 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL); 1102 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL);
1103 eina_list_free(was); 1103 eina_list_free(was);
1104 evas_object_inform_call_resize(eo_obj); 1104 evas_object_inform_call_resize(eo_obj, obj);
1105} 1105}
1106 1106
1107EOLIAN static void 1107EOLIAN static void
@@ -2255,7 +2255,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj)
2255 if (obj->cur->visible) 2255 if (obj->cur->visible)
2256 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL); 2256 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_FALSE, NULL);
2257 eina_list_free(was); 2257 eina_list_free(was);
2258 evas_object_inform_call_resize(eo_obj); 2258 evas_object_inform_call_resize(eo_obj, obj);
2259} 2259}
2260 2260
2261static void 2261static void
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 7f6dc76eb6..50a636d18b 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1215,7 +1215,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data *o)
1215 if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible) 1215 if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible)
1216 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL); 1216 _evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
1217 eina_list_free(was); 1217 eina_list_free(was);
1218 evas_object_inform_call_resize(eo_obj); 1218 evas_object_inform_call_resize(eo_obj, obj);
1219 o->changed = 1; 1219 o->changed = 1;
1220 o->core_change = 1; 1220 o->core_change = 1;
1221 evas_object_textgrid_rows_clear(eo_obj); 1221 evas_object_textgrid_rows_clear(eo_obj);
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 9f82a55a42..049e707b40 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1743,7 +1743,7 @@ void evas_event_callback_cleanup(Evas *e);
1743void evas_object_inform_call_show(Evas_Object *obj, Evas_Object_Protected_Data *pd); 1743void evas_object_inform_call_show(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1744void evas_object_inform_call_hide(Evas_Object *obj, Evas_Object_Protected_Data *pd); 1744void evas_object_inform_call_hide(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1745void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data *pd); 1745void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1746void evas_object_inform_call_resize(Evas_Object *obj); 1746void evas_object_inform_call_resize(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1747void evas_object_inform_call_restack(Evas_Object *obj); 1747void evas_object_inform_call_restack(Evas_Object *obj);
1748void evas_object_inform_call_changed_size_hints(Evas_Object *obj); 1748void evas_object_inform_call_changed_size_hints(Evas_Object *obj);
1749void evas_object_inform_call_image_preloaded(Evas_Object *obj); 1749void evas_object_inform_call_image_preloaded(Evas_Object *obj);