free(it_state);
}
eina_stringshare_del(it->label);
+ if (it->label) edje_object_signal_emit(VIEW(it), "elm,state,text,hidden", "elm");
eina_stringshare_del(it->icon_str);
- if (it->icon) evas_object_del(it->icon);
+ if (it->icon)
+ {
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,hidden", "elm");
+ evas_object_del(it->icon);
+ }
if (it->object) evas_object_del(it->object);
//TODO: See if checking for wd->menu_parent is necessary before deleting menu
if (it->o_menu) evas_object_del(it->o_menu);
{
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));
evas_object_size_hint_min_set(it->icon, ms, ms);
evas_object_size_hint_max_set(it->icon, ms, ms);
edje_object_part_swallow(view, "elm.swallow.icon", it->icon);
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
+ }
+ if (it->label)
+ {
+ edje_object_part_text_escaped_set(view, "elm.text", it->label);
+ edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
}
- edje_object_part_text_escaped_set(view, "elm.text", it->label);
}
else
{
}
}
- 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
if (!wd) return;
_elm_widget_mirrored_reload(obj);
elm_smart_scroller_object_theme_set(obj, wd->scr, "toolbar", "base", elm_widget_style_get(obj));
+ elm_layout_theme_set(wd->more, "toolbar", "more", elm_widget_style_get(obj));
_mirrored_set(obj, elm_widget_mirrored_get(obj));
scale = (elm_widget_scale_get(obj) * _elm_config->scale);
edje_object_scale_set(wd->scr, scale);
Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it;
Evas_Object *obj = WIDGET(item);
Widget_Data *wd = elm_widget_data_get(obj);
-
+
edje_object_part_unswallow(VIEW(it), item->object);
elm_widget_sub_object_del(obj, item->object);
o = item->object;
evas_object_size_hint_min_set(it->icon, ms, ms);
evas_object_size_hint_max_set(it->icon, ms, ms);
edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon);
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
evas_object_show(it->icon);
elm_widget_sub_object_add(obj, it->icon);
}
- edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
+ if (it->label)
+ {
+ edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
+ edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+ }
edje_object_signal_emit(VIEW(it), "elm,state,moving", "elm");
edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
}
mw = mh = -1;
- elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+ 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)
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);
edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
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
{
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");
elm_widget_sub_object_del(VIEW(item), old_icon);
- evas_object_hide(old_icon);
+ /* edje_object_part_unswallow(VIEW(item), old_icon); */
edje_object_part_swallow(VIEW(item), "elm.swallow.icon", item->icon);
edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
+ evas_object_hide(old_icon);
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
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)
{
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