hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary: deprecate elm_toolbar_orientation_set and elm_toolbar_orientation_get to match and be conformant with the rest of api 

SVN revision: 64562
This commit is contained in:
Michael BOUCHAUD 2011-10-31 14:36:49 +00:00
parent aa437bbcf8
commit d57161465f
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/elementary/src/lib/Elementary.h.in
View File

@ -14341,7 +14341,8 @@ extern "C" {
ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimun 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_MENU, /**< Inserts a button to pop up a menu with exceeding items. */
ELM_TOOLBAR_SHRINK_LAST /**< Indicates error if returned by elm_toolbar_shrink_mode_get() */
} Elm_Toolbar_Shrink_Mode;
typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item; /**< Item of Elm_Toolbar. Sub-type of Elm_Widget_Item. Can be created with elm_toolbar_item_append(), elm_toolbar_item_prepend() and functions to add items in relative positions, like elm_toolbar_item_insert_before(), and deleted with elm_toolbar_item_del(). */
@ -15547,7 +15548,16 @@ extern "C" {
* By default, a toolbar will be horizontal. Use this function to create a vertical toolbar.
* @ingroup Toolbar
*/
EAPI void elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI void elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical) EINA_ARG_NONNULL(1);
/**
* Change a toolbar's orientation
* @param obj The toolbar object
* @param horizontal If @c EINA_TRUE, the toolbar is horizontal
* By default, a toolbar will be horizontal. Use this function to create a vertical toolbar.
* @ingroup Toolbar
*/
EAPI void elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) EINA_ARG_NONNULL(1);
/**
* Get a toolbar's orientation
@ -15556,8 +15566,16 @@ extern "C" {
* By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical.
* @ingroup Toolbar
*/
EAPI Eina_Bool elm_toolbar_orientation_get(Evas_Object *obj) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_orientation_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/**
* Get a toolbar's orientation
* @param obj The toolbar object
* @return If @c EINA_TRUE, the toolbar is horizontal
* By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical.
* @ingroup Toolbar
*/
EAPI Eina_Bool elm_toolbar_horizontal_get(const Evas_Object *obj);
/**
* @}
*/

37
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -407,18 +407,15 @@ _sizing_eval(Evas_Object *obj)
if ((!wd->vertical) && (w > minw)) minw = w;
evas_object_resize(wd->bx, minw, minh);
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
switch (wd->shrink_mode)
if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE)
{
case ELM_TOOLBAR_SHRINK_MENU: /* fallthrough */
case ELM_TOOLBAR_SHRINK_HIDE: /* fallthrough */
case ELM_TOOLBAR_SHRINK_SCROLL:
if (wd->vertical) minh = h - vh;
else minw = w - vw;
break;
case ELM_TOOLBAR_SHRINK_NONE:
if (wd->vertical) minh = minh_bx + (h - vh);
else minw = minw_bx + (w - vw);
break;
}
else
{
if (wd->vertical) minh = h - vh;
else minw = w - vw;
}
minh = minh + (h - vh);
evas_object_size_hint_min_set(obj, minw, minh);
@ -1931,21 +1928,35 @@ elm_toolbar_icon_order_lookup_get(const Evas_Object *obj)
return wd->lookup_order;
}
EAPI void
EINA_DEPRECATED EAPI void
elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical)
{
elm_toolbar_horizontal_set(obj, !vertical);
}
EINA_DEPRECATED EAPI Eina_Bool
elm_toolbar_orientation_get(const Evas_Object *obj)
{
return !elm_toolbar_horizontal_get(obj);
}
EAPI void
elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->vertical = vertical;
wd->vertical = !horizontal;
_sizing_eval(obj);
}
EAPI Eina_Bool
elm_toolbar_orientation_get(Evas_Object *obj)
elm_toolbar_horizontal_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
return wd->vertical;
return !wd->vertical;
}