elm: Don't do anything before construction

Obviously ui.win is still the ugly exception.
This commit is contained in:
Jean-Philippe Andre 2017-11-07 14:26:37 +09:00
parent ee90f72a76
commit 6cea4993e0
6 changed files with 9 additions and 17 deletions

View File

@ -73,14 +73,12 @@ _efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Foc
EOLIAN static Efl_Object*
_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd)
{
obj = efl_constructor(efl_super(obj, MY_CLASS));
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);
pd->enable_on_visible = EINA_TRUE;
pd->cycle = EINA_TRUE;
return efl_constructor(efl_super(obj, MY_CLASS));
return obj;
}
EOLIAN static void

View File

@ -909,8 +909,9 @@ _free_node(void *data)
EOLIAN static Efl_Object *
_efl_ui_focus_manager_calc_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd)
{
obj = efl_constructor(efl_super(obj, MY_CLASS));
pd->node_hash = eina_hash_pointer_new(_free_node);
return efl_constructor(efl_super(obj, MY_CLASS));
return obj;
}
EOLIAN static Efl_Object *

View File

@ -192,11 +192,10 @@ EFL_CALLBACKS_ARRAY_DEFINE(self_manager,
EOLIAN static Efl_Object*
_efl_ui_focus_manager_sub_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd EINA_UNUSED)
{
obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_event_callback_array_add(obj, self_manager(), obj);
_flush_manager(obj, pd);
return efl_constructor(efl_super(obj, MY_CLASS));
return obj;
}
EOLIAN static void

View File

@ -1312,9 +1312,10 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
EOLIAN static Efl_Object *
_efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
{
obj = efl_constructor(efl_super(obj, MY_CLASS));
en->select_allow = EINA_TRUE;
en->editable = EINA_TRUE;
return efl_constructor(efl_super(obj, MY_CLASS));
return obj;
}
EOLIAN static Efl_Object *

View File

@ -5397,13 +5397,6 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_text.eo.c"
EOLIAN static Eo *
_efl_ui_text_async_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
obj = efl_constructor(efl_super(obj, EFL_UI_TEXT_ASYNC_CLASS));
return obj;
}
EOLIAN static void
_efl_ui_text_async_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
{

View File

@ -6,6 +6,6 @@ class Efl.Ui.Text_Async (Efl.Ui.Text)
]]
data: null;
implements {
Efl.Object.constructor;
//Efl.Object.constructor;
}
}