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.

diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 8b52c92..93dbfbe 100644 (file)
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -1,3 +1,30 @@
+enum Elm.Toolbar.Shrink_Mode
+{
+/**
+   Set toolbar's items display behavior, it can be scrollable,
+   show a menu with exceeding items, or simply hide them.
+
+   @note Default value is #ELM_TOOLBAR_SHRINK_MENU. It reads value
+   from elm config.
+
+   Values <b> don't </b> work as bitmask, only one can be chosen.
+
+   @see elm_toolbar_shrink_mode_set()
+   @see elm_toolbar_shrink_mode_get()
+
+   @ingroup Toolbar
+ */
+
+   legacy: elm_toolbar_shrink;
+
+   none, /*@< Set toolbar minimum size to fit all the items. */
+   hide, /*@< Hide exceeding items. */
+   scroll, /*@< Allow accessing exceeding items through a scroller. */
+   menu, /*@< Inserts a button to pop up a menu with exceeding items. */
+   expand, /*@< Expand all items according the size of the toolbar. */
+   last /*@< Indicates error if returned by elm_toolbar_shrink_mode_get() */
+}
+
 class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
                    Elm_Interface_Atspi_Widget_Action)
 {
@@ -193,7 +220,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             @ingroup Toolbar */
          }
          values {
-            Elm_Toolbar_Shrink_Mode shrink_mode; /*@ Toolbar's items display behavior */
+            Elm.Toolbar.Shrink_Mode shrink_mode; /*@ Toolbar's items display behavior */
          }
       }
       @property menu_parent {

diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index 0e300f4..cea449b 100644 (file)
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -4,40 +4,6 @@
  * @{
  */
 
-/**
- * Set toolbar's items display behavior, it can be scrollable,
- * show a menu with exceeding items, or simply hide them.
- *
- * @note Default value is #ELM_TOOLBAR_SHRINK_MENU. It reads value
- * from elm config.
- *
- * Values <b> don't </b> work as bitmask, only one can be chosen.
- *
- * @see elm_toolbar_shrink_mode_set()
- * @see elm_toolbar_shrink_mode_get()
- */
-typedef enum
-{
-   ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimum size to fit all the items. */
-   ELM_TOOLBAR_SHRINK_HIDE, /**< Hide exceeding items. */
-   ELM_TOOLBAR_SHRINK_SCROLL, /**< Allow accessing exceeding items through a scroller. */
-   ELM_TOOLBAR_SHRINK_MENU, /**< Inserts a button to pop up a menu with exceeding items. */
-   ELM_TOOLBAR_SHRINK_EXPAND, /**< Expand all items according the size of the toolbar. */
-   ELM_TOOLBAR_SHRINK_LAST /**< Indicates error if returned by elm_toolbar_shrink_mode_get() */
-} Elm_Toolbar_Shrink_Mode;
-
-/**
- * Defines where to position the item in the toolbar.
- */
-typedef enum
-{
-   ELM_TOOLBAR_ITEM_SCROLLTO_NONE = 0,   /**< no scrollto */
-   ELM_TOOLBAR_ITEM_SCROLLTO_IN = (1 << 0),   /**< to the nearest viewport */
-   ELM_TOOLBAR_ITEM_SCROLLTO_FIRST = (1 << 1),   /**< to the first of viewport */
-   ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE = (1 << 2),   /**< to the middle of viewport */
-   ELM_TOOLBAR_ITEM_SCROLLTO_LAST = (1 << 3)   /**< to the last of viewport */
-} Elm_Toolbar_Item_Scrollto_Type;
-
 typedef 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(). */
 
 /**

diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 7f870fb..04800f0 100644 (file)
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -1,3 +1,20 @@
+enum Elm.Toolbar_Item.Scrollto_Type
+{
+/**
+   Defines where to position the item in the toolbar.
+
+   @ingroup Toolbar
+ */
+
+   legacy: elm_toolbar_item_scrollto;
+
+   none = 0,   /*@< no scrollto */
+   in = (1 << 0),   /*@< to the nearest viewport */
+   first = (1 << 1),   /*@< to the first of viewport */
+   middle = (1 << 2),   /*@< to the middle of viewport */
+   last = (1 << 3)   /*@< to the last of viewport */
+}
+
 class Elm.Toolbar_Item(Elm.Widget_Item)
 {
       eo_prefix: elm_obj_toolbar_item;