diff options
| author | Yakov Goldberg <yakov.g@samsung.com> | 2015-07-07 14:09:03 +0300 |
|---|---|---|
| committer | Yakov Goldberg <yakov.g@samsung.com> | 2015-07-08 10:23:38 +0300 |
| commit | bff1590617e5c12629c897e64bc339424748cfaa (patch) | |
| tree | 7206507f3fa595f52c540a667ff41985d00a0943 | |
| parent | 6a64977e8c52569de89e7e359f2777ad38d2f4e8 (diff) | |
| download | elementary-bff1590617e5c12629c897e64bc339424748cfaa.tar.gz | |
elm_colorselector: Move enums to elm_colorselector.eo
Move enums from elm_colorselector_common.h to elm_colorselector.eo in order to make them
more accessible for bindings.
| -rw-r--r-- | src/lib/elm_colorselector.eo | 21 | ||||
| -rw-r--r-- | src/lib/elm_colorselector_common.h | 18 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo index 331d83668..6641d5059 100644 --- a/src/lib/elm_colorselector.eo +++ b/src/lib/elm_colorselector.eo @@ -1,3 +1,22 @@ +enum Elm.Colorselector.Mode +{ + [[ + @addtogroup Datetime + @enum Elm_Colorselector_Mode + + Different modes supported by Colorselector + + @see elm_colorselector_mode_set() + @see elm_colorselector_mode_get() + ]] + legacy: elm_colorselector; + palette = 0, [[Only color palette is displayed.]] + components, [[Only color selector is displayed.]] + both, [[Both Palette and selector is displayed, default.]] + picker, [[Only color picker is displayed.]] + all [[All possible color selector is displayed.]] +} + class Elm.Colorselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action, Evas.Clickable_Interface) { @@ -67,7 +86,7 @@ class Elm.Colorselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action, @ingroup Colorselector */ } values { - mode: Elm_Colorselector_Mode; /*@ Elm_Colorselector_Mode */ + mode: Elm.Colorselector.Mode; /*@ Elm_Colorselector_Mode */ } } @property palette_items { diff --git a/src/lib/elm_colorselector_common.h b/src/lib/elm_colorselector_common.h index 18515d2f4..ecce64dea 100644 --- a/src/lib/elm_colorselector_common.h +++ b/src/lib/elm_colorselector_common.h @@ -13,7 +13,6 @@ struct _Elm_Color_RGBA unsigned int a; }; - typedef struct _Elm_Custom_Palette Elm_Custom_Palette; struct _Elm_Custom_Palette { @@ -21,23 +20,6 @@ struct _Elm_Custom_Palette Eina_List *color_list; }; -/** - * @enum Elm_Colorselector_Mode - * - * Different modes supported by Colorselector - * - * @see elm_colorselector_mode_set() - * @see elm_colorselector_mode_get() - */ -typedef enum -{ - ELM_COLORSELECTOR_PALETTE = 0, /**< only color palette is displayed */ - ELM_COLORSELECTOR_COMPONENTS, /**< only color selector is displayed */ - ELM_COLORSELECTOR_BOTH, /**< Both Palette and selector is displayed, default */ - ELM_COLORSELECTOR_PICKER, /**< only color picker is displayed */ - ELM_COLORSELECTOR_ALL /**< all possible color selector is displayed */ -} Elm_Colorselector_Mode; - EAPI void elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *r, int *g, int *b, int *a); EAPI void elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int r, int g, int b, int a); |