enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl model: Fix invalid type in EO 

Efl.Canvas refers to a canvas, like Evas or Window. Efl.Gfx is
the base visual object type in libefl.so
This commit is contained in:
Jean-Philippe Andre 2017-05-17 14:16:50 +09:00
parent ba8db108cb
commit afbdaf514a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/efl/interfaces/efl_ui_factory.eo
View File

@ -6,14 +6,14 @@ interface Efl.Ui.Factory (Efl.Ui.Model.Connect)
[[Create a UI object from the necessary properties in the specified model.]]
params {
model: Efl.Model; [[Efl model]]
parent: Efl.Canvas; [[Efl canvas]]
parent: Efl.Gfx; [[Efl canvas]]
}
return: Efl.Canvas; [[Created UI object]]
return: Efl.Gfx; [[Created UI object]]
}
release {
[[Release a UI object and disconnect from models.]]
params {
ui_view: Efl.Canvas; [[Efl canvas]]
ui_view: Efl.Gfx; [[Efl canvas]]
}
}
}

10
src/lib/elementary/efl_ui_image_factory.c
View File

@ -32,12 +32,14 @@ _efl_ui_image_factory_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Image_Fa
efl_destructor(efl_super(obj, MY_CLASS));
}
EOLIAN static Efl_Canvas *
_efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd, Efl_Model *model, Efl_Canvas *parent)
EOLIAN static Efl_Gfx *
_efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd, Efl_Model *model, Efl_Gfx *parent)
{
Efl_Gfx *ui_view;
EINA_SAFETY_ON_NULL_RETURN_VAL(pd->property, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
Efl_Canvas *ui_view = efl_add(EFL_UI_IMAGE_CLASS, parent);
ui_view = efl_add(EFL_UI_IMAGE_CLASS, parent);
efl_ui_view_model_set(ui_view, model);
efl_ui_model_connect(ui_view, "filename", pd->property);
@ -45,7 +47,7 @@ _efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Fa
}
EOLIAN static void
_efl_ui_image_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd EINA_UNUSED, Efl_Canvas *ui_view)
_efl_ui_image_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd EINA_UNUSED, Efl_Gfx *ui_view)
{
efl_parent_set(ui_view, NULL);
}

2
src/lib/elementary/elm_layout.c
View File

@ -2101,7 +2101,7 @@ _elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd
Eina_Hash_Tuple *tuple;
Eina_Stringshare *name;
Efl_Ui_Factory *factory;
Efl_Canvas *content;
Efl_Gfx *content;
Eina_Iterator *it_p = eina_hash_iterator_tuple_new(pd->factories);
while (eina_iterator_next(it_p, (void **)&tuple))