yakov pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4f3c7670fcd73b8eb09f67a17afe5c10ac8a50c6
commit 4f3c7670fcd73b8eb09f67a17afe5c10ac8a50c6 Author: Yakov Goldberg <yako...@samsung.com> Date: Wed Jul 8 12:05:47 2015 +0300 elm_list: Move enums to elm_list.eo Move enums from elm_list_common.h to elm_list.eo in order to make them more accessible for bindings. Delete elm_list_common.h. --- src/lib/Makefile.am | 1 - src/lib/elm_list.eo | 25 ++++++++++++++++++++++++- src/lib/elm_list.h | 1 - src/lib/elm_list_common.h | 30 ------------------------------ 4 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 10de18e..a098a4f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -267,7 +267,6 @@ elm_layout_common.h \ elm_layout_eo.h \ elm_layout_legacy.h \ elm_list.h \ -elm_list_common.h \ elm_list_eo.h \ elm_list_legacy.h \ elm_macros.h \ diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo index decb447..0d7fdc7 100644 --- a/src/lib/elm_list.eo +++ b/src/lib/elm_list.eo @@ -1,5 +1,28 @@ import elm_general; +enum Elm.List.Mode +{ + [[ + @addtogroup List + 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_SCROLL. + + Values here @b don't work as bitmasks -- only one can be chosen at + a time. + + @see elm_list_mode_set() + @see elm_list_mode_get() + ]] + legacy: elm_list; + compress = 0, [[The list @b 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 @b 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 @b 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 @b minimum size hint will be set for its @b transverse axis, so that the @b 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_LIMIT, the list will set a minimum size on the @b 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 (Elm.Layout, Elm_Interface_Scrollable, Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection, Evas.Clickable_Interface, Evas.Selectable_Interface) @@ -198,7 +221,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable, @ingroup List */ } values { - mode: Elm_List_Mode(4); /*@ One of #Elm_List_Mode: #ELM_LIST_COMPRESS, + mode: Elm.List.Mode(Elm.List.Mode.last); /*@ One of #Elm_List_Mode: #ELM_LIST_COMPRESS, #ELM_LIST_SCROLL, #ELM_LIST_LIMIT or #ELM_LIST_EXPAND. */ } } diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h index d961b45..a324ad2 100644 --- a/src/lib/elm_list.h +++ b/src/lib/elm_list.h @@ -96,7 +96,6 @@ * @{ */ -#include <elm_list_common.h> #ifdef EFL_EO_API_SUPPORT #include <elm_list_eo.h> #endif diff --git a/src/lib/elm_list_common.h b/src/lib/elm_list_common.h deleted file mode 100644 index 581b2cf..0000000 --- a/src/lib/elm_list_common.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @addtogroup List - * - * @{ - */ - -/** - * 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_SCROLL. - * - * Values here @b don't work as bitmasks -- only one can be chosen at - * a time. - * - * @see elm_list_mode_set() - * @see elm_list_mode_get() - */ -typedef enum -{ - ELM_LIST_COMPRESS = 0, /**< The list @b 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 @b transverse axis, one won't be able to scroll it in that direction. */ - ELM_LIST_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 @b will be able to scroll it in that direction. */ - ELM_LIST_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 @b minimum size hint will be set for its @b transverse axis, so that the @b largest item in that direction fits well. This is naturally bound by the list object's maximum size hints, set externally. */ - ELM_LIST_EXPAND, /**< Besides setting a minimum size on the transverse axis, just like on #ELM_LIST_LIMIT, the list will set a minimum size on the @b 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. */ - ELM_LIST_LAST /**< Indicates error if returned by elm_list_mode_get() */ -} Elm_List_Mode; - -/** - * @} - */ --