elm: make content_get/set a property

This doesn't change the C code.
This commit is contained in:
Jean-Philippe Andre 2016-03-29 11:56:06 +09:00
parent 5f307809b1
commit d2b7621907
18 changed files with 40 additions and 42 deletions

View File

@ -93,7 +93,7 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface,
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Elm.Widget.event;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.text_aliases.get;
Elm.Layout.content_aliases.get;
Elm.Layout.sizing_eval;

View File

@ -46,7 +46,7 @@ class Elm.Check (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Elm.Widget.event;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.text_aliases.get;
Elm.Layout.content_aliases.get;
Elm.Layout.sizing_eval;

View File

@ -12,20 +12,18 @@ class Elm.Container (Elm.Widget)
ret: free(own(list<Evas.Object *> *), eina_list_free); [[list]]
}
}
content_set {
[[Swallow the given object into the given part of the container.]]
params {
@in name: const(char)*; [[the part in which to swallow the object]]
@in content: Evas.Object *; [[the object to swallow.]]
@property content {
[[Swallowed sub-object contained in this object.]]
set {
return: bool;
}
return: bool;
}
content_get {
[[Get the object swallowed in the given part of the container.]]
params {
@in name: const(char)* @nullable; [[the part in which the object is swallowed.]]
get {}
keys {
name: const(char)*; [[the part in which to swallow the object]]
}
values {
content: Evas.Object*; [[the object to swallow.]]
}
return: Evas.Object *;
}
content_unset {
[[Unswallow the object in the given part of the container and return it.]]
@ -36,9 +34,9 @@ class Elm.Container (Elm.Widget)
}
}
implements {
@virtual .content_set;
@virtual .content_unset;
@virtual .content_get;
@virtual .content.get;
@virtual .content.set;
@virtual .content_swallow_list.get;
}

View File

@ -227,8 +227,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
Elm.Widget.translate;
Elm.Widget.theme_apply;
Elm.Widget.event;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Layout.sub_object_add_enable;
Elm.Layout.sizing_eval;

View File

@ -154,7 +154,7 @@ class Elm.Dayselector (Elm.Layout)
Elm.Widget.focus_direction_manager_is;
Elm.Widget.translate;
Elm.Container.content_unset;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.sizing_eval;
}
events {

View File

@ -934,7 +934,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
Elm.Widget.sub_object_del;
Elm.Widget.focus_next_manager_is;
Elm.Container.content_unset;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.theme_enable;
Elm.Layout.sizing_eval;
Elm.Layout.text.get;

View File

@ -90,9 +90,9 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector,
Elm.Widget.focus_next;
Elm.Widget.disable;
Elm.Widget.focus_direction_manager_is;
Elm.Container.content_get;
Elm.Container.content.get;
Elm.Container.content_unset;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.text.set;
Elm.Layout.text.get;
Elm.Layout.sizing_eval;

View File

@ -238,8 +238,8 @@ class Elm.Flip (Elm.Container)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.sub_object_del;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
}
events {

View File

@ -70,8 +70,8 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface_Atspi_Widge
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_next_manager_is;
Elm.Widget.sub_object_del;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Layout.sizing_eval;
Elm.Layout.content_aliases.get;

View File

@ -487,8 +487,8 @@ class Elm.Layout (Elm.Container, Efl.File)
Elm.Widget.disable;
Elm.Widget.sub_object_del;
Elm.Widget.on_focus;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Container.content_swallow_list.get;
}

View File

@ -136,8 +136,8 @@ class Elm.Mapbuf (Elm.Container)
Evas.Object_Smart.resize;
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
}

View File

@ -151,8 +151,8 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
Elm.Widget.translate;
Elm.Widget.theme_apply;
Elm.Widget.event;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Layout.text.set;
Elm.Layout.text.get;

View File

@ -92,8 +92,8 @@ class Elm.Notify (Elm.Container)
Elm.Widget.sub_object_del;
Elm.Widget.part_text.set;
Elm.Widget.part_text.get;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
}
events {

View File

@ -79,9 +79,9 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable,
Elm.Widget.access;
Elm.Widget.event;
Elm.Widget.on_focus_region;
Elm.Container.content_get;
Elm.Container.content.get;
Elm.Container.content_unset;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.sizing_eval;
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
}

View File

@ -8,7 +8,7 @@ class Elm.Player (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
Evas.Object_Smart.del;
Elm.Widget.theme_apply;
Elm.Widget.event;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.sizing_eval;
Elm.Interface_Atspi_Widget_Action.elm_actions.get;
}

View File

@ -177,8 +177,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action)
Elm.Widget.translate;
Elm.Widget.sub_object_del;
Elm.Widget.event;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Layout.text.set;
Elm.Layout.text.get;

View File

@ -162,7 +162,7 @@ class Elm.Progressbar (Elm.Layout)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.sub_object_del;
Elm.Container.content_set;
Elm.Container.content.set;
Elm.Layout.text_aliases.get;
Elm.Layout.content_aliases.get;
Elm.Layout.sizing_eval;

View File

@ -106,8 +106,8 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
Elm.Widget.focus_direction;
Elm.Widget.sub_object_del;
Elm.Widget.event;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content.get;
Elm.Container.content.set;
Elm.Container.content_unset;
Elm.Layout.sizing_eval;
Elm.Interface_Scrollable.page_size.set;