bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=15fcaaec6900b783b00756fd4194d2f086047196
commit 15fcaaec6900b783b00756fd4194d2f086047196 Author: Lauro Moura <[email protected]> Date: Wed Apr 18 19:03:11 2018 +0200 elm: Move legacy genlist types to elm_general. Summary: Fixes T6771 Reviewers: bu5hm4n, felipealmeida Subscribers: q66, cedric Maniphest Tasks: T6771 Differential Revision: https://phab.enlightenment.org/D5938 --- src/lib/elementary/efl_ui_layout.eo | 2 + src/lib/elementary/elm_general.eot | 100 +++++++++++++++++++++++++++++++++ src/lib/elementary/elm_gengrid.eo | 1 - src/lib/elementary/elm_gengrid_item.eo | 25 --------- src/lib/elementary/elm_genlist.eo | 2 - src/lib/elementary/elm_genlist_item.eo | 38 ------------- src/lib/elementary/elm_list.eo | 36 ------------ src/lib/elementary/elm_view_list.eo | 2 +- 8 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo index ce8441eefd..cc6ed24233 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout.eo @@ -1,3 +1,5 @@ +import efl_ui; + class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory, Efl.Layout.Calc, Efl.Layout.Signal, diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index 55d310f6be..bcefa45410 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -274,3 +274,103 @@ enum Elm.Cnp_Mode no_image, [[ copy & paste text without item(image) tag ]] plaintext, [[ copy & paste text without markup tag ]] } + +/* Elm_Genlist-related types */ +type @extern Elm.Genlist.Item.Class: __undefined_type; [[External elm genlist item class]] + +enum Elm.Genlist.Item.Type +{ + [[Defines if the item is of any special type (has subitems or it's the + index of a group), or is just a simple item. + ]] + legacy: elm_genlist_item; + none = 0, [[Simple item.]] + tree = (1 << 0), [[This may be expanded and have child items.]] + group = (1 << 1), [[An index item of a group of items. this item can have child items.]] + max = (1 << 2) [[Sentinel value to indicate last enum field during iteration]] +} + +enum Elm.Genlist.Item.Field_Type +{ + [[Defines the type of the item part + Used while updating item's parts + It can be used at updating multi fields. + ]] + legacy: elm_genlist_item_field; + all = 0, [[Type all]] + text = (1 << 0), [[Type text]] + content = (1 << 1), [[Type content]] + state = (1 << 2) [[Type state]] +} + +enum Elm.Genlist.Item.Scrollto_Type +{ + [[Defines where to position the item in the genlist.]] + legacy: elm_genlist_item_scrollto; + none = 0, [[Nothing will happen, Don't use this value.]] + in = (1 << 0), [[To the nearest viewport.]] + top = (1 << 1), [[To the top of viewport.]] + middle = (1 << 2), [[To the middle of viewport.]] + bottom = (1 << 3) [[To the bottom of viewport.]] +} + +/* Elm_Gengrid-related types */ + +type @extern Elm.Gengrid.Item.Class: __undefined_type; [[External elm gengrid item class]] + +enum Elm.Gengrid.Item.Scrollto_Type +{ + [[Defines where to position the item in the genlist.]] + legacy: elm_gengrid_item_scrollto; + none = 0, [[No scrollto.]] + in = (1 << 0), [[To the nearest viewport.]] + top = (1 << 1), [[To the top of viewport.]] + middle = (1 << 2), [[To the middle of viewport.]] + bottom = (1 << 3) [[To the bottom of viewport.]] +} + +enum Elm.Gengrid.Item.Field_Type +{ + [[Defines the type of the item part Used while updating item's parts. + It can be used at updating multi fields.]] + legacy: elm_gengrid_item_field; + all = 0, [[Type all]] + text = (1 << 0), [[Type text]] + content = (1 << 1), [[Type content]] + state = (1 << 2) [[Type state]] +} + +/* Elm_List types */ +enum Elm.List.Mode +{ + [[Set list's resizing behavior, transverse axis scrolling and items + cropping. See each mode's description for more details. + + Note: Default value is @Elm.List.Mode.scroll. + + Values here don't work as bitmasks -- only one can be chosen at + a time. + ]] + legacy: elm_list; + compress = 0, [[The list won't set any of its size hints to inform how a + possible container should resize it. Then, if it's not + created as a "resize object", it might end with zeroed + dimensions. The list will respect the container's geometry + and, if any of its items won't fit into its transverse axis, + one won't be able to scroll it in that direction.]] + scroll, [[Default value. This is the same as #ELM_LIST_COMPRESS, with the + exception that if any of its items won't fit into its transverse + axis, one will be able to scroll it in that direction.]] + limit, [[Sets a minimum size hint on the list object, so that containers may + respect it (and resize itself to fit the child properly). More + specifically, a minimum size hint will be set for its transverse + axis, so that the largest item in that direction fits well. This + is naturally bound by the list object's maximum size hints, set + externally.]] + expand, [[Besides setting a minimum size on the transverse axis, just like + on @Elm.List.Mode.limit, the list will set a minimum size on the + longitudinal axis, trying to reserve space to all its children to + be visible at a time. . This is naturally bound by the list + object's maximum size hints, set externally.]] + last [[Indicates error if returned by elm_list_mode_get().]] +} diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 289929f653..ddfca93533 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -1,5 +1,4 @@ import elm_general; -import elm_gengrid_item; type @extern Ecore_Pos_Map: __undefined_type; [[External ecore position map]] diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 4f2b0370a8..100ee088f0 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -1,30 +1,5 @@ import elm_general; -type @extern Elm.Gengrid.Item.Class: __undefined_type; [[External elm gengrid item class]] - -enum Elm.Gengrid.Item.Scrollto_Type -{ - [[Defines where to position the item in the genlist.]] - legacy: elm_gengrid_item_scrollto; - none = 0, [[No scrollto.]] - in = (1 << 0), [[To the nearest viewport.]] - top = (1 << 1), [[To the top of viewport.]] - middle = (1 << 2), [[To the middle of viewport.]] - bottom = (1 << 3) [[To the bottom of viewport.]] -} - -enum Elm.Gengrid.Item.Field_Type -{ - [[Defines the type of the item part Used while updating item's parts. - It can be used at updating multi fields.]] - legacy: elm_gengrid_item_field; - all = 0, [[Type all]] - text = (1 << 0), [[Type text]] - content = (1 << 1), [[Type content]] - state = (1 << 2) [[Type state]] -} - - class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui.Legacy) { [[Elementary gengrid item class]] diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index f3141b9568..ae01e70a7d 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -1,6 +1,4 @@ import elm_general; -import elm_list; -import elm_genlist_item; class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Widget.Action, Efl.Access.Selection, diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index aba6d872bb..70fe8e18f3 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -1,43 +1,5 @@ import elm_general; -type @extern Elm.Genlist.Item.Class: __undefined_type; [[External elm genlist item class]] - -enum Elm.Genlist.Item.Type -{ - [[Defines if the item is of any special type (has subitems or it's the - index of a group), or is just a simple item. - ]] - legacy: elm_genlist_item; - none = 0, [[Simple item.]] - tree = (1 << 0), [[This may be expanded and have child items.]] - group = (1 << 1), [[An index item of a group of items. this item can have child items.]] - max = (1 << 2) [[Sentinel value to indicate last enum field during iteration]] -} - -enum Elm.Genlist.Item.Field_Type -{ - [[Defines the type of the item part - Used while updating item's parts - It can be used at updating multi fields. - ]] - legacy: elm_genlist_item_field; - all = 0, [[Type all]] - text = (1 << 0), [[Type text]] - content = (1 << 1), [[Type content]] - state = (1 << 2) [[Type state]] -} - -enum Elm.Genlist.Item.Scrollto_Type -{ - [[Defines where to position the item in the genlist.]] - legacy: elm_genlist_item_scrollto; - none = 0, [[Nothing will happen, Don't use this value.]] - in = (1 << 0), [[To the nearest viewport.]] - top = (1 << 1), [[To the top of viewport.]] - middle = (1 << 2), [[To the middle of viewport.]] - bottom = (1 << 3) [[To the bottom of viewport.]] -} - class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy) { [[Elementary genlist item class]] diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index d34e0dabbb..27fb896c0f 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -1,41 +1,5 @@ import elm_general; -enum Elm.List.Mode -{ - [[Set list's resizing behavior, transverse axis scrolling and items - cropping. See each mode's description for more details. - - Note: Default value is @Elm.List.Mode.scroll. - - Values here don't work as bitmasks -- only one can be chosen at - a time. - - See also @Elm.List.mode.set, @Elm.List.mode.get. - ]] - legacy: elm_list; - compress = 0, [[The list won't set any of its size hints to inform how a - possible container should resize it. Then, if it's not - created as a "resize object", it might end with zeroed - dimensions. The list will respect the container's geometry - and, if any of its items won't fit into its transverse axis, - one won't be able to scroll it in that direction.]] - scroll, [[Default value. This is the same as #ELM_LIST_COMPRESS, with the - exception that if any of its items won't fit into its transverse - axis, one will be able to scroll it in that direction.]] - limit, [[Sets a minimum size hint on the list object, so that containers may - respect it (and resize itself to fit the child properly). More - specifically, a minimum size hint will be set for its transverse - axis, so that the largest item in that direction fits well. This - is naturally bound by the list object's maximum size hints, set - externally.]] - expand, [[Besides setting a minimum size on the transverse axis, just like - on @Elm.List.Mode.limit, the list will set a minimum size on the - longitudinal axis, trying to reserve space to all its children to - be visible at a time. . This is naturally bound by the list - object's maximum size hints, set externally.]] - last [[Indicates error if returned by elm_list_mode_get().]] -} - class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo index ccd77a6923..967be21594 100644 --- a/src/lib/elementary/elm_view_list.eo +++ b/src/lib/elementary/elm_view_list.eo @@ -1,4 +1,4 @@ -import elm_genlist_item; +import elm_general; class Elm.View.List (Efl.Object) { --
