forked from enlightenment/efl
elm toolbar: Changed elm_toolbar_mode_shrink_set/get ->
elm_toolbar_shrink_mode_set/get. Also updated http://trac.enlightenment.org/e/wiki/ElementaryChanges SVN revision: 66927
This commit is contained in:
parent
8638957866
commit
31f21e31ec
|
@ -181,7 +181,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
|||
|
||||
toolbar = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(toolbar, 0);
|
||||
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
|
||||
elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
|
||||
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
|
||||
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(toolbar);
|
||||
|
@ -245,7 +245,7 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
|||
|
||||
toolbar = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(toolbar, 0);
|
||||
elm_toolbar_mode_shrink_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
|
||||
elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_NONE);
|
||||
evas_object_size_hint_weight_set(toolbar, EVAS_HINT_EXPAND, 0);
|
||||
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(toolbar);
|
||||
|
|
|
@ -86,7 +86,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
|
||||
|
@ -196,7 +196,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
|
||||
|
@ -306,7 +306,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_NONE);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_NONE);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
|
||||
|
@ -416,7 +416,7 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
|
||||
|
@ -526,7 +526,7 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_homogeneous_set(tb, 0);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
elm_toolbar_no_select_mode_set(tb, EINA_TRUE);
|
||||
|
@ -642,7 +642,7 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
|
|||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_horizontal_set(tb, EINA_FALSE);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
|
||||
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
|
|||
if (p->shrink_mode)
|
||||
{
|
||||
shrink_mode = _toolbar_shrink_choices_setting_get(p->shrink_mode);
|
||||
elm_toolbar_mode_shrink_set(obj, shrink_mode);
|
||||
elm_toolbar_shrink_mode_set(obj, shrink_mode);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -125,7 +125,7 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E
|
|||
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
|
||||
{
|
||||
shrink_mode = _toolbar_shrink_choices_setting_get(param->s);
|
||||
elm_toolbar_mode_shrink_set(obj, shrink_mode);
|
||||
elm_toolbar_shrink_mode_set(obj, shrink_mode);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -192,7 +192,7 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E
|
|||
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
|
||||
{
|
||||
Elm_Toolbar_Shrink_Mode shrink_mode;
|
||||
shrink_mode = elm_toolbar_mode_shrink_get(obj);
|
||||
shrink_mode = elm_toolbar_shrink_mode_get(obj);
|
||||
param->s = _toolbar_shrink_modes[shrink_mode];
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
|
|||
evas_object_show(bt);
|
||||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
evas_object_show(tb);
|
||||
|
|
|
@ -60,7 +60,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
|
|||
evas_object_show(bt);
|
||||
|
||||
tb = elm_toolbar_add(win);
|
||||
elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
|
||||
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_HIDE);
|
||||
evas_object_size_hint_weight_set(tb, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
|
||||
evas_object_show(tb);
|
||||
|
|
|
@ -572,7 +572,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
|
|||
elm_toolbar_align_set(tabs, 0.0);
|
||||
elm_toolbar_always_select_mode_set(tabs, EINA_TRUE);
|
||||
elm_toolbar_homogeneous_set(tabs, EINA_FALSE);
|
||||
elm_toolbar_mode_shrink_set(tabs, ELM_TOOLBAR_SHRINK_MENU);
|
||||
elm_toolbar_shrink_mode_set(tabs, ELM_TOOLBAR_SHRINK_MENU);
|
||||
evas_object_size_hint_weight_set(tabs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(tabs, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
elm_box_pack_end(box2, tabs);
|
||||
|
|
|
@ -2850,3 +2850,32 @@ EINA_DEPRECATED EAPI const char *elm_list_item_label_get(const
|
|||
*/
|
||||
EINA_DEPRECATED EAPI void elm_list_item_label_set(Elm_List_Item *item, const char *text);
|
||||
|
||||
/**
|
||||
* Set the shrink state of toolbar @p obj.
|
||||
*
|
||||
* @param obj The toolbar object.
|
||||
* @param shrink_mode Toolbar's items display behavior.
|
||||
*
|
||||
* The toolbar won't scroll if #ELM_TOOLBAR_SHRINK_NONE,
|
||||
* but will enforce a minimun size so all the items will fit, won't scroll
|
||||
* and won't show the items that don't fit if #ELM_TOOLBAR_SHRINK_HIDE,
|
||||
* will scroll if #ELM_TOOLBAR_SHRINK_SCROLL, and will create a button to
|
||||
* pop up excess elements with #ELM_TOOLBAR_SHRINK_MENU.
|
||||
*
|
||||
* @deprecated Please use elm_toolbar_shrink_mode_set(obj, shrink_mode);
|
||||
* @ingroup Toolbar
|
||||
*/
|
||||
EINA_DEPRECATED EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
|
||||
|
||||
/**
|
||||
* Get the shrink mode of toolbar @p obj.
|
||||
*
|
||||
* @param obj The toolbar object.
|
||||
* @return Toolbar's items display behavior.
|
||||
*
|
||||
* @see elm_toolbar_shrink_mode_set() for details.
|
||||
*
|
||||
* @deprecated Please use elm_toolbar_shrink_mode_get(obj);
|
||||
* @ingroup Toolbar
|
||||
*/
|
||||
EINA_DEPRECATED EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj);
|
||||
|
|
|
@ -1074,7 +1074,7 @@ elm_toolbar_add(Evas_Object *parent)
|
|||
elm_smart_scroller_child_set(wd->scr, wd->bx);
|
||||
evas_object_show(wd->bx);
|
||||
|
||||
elm_toolbar_mode_shrink_set(obj, _elm_config->toolbar_shrink_mode);
|
||||
elm_toolbar_shrink_mode_set(obj, _elm_config->toolbar_shrink_mode);
|
||||
evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, _resize, obj);
|
||||
evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _resize, obj);
|
||||
elm_toolbar_icon_order_lookup_set(obj, ELM_ICON_LOOKUP_THEME_FDO);
|
||||
|
@ -1509,7 +1509,7 @@ elm_toolbar_item_separator_get(const Elm_Object_Item *it)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode)
|
||||
elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode)
|
||||
{
|
||||
ELM_CHECK_WIDTYPE(obj, widtype);
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
@ -1544,7 +1544,7 @@ elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mod
|
|||
}
|
||||
|
||||
EAPI Elm_Toolbar_Shrink_Mode
|
||||
elm_toolbar_mode_shrink_get(const Evas_Object *obj)
|
||||
elm_toolbar_shrink_mode_get(const Evas_Object *obj)
|
||||
{
|
||||
ELM_CHECK_WIDTYPE(obj, widtype) ELM_TOOLBAR_SHRINK_NONE;
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
@ -2036,3 +2036,15 @@ elm_toolbar_items_count(const Evas_Object *obj)
|
|||
if (!wd) return 0;
|
||||
return wd->item_count;
|
||||
}
|
||||
|
||||
EINA_DEPRECATED EAPI void
|
||||
elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode)
|
||||
{
|
||||
elm_toolbar_shrink_mode_set(obj, shrink_mode);
|
||||
}
|
||||
|
||||
EINA_DEPRECATED EAPI Elm_Toolbar_Shrink_Mode
|
||||
elm_toolbar_mode_shrink_get(const Evas_Object *obj)
|
||||
{
|
||||
return elm_toolbar_shrink_mode_get(obj);
|
||||
}
|
||||
|
|
|
@ -57,8 +57,8 @@
|
|||
*
|
||||
* Values <b> don't </b> work as bitmask, only one can be choosen.
|
||||
*
|
||||
* @see elm_toolbar_mode_shrink_set()
|
||||
* @see elm_toolbar_mode_shrink_get()
|
||||
* @see elm_toolbar_shrink_mode_set()
|
||||
* @see elm_toolbar_shrink_mode_get()
|
||||
*
|
||||
* @ingroup Toolbar
|
||||
*/
|
||||
|
@ -644,7 +644,7 @@ EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Objec
|
|||
*
|
||||
* @ingroup Toolbar
|
||||
*/
|
||||
EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
|
||||
EAPI void elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
|
||||
|
||||
/**
|
||||
* Get the shrink mode of toolbar @p obj.
|
||||
|
@ -652,11 +652,11 @@ EAPI void elm_toolbar_mode_shrink_set(Evas_Object *obj,
|
|||
* @param obj The toolbar object.
|
||||
* @return Toolbar's items display behavior.
|
||||
*
|
||||
* @see elm_toolbar_mode_shrink_set() for details.
|
||||
* @see elm_toolbar_shrink_mode_set() for details.
|
||||
*
|
||||
* @ingroup Toolbar
|
||||
*/
|
||||
EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj);
|
||||
EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_shrink_mode_get(const Evas_Object *obj);
|
||||
|
||||
/**
|
||||
* Enable/disable homogeneous mode.
|
||||
|
|
Loading…
Reference in New Issue