summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry <larry.olj@gmail.com>2016-02-25 18:51:53 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-25 23:16:09 -0300
commitd6c65ac9d9bed0d508fa42c19dd55b7206aa9eff (patch)
tree39136f9c16a305f71cd16c8d68609a6dcaf4ae9c
parent040b4cfc25317f4cf9738963411d7c1f96519579 (diff)
elm_toolbar define elm_toolbar_item_state in elm toolbar eolian files
-rw-r--r--src/lib/elm_toolbar.eo2
-rw-r--r--src/lib/elm_toolbar_common.h1
-rw-r--r--src/lib/elm_toolbar_item.eo23
-rw-r--r--src/lib/elm_widget_toolbar.h8
4 files changed, 19 insertions, 15 deletions
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 1af9546b9..66f92f37a 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -111,7 +111,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable,
111 get { 111 get {
112 } 112 }
113 values { 113 values {
114 order: Elm_Icon_Lookup_Order(1); [[The icon lookup order. (If getting the icon order loopup fails, it returns #ELM_ICON_LOOKUP_THEME_FDO)]] 114 order: Elm.Icon.Lookup_Order(1); [[The icon lookup order. (If getting the icon order loopup fails, it returns #ELM_ICON_LOOKUP_THEME_FDO)]]
115 } 115 }
116 } 116 }
117 @property shrink_mode { 117 @property shrink_mode {
diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index cea449be9..4e1c37b0e 100644
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -4,7 +4,6 @@
4 * @{ 4 * @{
5 */ 5 */
6 6
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(). */
8 7
9/** 8/**
10 * Unset the state of @p it. 9 * Unset the state of @p it.
diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 23c752a19..6a1c31515 100644
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -10,6 +10,19 @@ enum Elm.Toolbar_Item.Scrollto_Type
10 last = (1 << 3) [[to the last of viewport]] 10 last = (1 << 3) [[to the last of viewport]]
11} 11}
12 12
13struct Elm.Toolbar_Item.State
14{
15 [[
16 State of a Elm_Toolbar_Item.
17 Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del().
18 ]]
19 label: const(char)*;
20 icon_str: const(char)*;
21 icon: Evas.Object *;
22 func: Evas_Smart_Cb ;
23 data: const(void)*;
24}
25
13class Elm.Toolbar_Item(Elm.Widget_Item) 26class Elm.Toolbar_Item(Elm.Widget_Item)
14{ 27{
15 eo_prefix: elm_obj_toolbar_item; 28 eo_prefix: elm_obj_toolbar_item;
@@ -165,7 +178,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
165 return: bool; 178 return: bool;
166 } 179 }
167 values { 180 values {
168 state: Elm_Toolbar_Item_State * @nullable; 181 state: Elm.Toolbar_Item.State * @nullable;
169 } 182 }
170 } 183 }
171 /* init { FIXME 184 /* init { FIXME
@@ -217,12 +230,12 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
217 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]] 230 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]]
218 @in data: const (void) * @optional; [[The data to associate with the state.]] 231 @in data: const (void) * @optional; [[The data to associate with the state.]]
219 } 232 }
220 return: Elm_Toolbar_Item_State *; [[The toolbar item state, or $null upon failure.]] 233 return: Elm.Toolbar_Item.State *; [[The toolbar item state, or $null upon failure.]]
221 } 234 }
222 state_del { 235 state_del {
223 [[Delete a previously added state to $item.]] 236 [[Delete a previously added state to $item.]]
224 params { 237 params {
225 @in state: Elm_Toolbar_Item_State *; [[The state to be deleted.]] 238 @in state: Elm.Toolbar_Item.State *; [[The state to be deleted.]]
226 } 239 }
227 return: bool; [[$true on success or $false on failure.]] 240 return: bool; [[$true on success or $false on failure.]]
228 } 241 }
@@ -232,7 +245,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
232 If last state is selected, this function will return first 245 If last state is selected, this function will return first
233 state. 246 state.
234 ]] 247 ]]
235 return: Elm_Toolbar_Item_State *; [[The state after current state, or $null on failure.]] 248 return: Elm.Toolbar_Item.State *; [[The state after current state, or $null on failure.]]
236 } 249 }
237 state_prev { 250 state_prev {
238 [[Get the state before selected state in toolbar's $item. 251 [[Get the state before selected state in toolbar's $item.
@@ -240,7 +253,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
240 If first state is selected, this function will return last 253 If first state is selected, this function will return last
241 state. 254 state.
242 ]] 255 ]]
243 return: Elm_Toolbar_Item_State *; [[The state before current state, or $null on failure.]] 256 return: Elm.Toolbar_Item.State *; [[The state before current state, or $null on failure.]]
244 } 257 }
245 show { 258 show {
246 [[Show a specific item, when the toolbar can be scrolled. 259 [[Show a specific item, when the toolbar can be scrolled.
diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index e9438fb61..51be6168a 100644
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -89,14 +89,6 @@ struct _Elm_Toolbar_Item_Data
89 Eina_Bool on_move : 1; 89 Eina_Bool on_move : 1;
90}; 90};
91 91
92struct _Elm_Toolbar_Item_State
93{
94 const char *label;
95 const char *icon_str;
96 Evas_Object *icon;
97 Evas_Smart_Cb func;
98 const void *data;
99};
100 92
101/** 93/**
102 * @} 94 * @}