summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-05-17 15:02:03 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-05-17 16:04:01 +0300
commitebeff70d4e51c38af5ae465c235ef9e9949689d1 (patch)
tree0b8b21997ef8d13204325fec5ddb2cae3c8bff69
parentef81df4964e877ce88db084d0a55abbf931bfcbb (diff)
elm_toolbar: Move enums to elm_toolbar.eo
Move enums from elm_toolbar_common.h to elm_tollbar.eo in order to make them more accessible for bindings.
-rw-r--r--src/lib/elm_toolbar.eo29
-rw-r--r--src/lib/elm_toolbar_common.h34
-rw-r--r--src/lib/elm_toolbar_item.eo17
3 files changed, 45 insertions, 35 deletions
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 8b52c92d4..93dbfbe0e 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -1,3 +1,30 @@
1enum Elm.Toolbar.Shrink_Mode
2{
3/**
4 Set toolbar's items display behavior, it can be scrollable,
5 show a menu with exceeding items, or simply hide them.
6
7 @note Default value is #ELM_TOOLBAR_SHRINK_MENU. It reads value
8 from elm config.
9
10 Values <b> don't </b> work as bitmask, only one can be chosen.
11
12 @see elm_toolbar_shrink_mode_set()
13 @see elm_toolbar_shrink_mode_get()
14
15 @ingroup Toolbar
16 */
17
18 legacy: elm_toolbar_shrink;
19
20 none, /*@< Set toolbar minimum size to fit all the items. */
21 hide, /*@< Hide exceeding items. */
22 scroll, /*@< Allow accessing exceeding items through a scroller. */
23 menu, /*@< Inserts a button to pop up a menu with exceeding items. */
24 expand, /*@< Expand all items according the size of the toolbar. */
25 last /*@< Indicates error if returned by elm_toolbar_shrink_mode_get() */
26}
27
1class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable, 28class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
2 Elm_Interface_Atspi_Widget_Action) 29 Elm_Interface_Atspi_Widget_Action)
3{ 30{
@@ -193,7 +220,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
193 @ingroup Toolbar */ 220 @ingroup Toolbar */
194 } 221 }
195 values { 222 values {
196 Elm_Toolbar_Shrink_Mode shrink_mode; /*@ Toolbar's items display behavior */ 223 Elm.Toolbar.Shrink_Mode shrink_mode; /*@ Toolbar's items display behavior */
197 } 224 }
198 } 225 }
199 @property menu_parent { 226 @property menu_parent {
diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index 0e300f4bc..cea449be9 100644
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -4,40 +4,6 @@
4 * @{ 4 * @{
5 */ 5 */
6 6
7/**
8 * Set toolbar's items display behavior, it can be scrollable,
9 * show a menu with exceeding items, or simply hide them.
10 *
11 * @note Default value is #ELM_TOOLBAR_SHRINK_MENU. It reads value
12 * from elm config.
13 *
14 * Values <b> don't </b> work as bitmask, only one can be chosen.
15 *
16 * @see elm_toolbar_shrink_mode_set()
17 * @see elm_toolbar_shrink_mode_get()
18 */
19typedef enum
20{
21 ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimum size to fit all the items. */
22 ELM_TOOLBAR_SHRINK_HIDE, /**< Hide exceeding items. */
23 ELM_TOOLBAR_SHRINK_SCROLL, /**< Allow accessing exceeding items through a scroller. */
24 ELM_TOOLBAR_SHRINK_MENU, /**< Inserts a button to pop up a menu with exceeding items. */
25 ELM_TOOLBAR_SHRINK_EXPAND, /**< Expand all items according the size of the toolbar. */
26 ELM_TOOLBAR_SHRINK_LAST /**< Indicates error if returned by elm_toolbar_shrink_mode_get() */
27} Elm_Toolbar_Shrink_Mode;
28
29/**
30 * Defines where to position the item in the toolbar.
31 */
32typedef enum
33{
34 ELM_TOOLBAR_ITEM_SCROLLTO_NONE = 0, /**< no scrollto */
35 ELM_TOOLBAR_ITEM_SCROLLTO_IN = (1 << 0), /**< to the nearest viewport */
36 ELM_TOOLBAR_ITEM_SCROLLTO_FIRST = (1 << 1), /**< to the first of viewport */
37 ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE = (1 << 2), /**< to the middle of viewport */
38 ELM_TOOLBAR_ITEM_SCROLLTO_LAST = (1 << 3) /**< to the last of viewport */
39} Elm_Toolbar_Item_Scrollto_Type;
40
41typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State; /**< State of a Elm_Toolbar_Item. Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del(). */ 7typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State; /**< State of a Elm_Toolbar_Item. Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del(). */
42 8
43/** 9/**
diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 7f870fbdc..04800f0d4 100644
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -1,3 +1,20 @@
1enum Elm.Toolbar_Item.Scrollto_Type
2{
3/**
4 Defines where to position the item in the toolbar.
5
6 @ingroup Toolbar
7 */
8
9 legacy: elm_toolbar_item_scrollto;
10
11 none = 0, /*@< no scrollto */
12 in = (1 << 0), /*@< to the nearest viewport */
13 first = (1 << 1), /*@< to the first of viewport */
14 middle = (1 << 2), /*@< to the middle of viewport */
15 last = (1 << 3) /*@< to the last of viewport */
16}
17
1class Elm.Toolbar_Item(Elm.Widget_Item) 18class Elm.Toolbar_Item(Elm.Widget_Item)
2{ 19{
3 eo_prefix: elm_obj_toolbar_item; 20 eo_prefix: elm_obj_toolbar_item;