dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_ui_popup: Replace Efl.Container to Efl.Content to rebase

This commit is contained in:
Jaehyun Cho 2017-11-27 18:50:11 +09:00
parent dcb7093c4c
commit a3ad64dcd0
6 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/elementary/efl_ui_popup.c
View File

@ -98,24 +98,6 @@ _efl_ui_popup_elm_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_U
efl_event_callback_add(pd->win_parent, EFL_GFX_EVENT_MOVE, _parent_geom_cb, obj);
}
EOLIAN static Eina_Bool
_efl_ui_popup_efl_container_content_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *content)
{
return efl_content_set(efl_part(obj, "elm.swallow.content"), content);
}
EOLIAN static Eo*
_efl_ui_popup_efl_container_content_get(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
{
return efl_content_get(efl_part(obj, "elm.swallow.content"));
}
EOLIAN static Eo*
_efl_ui_popup_efl_container_content_unset(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
{
return efl_content_unset(efl_part(obj, "elm.swallow.content"));
}
EOLIAN static void
_efl_ui_popup_align_set(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd, Efl_Ui_Popup_Align type)
{
@ -269,6 +251,11 @@ _efl_ui_popup_content_unset(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, const ch
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
}
/* Standard widget overrides */
ELM_PART_CONTENT_DEFAULT_SET(efl_ui_popup, "elm.swallow.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data)
/* Efl.Part begin */
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_popup, EFL_UI_POPUP, Efl_Ui_Popup_Data)

6
src/lib/elementary/efl_ui_popup.eo
View File

@ -7,7 +7,7 @@ enum Efl.Ui.Popup.Align {
bottom
}
class Efl.Ui.Popup(Efl.Ui.Layout)
class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
{
methods {
@property align {
@ -44,8 +44,8 @@ class Efl.Ui.Popup(Efl.Ui.Layout)
Efl.Gfx.position { set; }
Efl.Gfx.visible { set; }
Elm.Widget.widget_parent { set; }
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Part.part;
}
events {

4
src/lib/elementary/efl_ui_popup_alert_part.eo
View File

@ -3,8 +3,8 @@ class Efl.Ui.Popup.Alert.Part (Efl.Ui.Layout.Part_Content, Efl.Ui.Layout.Part_Te
[[Efl UI Popup Alert internal part class]]
data: null;
implements {
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Text.text { get; set; }
}
}

4
src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
View File

@ -3,8 +3,8 @@ class Efl.Ui.Popup.Alert.Scroll.Part (Efl.Ui.Layout.Part_Content, Efl.Ui.Layout.
[[Efl UI Popup Alert Scroll internal part class]]
data: null;
implements {
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Text.text { set; get; }
}
}

4
src/lib/elementary/efl_ui_popup_alert_text_part.eo
View File

@ -3,8 +3,8 @@ class Efl.Ui.Popup.Alert.Text.Part (Efl.Ui.Layout.Part_Content, Efl.Ui.Layout.Pa
[[Efl UI Popup Alert Text internal part class]]
data: null;
implements {
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Text.text { get; set; }
}
}

4
src/lib/elementary/efl_ui_popup_part.eo
View File

@ -3,8 +3,8 @@ class Efl.Ui.Popup.Part (Efl.Ui.Layout.Part_Content, Efl.Canvas.Object, Efl.File
[[Efl UI Popup internal part class]]
data: null;
implements {
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
Efl.Canvas.Object.repeat_events { set; get; }
Efl.File.file { set; }
}