In case a user sets min-value of the item, the toolbar shouldn't set the min-value to the number which is smaller than it.
SVN revision: 72788
This commit is contained in:
parent
38a2383e8a
commit
f4db8e4ec1
|
@ -344,7 +344,7 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
|
|||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *view = VIEW(it);
|
||||
Evas_Coord mw, mh;
|
||||
Evas_Coord mw, mh, minw, minh;
|
||||
const char *style = elm_widget_style_get(obj);
|
||||
|
||||
_mirrored_set_item(obj, it, elm_widget_mirrored_get(obj));
|
||||
|
@ -396,13 +396,19 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
|
|||
}
|
||||
}
|
||||
|
||||
mw = mh = -1;
|
||||
mw = mh = minw = minh = -1;
|
||||
if (!it->separator && !it->object)
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
edje_object_size_min_restricted_calc(view, &mw, &mh, mw, mh);
|
||||
if (!it->separator && !it->object)
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
evas_object_size_hint_min_set(view, mw, mh);
|
||||
evas_object_size_hint_min_get(view, &minw, &minh);
|
||||
if ((minw < mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(view, mw, mh);
|
||||
else if ((minw < mw) && (minh > mh))
|
||||
evas_object_size_hint_min_set(view, mw, minh);
|
||||
else if ((minw > mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(view, minw, mh);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1307,10 +1313,12 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
|
|||
elm_widget_sub_object_add(obj, it->icon);
|
||||
}
|
||||
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
|
||||
mw = mh = -1;
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
mw = mh = minw = minh = -1;
|
||||
if (!it->separator && !it->object)
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
if (!it->separator && !it->object)
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
|
||||
{
|
||||
if (wd->vertical)
|
||||
|
@ -1341,7 +1349,7 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
|
|||
static void
|
||||
_elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
|
||||
{
|
||||
Evas_Coord mw = -1, mh = -1;
|
||||
Evas_Coord mw = -1, mh = -1, minw = -1, minh = -1;
|
||||
Widget_Data *wd = elm_widget_data_get(WIDGET(item));
|
||||
edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
|
||||
|
||||
|
@ -1366,7 +1374,13 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
|
|||
evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
}
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
evas_object_size_hint_min_get(VIEW(item), &minw, &minh);
|
||||
if ((minw < mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
else if ((minw < mw) && (minh > mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, minh);
|
||||
else if ((minw > mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), minw, mh);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1406,7 +1420,7 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
|
|||
{
|
||||
Elm_Toolbar_Item_State *it_state;
|
||||
Eina_List *l;
|
||||
Evas_Coord mw = -1, mh = -1;
|
||||
Evas_Coord mw = -1, mh = -1, minw = -1, minh = -1;
|
||||
Widget_Data *wd = elm_widget_data_get(WIDGET(item));
|
||||
Evas_Object *old_icon = edje_object_part_swallow_get(VIEW(item),
|
||||
"elm.swallow.icon");
|
||||
|
@ -1434,7 +1448,13 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
|
|||
evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
}
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
evas_object_size_hint_min_get(VIEW(item), &minw, &minh);
|
||||
if ((minw < mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, mh);
|
||||
else if ((minw < mw) && (minh > mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), mw, minh);
|
||||
else if ((minw > mw) && (minh < mh))
|
||||
evas_object_size_hint_min_set(VIEW(item), minw, mh);
|
||||
|
||||
EINA_LIST_FOREACH(item->states, l, it_state)
|
||||
{
|
||||
|
@ -1956,6 +1976,7 @@ elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator)
|
|||
item->separator = separator;
|
||||
scale = (elm_widget_scale_get(obj) * _elm_config->scale);
|
||||
_theme_hook_item(obj, item, scale, wd->icon_size);
|
||||
evas_object_size_hint_min_set(VIEW(item), -1, -1);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
|
|
Loading…
Reference in New Issue