summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-07 14:26:37 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-07 14:43:22 +0900
commit6cea4993e0ea7425a1dde2b38bcdb63687a7eaad (patch)
treed050485ae3d173077d6b4006dc99f402f2042fbd
parentee90f72a76ca0ae2b5f8dd815a59fd502ab966ae (diff)
elm: Don't do anything before construction
Obviously ui.win is still the ugly exception.
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c3
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_sub.c5
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c3
-rw-r--r--src/lib/elementary/efl_ui_text.c7
-rw-r--r--src/lib/elementary/efl_ui_text_async.eo2
6 files changed, 9 insertions, 17 deletions
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 9f9c9bc547..eee240523a 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -73,14 +73,12 @@ _efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Foc
73EOLIAN static Efl_Object* 73EOLIAN static Efl_Object*
74_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd) 74_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd)
75{ 75{
76 obj = efl_constructor(efl_super(obj, MY_CLASS));
76 pd->manager = efl_ui_widget_focus_manager_create(obj, obj); 77 pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
77
78 efl_composite_attach(obj, pd->manager); 78 efl_composite_attach(obj, pd->manager);
79
80 pd->enable_on_visible = EINA_TRUE; 79 pd->enable_on_visible = EINA_TRUE;
81 pd->cycle = EINA_TRUE; 80 pd->cycle = EINA_TRUE;
82 81 return obj;
83 return efl_constructor(efl_super(obj, MY_CLASS));
84} 82}
85 83
86EOLIAN static void 84EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 334037e0a2..4d54a95903 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -909,8 +909,9 @@ _free_node(void *data)
909EOLIAN static Efl_Object * 909EOLIAN static Efl_Object *
910_efl_ui_focus_manager_calc_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd) 910_efl_ui_focus_manager_calc_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd)
911{ 911{
912 obj = efl_constructor(efl_super(obj, MY_CLASS));
912 pd->node_hash = eina_hash_pointer_new(_free_node); 913 pd->node_hash = eina_hash_pointer_new(_free_node);
913 return efl_constructor(efl_super(obj, MY_CLASS)); 914 return obj;
914} 915}
915 916
916EOLIAN static Efl_Object * 917EOLIAN static Efl_Object *
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.c b/src/lib/elementary/efl_ui_focus_manager_sub.c
index 86fdcea6b2..e0ea26f4c2 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.c
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.c
@@ -192,11 +192,10 @@ EFL_CALLBACKS_ARRAY_DEFINE(self_manager,
192EOLIAN static Efl_Object* 192EOLIAN static Efl_Object*
193_efl_ui_focus_manager_sub_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd EINA_UNUSED) 193_efl_ui_focus_manager_sub_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd EINA_UNUSED)
194{ 194{
195 obj = efl_constructor(efl_super(obj, MY_CLASS));
195 efl_event_callback_array_add(obj, self_manager(), obj); 196 efl_event_callback_array_add(obj, self_manager(), obj);
196
197 _flush_manager(obj, pd); 197 _flush_manager(obj, pd);
198 198 return obj;
199 return efl_constructor(efl_super(obj, MY_CLASS));
200} 199}
201 200
202EOLIAN static void 201EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index fd38f8dd5c..002a4ddbd8 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -1312,9 +1312,10 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
1312EOLIAN static Efl_Object * 1312EOLIAN static Efl_Object *
1313_efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en) 1313_efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
1314{ 1314{
1315 obj = efl_constructor(efl_super(obj, MY_CLASS));
1315 en->select_allow = EINA_TRUE; 1316 en->select_allow = EINA_TRUE;
1316 en->editable = EINA_TRUE; 1317 en->editable = EINA_TRUE;
1317 return efl_constructor(efl_super(obj, MY_CLASS)); 1318 return obj;
1318} 1319}
1319 1320
1320EOLIAN static Efl_Object * 1321EOLIAN static Efl_Object *
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 505181a9ee..c1b9bd7287 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -5397,13 +5397,6 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
5397 5397
5398#include "efl_ui_text.eo.c" 5398#include "efl_ui_text.eo.c"
5399 5399
5400EOLIAN static Eo *
5401_efl_ui_text_async_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
5402{
5403 obj = efl_constructor(efl_super(obj, EFL_UI_TEXT_ASYNC_CLASS));
5404 return obj;
5405}
5406
5407EOLIAN static void 5400EOLIAN static void
5408_efl_ui_text_async_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED) 5401_efl_ui_text_async_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
5409{ 5402{
diff --git a/src/lib/elementary/efl_ui_text_async.eo b/src/lib/elementary/efl_ui_text_async.eo
index 52061e5380..0f57a8729b 100644
--- a/src/lib/elementary/efl_ui_text_async.eo
+++ b/src/lib/elementary/efl_ui_text_async.eo
@@ -6,6 +6,6 @@ class Efl.Ui.Text_Async (Efl.Ui.Text)
6 ]] 6 ]]
7 data: null; 7 data: null;
8 implements { 8 implements {
9 Efl.Object.constructor; 9 //Efl.Object.constructor;
10 } 10 }
11} 11}