#include "els_icon.h"
typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
struct _Widget_Data
{
- Evas_Object *scr, *bx;
+ Evas_Object *scr, *bx, *more, *bx_more, *bx_more2;
Evas_Object *menu_parent;
Eina_Inlist *items;
Elm_Toolbar_Item *more_item, *selected_item;
Elm_Toolbar_Shrink_Mode shrink_mode;
Elm_Icon_Lookup_Order lookup_order;
int icon_size;
+ unsigned int item_count;
+ unsigned int item_max;
double align;
+ Elm_Object_Select_Mode select_mode;
Eina_Bool homogeneous : 1;
- Eina_Bool no_select : 1;
- Eina_Bool always_select : 1;
Eina_Bool vertical : 1;
Eina_Bool long_press : 1;
Ecore_Timer *long_timer;
const char *label;
const char *icon_str;
Evas_Object *icon;
+ Evas_Object *object;
Evas_Object *o_menu;
+ Evas_Object *in_box;
Evas_Smart_Cb func;
- struct {
- int priority;
- Eina_Bool visible : 1;
- } prio;
+ struct
+ {
+ int priority;
+ Eina_Bool visible : 1;
+ } prio;
Eina_Bool selected : 1;
- Eina_Bool disabled : 1;
Eina_Bool separator : 1;
Eina_Bool menu : 1;
Eina_List *states;
static void _item_show(Elm_Toolbar_Item *it);
static void _item_select(Elm_Toolbar_Item *it);
static void _item_unselect(Elm_Toolbar_Item *it);
-static void _item_disable(Elm_Toolbar_Item *it, Eina_Bool disabled);
static void _del_pre_hook(Evas_Object *obj);
static void _del_hook(Evas_Object *obj);
static void _mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
static void _menu_move_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _menu_hide(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-static void _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *signal);
-static void _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *signal);
+static void _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *sig);
+static void _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig);
static const char SIG_CLICKED[] = "clicked";
static const char SIG_LONGPRESSED[] = "longpressed";
{NULL, NULL}
};
+static void
+_item_disable_hook(Elm_Object_Item *it)
+{
+ Widget_Data *wd;
+ Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *)it;
+
+ wd = elm_widget_data_get(WIDGET(toolbar_it));
+ if (!wd) return;
+
+ if (elm_widget_item_disabled_get(toolbar_it))
+ {
+ edje_object_signal_emit(VIEW(toolbar_it), "elm,state,disabled", "elm");
+ elm_widget_signal_emit(toolbar_it->icon, "elm,state,disabled", "elm");
+ }
+ else
+ {
+ edje_object_signal_emit(VIEW(toolbar_it), "elm,state,enabled", "elm");
+ elm_widget_signal_emit(toolbar_it->icon, "elm,state,enabled", "elm");
+ }
+ _resize(WIDGET(toolbar_it), NULL, NULL, NULL);
+}
static Eina_Bool
_item_icon_set(Evas_Object *icon_obj, const char *type, const char *icon)
Widget_Data *wd = elm_widget_data_get(WIDGET(it));
Evas_Object *obj2;
Eina_Bool sel;
+ Evas_Coord w, h;
if (!wd) return;
- if ((it->disabled) || (it->separator)) return;
+ if (elm_widget_item_disabled_get(it) || (it->separator) || (it->object)) return;
sel = it->selected;
- if (!wd->no_select)
+ evas_object_geometry_get(it->object, NULL, NULL, &w, &h);
+
+ if (wd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)
{
if (sel)
{
- if (wd->always_select) return;
- _item_unselect(it);
+ if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
+ if (wd->more_item == it)
+ {
+ edje_object_signal_emit(elm_layout_edje_get(wd->more), "elm,state,close", "elm");
+ _item_unselect(it);
+ }
+ if (wd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS)
+ _item_unselect(it);
}
else
{
- it2 = elm_toolbar_selected_item_get(WIDGET(it));
+ it2 = (Elm_Toolbar_Item *)
+ elm_toolbar_selected_item_get(WIDGET(it));
_item_unselect(it2);
it->selected = EINA_TRUE;
wd->selected_item = it;
+ if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ if (wd->more_item == it)
+ {
+ if (!evas_object_box_children_get(wd->bx_more2))
+ edje_object_signal_emit(elm_layout_edje_get(wd->more), "elm,state,open", "elm");
+ else
+ edje_object_signal_emit(elm_layout_edje_get(wd->more), "elm,state,open2", "elm");
+ }
+ else
+ {
+ if (it->in_box != wd->bx)
+ {
+ edje_object_signal_emit(wd->VIEW(more_item), "elm,state,selected", "elm");
+ elm_widget_signal_emit(wd->more_item->icon, "elm,state,selected", "elm");
+ }
+ else
+ {
+ edje_object_signal_emit(wd->VIEW(more_item), "elm,state,unselected", "elm");
+ elm_widget_signal_emit(wd->more_item->icon, "elm,state,unselected", "elm");
+ }
+ edje_object_signal_emit(elm_layout_edje_get(wd->more), "elm,state,close", "elm");
+ }
+ }
edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
_item_show(it);
{
Elm_Toolbar_Item *selected;
Elm_Toolbar_Item *it = data;
- selected = elm_toolbar_selected_item_get(WIDGET(it));
+ selected = (Elm_Toolbar_Item *) elm_toolbar_selected_item_get(WIDGET(it));
_item_unselect(selected);
}
}
static void
-_item_disable(Elm_Toolbar_Item *it, Eina_Bool disabled)
-{
- Widget_Data *wd = elm_widget_data_get(WIDGET(it));
-
- if (!wd) return;
- if (it->disabled == disabled) return;
- it->disabled = !!disabled;
- if (it->disabled)
- {
- edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
- elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
- }
- else
- {
- edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
- elm_widget_signal_emit(it->icon, "elm,state,enabled", "elm");
- }
-}
-
-static void
_item_del(Elm_Toolbar_Item *it)
{
Elm_Toolbar_Item_State *it_state;
_item_unselect(it);
- elm_widget_item_pre_notify_del(it);
EINA_LIST_FREE(it->states, it_state)
{
if (it->icon == it_state->icon)
eina_stringshare_del(it->label);
eina_stringshare_del(it->icon_str);
if (it->icon) 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);
- elm_widget_item_del(it);
}
static void
if (!wd) return;
it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
- while(it)
+ while (it)
{
next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
_item_del(it);
+ elm_widget_item_free(it);
it = next;
}
if (wd->more_item)
- _item_del(wd->more_item);
+ {
+ _item_del(wd->more_item);
+ elm_widget_item_free(wd->more_item);
+ }
if (wd->long_timer)
{
ecore_timer_del(wd->long_timer);
static void
_theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_size)
{
+ Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *view = VIEW(it);
Evas_Coord mw, mh;
const char *style = elm_widget_style_get(obj);
_mirrored_set_item(obj, it, elm_widget_mirrored_get(obj));
edje_object_scale_set(view, scale);
- if (!it->separator)
+ if (!it->separator && !it->object)
{
_elm_theme_object_set(obj, view, "toolbar", "item", style);
if (it->selected)
edje_object_signal_emit(view, "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
}
- if (it->disabled)
+ if (elm_widget_item_disabled_get(it))
{
edje_object_signal_emit(view, "elm,state,disabled", "elm");
elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
ms = ((double)icon_size * scale);
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_part_swallow(view, "elm.swallow.icon", it->icon);
}
- edje_object_part_text_set(view, "elm.text", it->label);
+ edje_object_part_text_escaped_set(view, "elm.text", it->label);
}
else
- _elm_theme_object_set(obj, view, "toolbar", "separator", style);
+ {
+ if (!it->object)
+ {
+ _elm_theme_object_set(obj, view, "toolbar", "separator", style);
+ if (wd->vertical)
+ {
+ evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0);
+ evas_object_size_hint_align_set(view, EVAS_HINT_FILL, 0.5);
+ }
+ else
+ {
+ evas_object_size_hint_weight_set(view, -1.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(view, 0.5, EVAS_HINT_FILL);
+ }
+ }
+ else
+ {
+ _elm_theme_object_set(obj, view, "toolbar", "object", style);
+ edje_object_part_swallow(view, "elm.swallow.object", it->object);
+ }
+ }
mw = mh = -1;
- if (!it->separator)
+ 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)
+ if (!it->separator && !it->object)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
evas_object_size_hint_min_set(view, mw, mh);
}
}
static void
+_item_text_set_hook(Elm_Object_Item *it,
+ const char *part,
+ const char *label)
+{
+ if (part && strcmp(part, "default")) return;
+ _item_label_set(((Elm_Toolbar_Item *)it), label, "elm,state,label_set");
+}
+
+static const char *
+_item_text_get_hook(const Elm_Object_Item *it, const char *part)
+{
+ if (part && strcmp(part, "default")) return NULL;
+ return ((Elm_Toolbar_Item *)it)->label;
+}
+
+static void
+_item_content_set_hook(Elm_Object_Item *it,
+ const char *part,
+ Evas_Object *content)
+{
+ double scale;
+
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ if (part && strcmp(part, "object")) return;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it;
+ Evas_Object *obj = WIDGET(item);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd || !obj) return;
+ if (item->object == content) return;
+
+ if (item->object) evas_object_del(item->object);
+
+ item->object = content;
+ if (item->object)
+ elm_widget_sub_object_add(obj, item->object);
+ scale = (elm_widget_scale_get(obj) * _elm_config->scale);
+ _theme_hook_item(obj, item, scale, wd->icon_size);
+}
+
+static Evas_Object *
+_item_content_get_hook(const Elm_Object_Item *it, const char *part)
+{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ if (part && strcmp(part, "object")) return NULL;
+ return ((Elm_Toolbar_Item *) it)->object;
+}
+
+static Evas_Object *
+_item_content_unset_hook(Elm_Object_Item *it, const char *part)
+{
+ Evas_Object *o;
+ double scale;
+
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ if (part && strcmp(part, "object")) return NULL;
+ 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;
+ item->object = NULL;
+ scale = (elm_widget_scale_get(obj) * _elm_config->scale);
+ _theme_hook_item(obj, item, scale, wd->icon_size);
+ return o;
+}
+
+static void
_translate_hook(Evas_Object *obj)
{
evas_object_smart_callback_call(obj, "language,changed", NULL);
_sizing_eval(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
- Evas_Coord minw = -1, minh = -1, minw_bx, minh_bx;
+ Evas_Coord minw = -1, minh = -1, minw_bx = -1, minh_bx = -1;
Evas_Coord vw = 0, vh = 0;
Evas_Coord w, h;
if (!wd) return;
+ evas_object_smart_need_recalculate_set(wd->bx, EINA_TRUE);
evas_object_smart_calculate(wd->bx);
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr),
&minw, &minh);
if (h < minh) h = minh;
evas_object_resize(wd->scr, w, h);
- evas_object_size_hint_min_get(wd->bx, &minw, &minh);
- minw_bx = minw;
- minh_bx = minh;
- if (wd->vertical && (h > minh)) minh = h;
- if ((!wd->vertical) && (w > minw)) minw = w;
- evas_object_resize(wd->bx, minw, minh);
+ evas_object_size_hint_min_get(wd->bx, &minw_bx, &minh_bx);
+// if (wd->vertical && (h > minh)) minh = h;
+// if ((!wd->vertical) && (w > minw)) minw = w;
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE)
{
- if (wd->vertical) minh = minh_bx + (h - vh);
- else minw = minw_bx + (w - vw);
+ if (wd->vertical)
+ {
+ minw = minw_bx + (w - vw);
+ minh = minh_bx + (h - vh);
+ }
+ else
+ {
+ minw = minw_bx + (w - vw);
+ minh = minh_bx + (h - vh);
+ }
+ }
+ else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ minw = minw_bx + (w - vw);
+ minh = minh_bx + (h - vh);
+ if (minw_bx < vw) minw_bx = vw;
+ if (minh_bx < vh) minh_bx = vh;
}
else
{
- if (wd->vertical) minh = h - vh;
- else minw = w - vw;
+ if (wd->vertical)
+ {
+ minw = minw_bx + (w - vw);
+ minh = h - vh;
+ }
+ else
+ {
+ minw = w - vw;
+ minh = minh_bx + (h - vh);
+ }
+// if (wd->vertical) minh = h - vh;
+// else minw = w - vw;
+// minh = minh + (h - vh);
}
- minh = minh + (h - vh);
+ evas_object_resize(wd->bx, minw_bx, minh_bx);
+ evas_object_resize(wd->more, w, h);
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, -1, -1);
}
if (!eti2) return 1;
if (!eti1) return -1;
+ if (eti2->prio.priority == eti1->prio.priority)
+ return -1;
+
return eti2->prio.priority - eti1->prio.priority;
}
static void
_fix_items_visibility(Widget_Data *wd, Evas_Coord *iw, Evas_Coord vw)
{
- Elm_Toolbar_Item *it;
+ Elm_Toolbar_Item *it, *prev;
Eina_List *sorted = NULL;
- Evas_Coord ciw;
+ Evas_Coord ciw = 0, cih = 0;
EINA_INLIST_FOREACH(wd->items, it)
{
if (wd->more_item)
{
- evas_object_geometry_get(wd->VIEW(more_item), NULL, NULL, &ciw, NULL);
- *iw += ciw;
+ evas_object_geometry_get(wd->VIEW(more_item), NULL, NULL, &ciw, &cih);
+ if (wd->vertical) *iw += cih;
+ else *iw += ciw;
+ }
+ EINA_LIST_FREE(sorted, it)
+ {
+ evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, &cih);
+ if (wd->vertical) *iw += cih;
+ else *iw += ciw;
+ if (!it->separator)
+ it->prio.visible = (*iw <= vw);
+ else
+ {
+ prev = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ it->prio.visible = prev->prio.visible;
+ }
+ }
+}
+
+static void
+_fix_items_visibility_by_number(Widget_Data *wd, unsigned int *count)
+{
+ Elm_Toolbar_Item *it, *prev, *next, *max = NULL;
+ Eina_List *sorted = NULL;
+ *count = 0;
+
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ if (it->separator)
+ {
+ prev = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ it->prio.priority = prev->prio.priority;
+ }
+ }
+
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ sorted = eina_list_sorted_insert(sorted,
+ _toolbar_item_prio_compare_cb, it);
}
+
EINA_LIST_FREE(sorted, it)
{
- evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, NULL);
- *iw += ciw;
- it->prio.visible = (*iw <= vw);
+ *count += 1;
+ if(*count <= wd->item_max)
+ {
+ it->prio.visible = EINA_TRUE;
+ it->in_box = wd->bx;
+ if (*count == wd->item_max)
+ max = it;
+ }
+ else
+ {
+ it->prio.visible = EINA_FALSE;
+ if (wd->item_count < (wd->item_max * 2) ||
+ *count <= (wd->item_count + wd->item_max) / 2)
+ it->in_box = wd->bx_more;
+ else
+ it->in_box = wd->bx_more2;
+
+ if (max)
+ {
+ max->prio.visible = EINA_FALSE;
+ max->in_box = wd->bx_more;
+ next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(max)->next);
+ if (next && next->separator)
+ {
+ next->prio.visible = max->prio.visible;
+ next->in_box = max->in_box;
+ }
+ max = NULL;
+ }
+ }
}
}
static void
_resize_job(void *data)
{
- Widget_Data *wd = elm_widget_data_get(data);
- Evas_Coord mw, mh, vw, vh, w, h;
+ Evas_Object *obj = (Evas_Object *)data;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ Evas_Coord mw, mh, vw = 0, vh = 0, w = 0, h = 0;
Elm_Toolbar_Item *it;
- Evas_Object *obj = (Evas_Object *) data;
+ Eina_List *list;
if (!wd) return;
wd->resize_job = NULL;
evas_object_geometry_get(wd->bx, NULL, NULL, &w, &h);
if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
{
- Evas_Coord iw = 0, more_w;
+ Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0;
- evas_object_resize(wd->bx, vw, h);
- _fix_items_visibility(wd, &iw, vw);
- evas_object_geometry_get(wd->VIEW(more_item), NULL, NULL, &more_w, NULL);
- if (iw - more_w <= vw)
- iw -= more_w;
+ if (wd->vertical)
+ {
+ evas_object_resize(wd->bx, w, vh);
+ _fix_items_visibility(wd, &ih, vh);
+ }
+ else
+ {
+ evas_object_resize(wd->bx, vw, h);
+ _fix_items_visibility(wd, &iw, vw);
+ }
+ evas_object_geometry_get(wd->VIEW(more_item), NULL, NULL,
+ &more_w, &more_h);
+ if (wd->vertical)
+ {
+ if ((ih - more_h) <= vh) ih -= more_h;
+ }
+ else
+ {
+ if ((iw - more_w) <= vw) iw -= more_w;
+ }
/* All items are removed from the box object, since removing individual
* items won't trigger a resize. Items are be readded below. */
evas_object_box_remove_all(wd->bx, EINA_FALSE);
- if (iw > vw)
+ if (((wd->vertical) && (ih > vh)) ||
+ ((!wd->vertical) && (iw > vw)))
{
Evas_Object *menu;
_item_menu_destroy(wd->more_item);
_item_menu_create(wd, wd->more_item);
- menu = elm_toolbar_item_menu_get(wd->more_item);
-
+ menu = elm_toolbar_item_menu_get((Elm_Object_Item *)wd->more_item);
EINA_INLIST_FOREACH(wd->items, it)
{
if (!it->prio.visible)
else
{
Elm_Object_Item *menu_it;
- menu_it = elm_menu_item_add(menu, NULL,
- it->icon_str, it->label,
- _elm_toolbar_item_menu_cb, it);
- elm_object_item_disabled_set(menu_it, it->disabled);
+ menu_it = elm_menu_item_add
+ (menu, NULL, it->icon_str, it->label,
+ _elm_toolbar_item_menu_cb, it);
+ elm_object_item_disabled_set
+ (menu_it, elm_widget_item_disabled_get(it));
if (it->o_menu)
elm_menu_clone(it->o_menu, menu, menu_it);
}
evas_object_show(VIEW(it));
}
}
-
evas_object_box_append(wd->bx, wd->VIEW(more_item));
evas_object_show(wd->VIEW(more_item));
}
}
else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
{
- Evas_Coord iw = 0;
+ Evas_Coord iw = 0, ih = 0;
- evas_object_resize(wd->bx, vw, h);
- _fix_items_visibility(wd, &iw, vw);
+ if (wd->vertical)
+ {
+ evas_object_resize(wd->bx, w, vh);
+ _fix_items_visibility(wd, &ih, vh);
+ }
+ else
+ {
+ evas_object_resize(wd->bx, vw, h);
+ _fix_items_visibility(wd, &iw, vw);
+ }
evas_object_box_remove_all(wd->bx, EINA_FALSE);
- if (iw > vw)
+ if (((wd->vertical) && (ih > vh)) ||
+ ((!wd->vertical) && (iw > vw)))
{
EINA_INLIST_FOREACH(wd->items, it)
{
}
}
}
+ else if (wd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ unsigned int count;
+ if ((vw >= mw) && (vh >= mh))
+ evas_object_resize(wd->bx, vw, vh);
+ else if (vw < mw)
+ evas_object_resize(wd->bx, mw, vh);
+ else if (vh < mh)
+ evas_object_resize(wd->bx, vw, mh);
+ _fix_items_visibility_by_number(wd, &count);
+
+ evas_object_box_remove_all(wd->bx, EINA_FALSE);
+ evas_object_box_remove_all(wd->bx_more, EINA_FALSE);
+ evas_object_box_remove_all(wd->bx_more2, EINA_FALSE);
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ if (it->in_box)
+ {
+ evas_object_box_append(it->in_box, VIEW(it));
+ evas_object_show(VIEW(it));
+ }
+ }
+ if (count > wd->item_max)
+ {
+ evas_object_box_append(wd->bx, wd->VIEW(more_item));
+ evas_object_show(wd->VIEW(more_item));
+ }
+ else
+ evas_object_hide(wd->VIEW(more_item));
+ }
else
{
- if ((vw >= mw) && (w != vw)) evas_object_resize(wd->bx, vw, h);
+ if (wd->vertical)
+ {
+ if ((vh >= mh) && (h != vh)) evas_object_resize(wd->bx, w, vh);
+ }
+ else
+ {
+ if ((vw >= mw) && (w != vw)) evas_object_resize(wd->bx, vw, h);
+ }
EINA_INLIST_FOREACH(wd->items, it)
{
if (it->selected)
}
}
+ // Remove the first or last separator since it is not neccessary
+ list = evas_object_box_children_get(wd->bx_more);
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ if (it->separator && ((VIEW(it) == eina_list_data_get(list)) ||
+ (VIEW(it) == eina_list_nth(list, eina_list_count(list)-1))))
+ {
+ evas_object_box_remove(wd->bx_more, VIEW(it));
+ evas_object_hide(VIEW(it));
+ }
+ }
+ list = evas_object_box_children_get(wd->bx_more2);
+ EINA_INLIST_FOREACH(wd->items, it)
+ {
+ if (it->separator && ((VIEW(it) == eina_list_data_get(list)) ||
+ (VIEW(it) == eina_list_nth(list, eina_list_count(list)-1))))
+ {
+ evas_object_box_remove(wd->bx_more2, VIEW(it));
+ evas_object_hide(VIEW(it));
+ }
+ }
+
_mirrored_set(obj, elm_widget_mirrored_get(obj));
}
_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Evas_Coord x, y, h;
+ evas_object_geometry_get(data, &x, &y, NULL, &h);
+ evas_object_move(wd->more, x, y + h);
if (!wd->resize_job)
wd->resize_job = ecore_job_add(_resize_job, data);
}
static void
+_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ Evas_Coord x, y, h;
+ evas_object_geometry_get(data, &x, &y, NULL, &h);
+ evas_object_move(wd->more, x, y + h);
+}
+
+static void
_select_filter(Elm_Toolbar_Item *it, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
{
int button;
Evas_Object *obj = (Evas_Object *) data;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- _els_box_layout(o, priv, !wd->vertical, wd->homogeneous, elm_widget_mirrored_get(obj));
+ _els_box_layout(o, priv, !wd->vertical, wd->homogeneous,
+ elm_widget_mirrored_get(obj));
}
static char *
Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item;
if (it->separator)
return strdup(E_("Separator"));
- else if (it->disabled)
+ else if (elm_widget_item_disabled_get(it))
return strdup(E_("State: Disabled"));
else if (it->selected)
return strdup(E_("State: Selected"));
return NULL;
}
+static Eina_Bool
+_item_del_pre_hook(Elm_Object_Item *it)
+{
+ Widget_Data *wd;
+ Evas_Object *obj2;
+ Elm_Toolbar_Item *item, *next;
+ item = (Elm_Toolbar_Item *)it;
+
+ wd = elm_widget_data_get(WIDGET(item));
+ if (!wd) return EINA_FALSE;
+
+ obj2 = WIDGET(item);
+ next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
+ wd->items = eina_inlist_remove(wd->items, EINA_INLIST_GET(item));
+ wd->item_count--;
+ if (!next) next = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
+ if ((wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) &&
+ item->selected && next) _item_select(next);
+ _item_del(item);
+ _theme_hook(obj2);
+
+ return EINA_TRUE;
+}
+
static Elm_Toolbar_Item *
_item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
evas_object_del(icon_obj);
return NULL;
}
+
+ elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
+ elm_widget_item_disable_hook_set(it, _item_disable_hook);
+ elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
+ elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
+ elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
+ elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
+ elm_widget_item_content_unset_hook_set(it, _item_content_unset_hook);
+
it->label = eina_stringshare_add(label);
it->prio.visible = 1;
it->prio.priority = 0;
it->func = func;
it->separator = EINA_FALSE;
+ it->object = NULL;
it->base.data = data;
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
_elm_access_item_register(&it->base, VIEW(it));
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_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");
+ }
mw = mh = -1;
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 (wd->vertical)
+ if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
{
- evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, -1.0);
- evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, 0.5);
+ if (wd->vertical)
+ {
+ evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, -1.0);
+ evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, 0.5);
+ }
+ else
+ {
+ evas_object_size_hint_weight_set(VIEW(it), -1.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(VIEW(it), 0.5, EVAS_HINT_FILL);
+ }
}
else
{
- evas_object_size_hint_weight_set(VIEW(it), -1.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(VIEW(it), 0.5, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(VIEW(it), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
}
evas_object_size_hint_min_set(VIEW(it), mw, mh);
+ evas_object_size_hint_max_set(VIEW(it), -1, -1);
evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_RESIZE,
_resize_item, obj);
- if ((!wd->items) && wd->always_select) _item_select(it);
+ if ((!wd->items) && (wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS))
+ _item_select(it);
return it;
}
-EAPI Evas_Object *
-elm_toolbar_add(Evas_Object *parent)
+static void
+_elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
{
- Evas_Object *obj;
- Evas *e;
- Widget_Data *wd;
-
- ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
+ Evas_Coord mw = -1, mh = -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");
- ELM_SET_WIDTYPE(widtype, "toolbar");
- elm_widget_type_set(obj, "toolbar");
- elm_widget_sub_object_add(parent, obj);
- elm_widget_data_set(obj, wd);
- elm_widget_del_pre_hook_set(obj, _del_pre_hook);
- elm_widget_del_hook_set(obj, _del_hook);
- elm_widget_theme_hook_set(obj, _theme_hook);
- elm_widget_translate_hook_set(obj, _translate_hook);
- elm_widget_can_focus_set(obj, EINA_FALSE);
+ 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);
+ if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ if (wd->vertical)
+ {
+ evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
+ evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, 0.5);
+ }
+ else
+ {
+ evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL);
+ }
+ }
+ else
+ {
+ 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);
+}
- wd->more_item = NULL;
- wd->selected_item = NULL;
- wd->scr = elm_smart_scroller_add(e);
- elm_smart_scroller_widget_set(wd->scr, obj);
+static void
+_elm_toolbar_item_label_set_cb (void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+ Elm_Toolbar_Item *item = data;
+ _elm_toolbar_item_label_update(item);
+ edje_object_signal_callback_del(obj, emission, source,
+ _elm_toolbar_item_label_set_cb);
+ edje_object_signal_emit (VIEW(item), "elm,state,label,reset", "elm");
+}
+
+static void
+_item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig)
+{
+ const char *s;
+
+ if ((label) && (item->label) && (!strcmp(label, item->label))) return;
+
+ eina_stringshare_replace(&item->label, label);
+ s = edje_object_data_get(VIEW(item), "transition_animation_on");
+ if ((s) && (atoi(s)))
+ {
+ edje_object_part_text_escaped_set(VIEW(item), "elm.text_new", item->label);
+ edje_object_signal_emit (VIEW(item), sig, "elm");
+ edje_object_signal_callback_add(VIEW(item),
+ "elm,state,label_set,done", "elm",
+ _elm_toolbar_item_label_set_cb, item);
+ }
+ else
+ _elm_toolbar_item_label_update(item);
+ _resize(WIDGET(item), NULL, NULL, NULL);
+}
+
+static void
+_elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
+{
+ Elm_Toolbar_Item_State *it_state;
+ Eina_List *l;
+ Evas_Coord mw = -1, mh = -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_swallow(VIEW(item), "elm.swallow.icon", item->icon);
+ edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
+ 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);
+ if (wd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ if (wd->vertical)
+ {
+ evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
+ evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, 0.5);
+ }
+ else
+ {
+ evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL);
+ }
+ }
+ else
+ {
+ 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);
+
+ EINA_LIST_FOREACH(item->states, l, it_state)
+ {
+ if (it_state->icon == old_icon) return;
+ }
+ evas_object_del(old_icon);
+}
+
+static void
+_elm_toolbar_item_icon_set_cb (void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+ Elm_Toolbar_Item *item = data;
+ edje_object_part_unswallow(VIEW(item), item->icon);
+ _elm_toolbar_item_icon_update(item);
+ edje_object_signal_callback_del(obj, emission, source,
+ _elm_toolbar_item_icon_set_cb);
+ edje_object_signal_emit (VIEW(item), "elm,state,icon,reset", "elm");
+}
+
+static void
+_elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *sig)
+{
+ Evas_Object *old_icon;
+ int ms = 0;
+ const char *s;
+
+ if (icon_str)
+ eina_stringshare_replace(&item->icon_str, icon_str);
+ else
+ {
+ eina_stringshare_del(item->icon_str);
+ item->icon_str = NULL;
+ }
+ item->icon = icon_obj;
+ if (icon_obj)
+ {
+ ms = (icon_size * _elm_config->scale);
+ evas_object_size_hint_min_set(item->icon, ms, ms);
+ evas_object_size_hint_max_set(item->icon, ms, ms);
+ evas_object_show(item->icon);
+ elm_widget_sub_object_add(obj, item->icon);
+ }
+ s = edje_object_data_get(VIEW(item), "transition_animation_on");
+ if ((s) && (atoi(s)))
+ {
+ old_icon = edje_object_part_swallow_get(VIEW(item),
+ "elm.swallow.icon_new");
+ if (old_icon)
+ {
+ elm_widget_sub_object_del(VIEW(item), old_icon);
+ evas_object_hide(old_icon);
+ }
+ edje_object_part_swallow(VIEW(item), "elm.swallow.icon_new",
+ item->icon);
+ edje_object_signal_emit (VIEW(item), sig, "elm");
+ edje_object_signal_callback_add(VIEW(item),
+ "elm,state,icon_set,done", "elm",
+ _elm_toolbar_item_icon_set_cb, item);
+ }
+ else
+ _elm_toolbar_item_icon_update(item);
+ _resize(obj, NULL, NULL, NULL);
+}
+
+static void
+_elm_toolbar_item_state_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+ Elm_Toolbar_Item *it = event_info;
+ Elm_Toolbar_Item_State *it_state;
+
+ it_state = eina_list_data_get(it->current_state);
+ if (it_state->func)
+ it_state->func((void *)it_state->data, obj, event_info);
+}
+
+static Elm_Toolbar_Item_State *
+_item_state_new(const char *label, const char *icon_str, Evas_Object *icon, Evas_Smart_Cb func, const void *data)
+{
+ Elm_Toolbar_Item_State *it_state;
+ it_state = ELM_NEW(Elm_Toolbar_Item_State);
+ it_state->label = eina_stringshare_add(label);
+ it_state->icon_str = eina_stringshare_add(icon_str);
+ it_state->icon = icon;
+ it_state->func = func;
+ it_state->data = data;
+ return it_state;
+}
+
+EAPI Evas_Object *
+elm_toolbar_add(Evas_Object *parent)
+{
+ Evas_Object *obj;
+ Evas *e;
+ Widget_Data *wd;
+
+ ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
+
+ ELM_SET_WIDTYPE(widtype, "toolbar");
+ elm_widget_type_set(obj, "toolbar");
+ elm_widget_sub_object_add(parent, obj);
+ elm_widget_data_set(obj, wd);
+ elm_widget_del_pre_hook_set(obj, _del_pre_hook);
+ elm_widget_del_hook_set(obj, _del_hook);
+ elm_widget_theme_hook_set(obj, _theme_hook);
+ elm_widget_translate_hook_set(obj, _translate_hook);
+ elm_widget_can_focus_set(obj, EINA_TRUE);
+
+ wd->more_item = NULL;
+ wd->selected_item = NULL;
+ wd->item_max = 9999;
+ wd->scr = elm_smart_scroller_add(e);
+ elm_smart_scroller_widget_set(wd->scr, obj);
elm_smart_scroller_object_theme_set(obj, wd->scr, "toolbar", "base", "default");
elm_smart_scroller_bounce_allow_set(wd->scr,
_elm_config->thumbscroll_bounce_enable,
ELM_SMART_SCROLLER_POLICY_AUTO,
ELM_SMART_SCROLLER_POLICY_OFF);
-
wd->icon_size = _elm_toolbar_icon_size_get(wd);
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);
+ wd->more = elm_layout_add(obj);
+ elm_layout_theme_set(wd->more, "toolbar", "more", "default");
+ elm_widget_sub_object_add(obj, wd->more);
+ evas_object_show(wd->more);
+
+ wd->bx_more = evas_object_box_add(e);
+ evas_object_size_hint_align_set(wd->bx_more, wd->align, 0.5);
+ evas_object_box_layout_set(wd->bx_more, _layout, obj, NULL);
+ elm_widget_sub_object_add(obj, wd->bx_more);
+ elm_object_part_content_set(wd->more, "elm.swallow.content", wd->bx_more);
+ evas_object_show(wd->bx_more);
+
+ wd->bx_more2 = evas_object_box_add(e);
+ evas_object_size_hint_align_set(wd->bx_more2, wd->align, 0.5);
+ evas_object_box_layout_set(wd->bx_more2, _layout, obj, NULL);
+ elm_widget_sub_object_add(obj, wd->bx_more2);
+ elm_object_part_content_set(wd->more, "elm.swallow.content2", wd->bx_more2);
+ evas_object_show(wd->bx_more2);
+
+ 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->scr, EVAS_CALLBACK_MOVE, _move, 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);
return wd->icon_size;
}
-EAPI Elm_Toolbar_Item *
+EAPI Elm_Object_Item *
elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
evas_object_box_append(wd->bx, VIEW(it));
evas_object_show(VIEW(it));
- _theme_hook_item(obj, it, scale, wd->icon_size);
- _sizing_eval(obj);
-
- return it;
-}
-
-static void
-_elm_toolbar_item_state_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
-{
- Elm_Toolbar_Item *it = event_info;
- Elm_Toolbar_Item_State *it_state;
-
- it_state = eina_list_data_get(it->current_state);
- if (it_state->func)
- it_state->func((void *)it_state->data, obj, event_info);
-}
-
-EAPI Elm_Toolbar_Item_State *
-elm_toolbar_item_state_next(Elm_Toolbar_Item *item)
-{
- Widget_Data *wd;
- Evas_Object *obj;
- Eina_List *next_state;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-
- obj = WIDGET(item);
- wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- if (!item->states) return NULL;
-
- next_state = eina_list_next(item->current_state);
- if (!next_state)
- next_state = eina_list_next(item->states);
- return eina_list_data_get(next_state);
-}
-
-EAPI Elm_Toolbar_Item_State *
-elm_toolbar_item_state_prev(Elm_Toolbar_Item *item)
-{
- Widget_Data *wd;
- Evas_Object *obj;
- Eina_List *prev_state;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-
- obj = WIDGET(item);
- wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- if (!item->states) return NULL;
-
- prev_state = eina_list_prev(item->current_state);
- if ((!prev_state) || (prev_state == item->states))
- prev_state = eina_list_last(item->states);
- return eina_list_data_get(prev_state);
-}
-
-EAPI void
-elm_toolbar_item_state_unset(Elm_Toolbar_Item *it)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
- elm_toolbar_item_state_set(it, NULL);
-}
-
-EAPI Eina_Bool
-elm_toolbar_item_state_set(Elm_Toolbar_Item *it, Elm_Toolbar_Item_State *state)
-{
- Widget_Data *wd;
- Eina_List *next_state;
- Elm_Toolbar_Item_State *it_state;
- Evas_Object *obj;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-
- obj = WIDGET(it);
- wd = elm_widget_data_get(obj);
- if (!wd) return EINA_FALSE;
- if (!it->states) return EINA_FALSE;
-
- if (state)
- {
- next_state = eina_list_data_find_list(it->states, state);
- if (!next_state) return EINA_FALSE;
- }
- else
- next_state = it->states;
-
- if (next_state == it->current_state) return EINA_TRUE;
-
- it_state = eina_list_data_get(next_state);
- if (eina_list_data_find(it->current_state, state))
- {
- _item_label_set(it, it_state->label, "elm,state,label_set,forward");
- _elm_toolbar_item_icon_obj_set(obj, it, it_state->icon, it_state->icon_str,
- wd->icon_size, "elm,state,icon_set,forward");
- }
- else
- {
- _item_label_set(it, it_state->label, "elm,state,label_set,backward");
- _elm_toolbar_item_icon_obj_set(obj, it, it_state->icon, it_state->icon_str,
- wd->icon_size, "elm,state,icon_set,backward");
- }
- if (it->disabled)
- elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
- else
- elm_widget_signal_emit(it->icon, "elm,state,enabled", "elm");
-
- it->current_state = next_state;
- return EINA_TRUE;
-}
-
-EAPI Elm_Toolbar_Item_State *
-elm_toolbar_item_state_get(const Elm_Toolbar_Item *it)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
- if ((!it->states) || (!it->current_state)) return NULL;
- if (it->current_state == it->states) return NULL;
-
- return eina_list_data_get(it->current_state);
-}
-
-static Elm_Toolbar_Item_State *
-_item_state_new(const char *label, const char *icon_str, Evas_Object *icon, Evas_Smart_Cb func, const void *data)
-{
- Elm_Toolbar_Item_State *it_state;
- it_state = ELM_NEW(Elm_Toolbar_Item_State);
- it_state->label = eina_stringshare_add(label);
- it_state->icon_str = eina_stringshare_add(icon_str);
- it_state->icon = icon;
- it_state->func = func;
- it_state->data = data;
- return it_state;
-}
-
-EAPI Elm_Toolbar_Item_State *
-elm_toolbar_item_state_add(Elm_Toolbar_Item *item, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
-{
- Elm_Toolbar_Item_State *it_state;
- Evas_Object *icon_obj;
- Evas_Object *obj;
- Widget_Data *wd;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- obj = WIDGET(item);
- wd = elm_widget_data_get(WIDGET(item));
- if (!wd) return NULL;
-
- if (!item->states)
- {
- it_state = _item_state_new(item->label, item->icon_str, item->icon,
- item->func, item->base.data);
- item->states = eina_list_append(item->states, it_state);
- item->current_state = item->states;
- }
-
- icon_obj = elm_icon_add(obj);
- elm_icon_order_lookup_set(icon_obj, wd->lookup_order);
- if (!icon_obj) goto error_state_add;
-
- if (!_item_icon_set(icon_obj, "toolbar/", icon))
- {
- evas_object_del(icon_obj);
- icon_obj = NULL;
- icon = NULL;
- }
-
- it_state = _item_state_new(label, icon, icon_obj, func, data);
- item->states = eina_list_append(item->states, it_state);
- item->func = _elm_toolbar_item_state_cb;
- item->base.data = NULL;
-
- return it_state;
-
-error_state_add:
- if (item->states && !eina_list_next(item->states))
- {
- eina_stringshare_del(item->label);
- eina_stringshare_del(item->icon_str);
- free(eina_list_data_get(item->states));
- eina_list_free(item->states);
- item->states = NULL;
- }
- return NULL;
-}
-
-EAPI Eina_Bool
-elm_toolbar_item_state_del(Elm_Toolbar_Item *item, Elm_Toolbar_Item_State *state)
-{
- Eina_List *del_state;
- Elm_Toolbar_Item_State *it_state;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
-
- if (!state) return EINA_FALSE;
- if (!item->states) return EINA_FALSE;
-
- del_state = eina_list_data_find_list(item->states, state);
- if (del_state == item->states) return EINA_FALSE;
- if (del_state == item->current_state)
- elm_toolbar_item_state_unset(item);
-
- eina_stringshare_del(state->label);
- eina_stringshare_del(state->icon_str);
- if (state->icon) evas_object_del(state->icon);
- free(state);
- item->states = eina_list_remove_list(item->states, del_state);
- if (item->states && !eina_list_next(item->states))
- {
- it_state = eina_list_data_get(item->states);
- item->base.data = it_state->data;
- item->func = it_state->func;
- eina_stringshare_del(it_state->label);
- eina_stringshare_del(it_state->icon_str);
- free(eina_list_data_get(item->states));
- eina_list_free(item->states);
- item->states = NULL;
- }
- return EINA_TRUE;
+ _theme_hook_item(obj, it, scale, wd->icon_size);
+ _sizing_eval(obj);
+ wd->item_count++;
+
+ return (Elm_Object_Item *)it;
}
-EAPI Elm_Toolbar_Item *
+EAPI Elm_Object_Item *
elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
evas_object_show(VIEW(it));
_theme_hook_item(obj, it, scale, wd->icon_size);
_sizing_eval(obj);
+ wd->item_count++;
- return it;
+ return (Elm_Object_Item *)it;
}
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+EAPI Elm_Object_Item *
+elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(before, NULL);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(before, NULL);
+ Widget_Data *wd;
+ Elm_Toolbar_Item *it, *_before;
- Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ _before = (Elm_Toolbar_Item *) before;
+ it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
double scale = (elm_widget_scale_get(obj) * _elm_config->scale);
wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it),
- EINA_INLIST_GET(before));
- evas_object_box_insert_before(wd->bx, VIEW(it), VIEW(before));
+ EINA_INLIST_GET(_before));
+ evas_object_box_insert_before(wd->bx, VIEW(it), VIEW(_before));
evas_object_show(VIEW(it));
_theme_hook_item(obj, it, scale, wd->icon_size);
_sizing_eval(obj);
+ wd->item_count++;
- return it;
+ return (Elm_Object_Item *)it;
}
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Toolbar_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+EAPI Elm_Object_Item *
+elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(after, NULL);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(after, NULL);
+ Widget_Data *wd;
+ Elm_Toolbar_Item *it, *_after;
- Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ _after = (Elm_Toolbar_Item *) after;
+ it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
double scale = (elm_widget_scale_get(obj) * _elm_config->scale);
wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
- EINA_INLIST_GET(after));
- evas_object_box_insert_after(wd->bx, VIEW(it), VIEW(after));
+ EINA_INLIST_GET(_after));
+ evas_object_box_insert_after(wd->bx, VIEW(it), VIEW(_after));
evas_object_show(VIEW(it));
_theme_hook_item(obj, it, scale, wd->icon_size);
_sizing_eval(obj);
+ wd->item_count++;
- return it;
+ return (Elm_Object_Item *)it;
}
-EAPI Elm_Toolbar_Item *
+EAPI Elm_Object_Item *
elm_toolbar_first_item_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !wd->items) return NULL;
- Elm_Toolbar_Item *it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
- return it;
+ return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
}
-EAPI Elm_Toolbar_Item *
+EAPI Elm_Object_Item *
elm_toolbar_last_item_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !wd->items) return NULL;
- Elm_Toolbar_Item *it = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items->last);
- return it;
-}
-
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_next_get(const Elm_Toolbar_Item *item)
-{
- Elm_Toolbar_Item *next;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
- return next;
+ return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items->last);
}
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_prev_get(const Elm_Toolbar_Item *item)
+EAPI Elm_Object_Item *
+elm_toolbar_item_next_get(const Elm_Object_Item *it)
{
- Elm_Toolbar_Item *prev;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- prev = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->prev);
- return prev;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST(
+ EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->next);
}
-EAPI Evas_Object *
-elm_toolbar_item_toolbar_get(const Elm_Toolbar_Item *item)
+EAPI Elm_Object_Item *
+elm_toolbar_item_prev_get(const Elm_Object_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return WIDGET(item);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST(
+ EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->prev);
}
EAPI void
-elm_toolbar_item_priority_set(Elm_Toolbar_Item *item, int priority)
+elm_toolbar_item_priority_set(Elm_Object_Item *it, int priority)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
if (item->prio.priority == priority) return;
item->prio.priority = priority;
_resize(WIDGET(item), NULL, NULL, NULL);
}
EAPI int
-elm_toolbar_item_priority_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, 0);
- return item->prio.priority;
-}
-
-EAPI const char *
-elm_toolbar_item_icon_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return item->icon_str;
-}
-
-EAPI const char *
-elm_toolbar_item_label_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return item->label;
-}
-
-static void
-_elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
-{
- Evas_Coord mw = -1, mh = -1;
- Widget_Data *wd = elm_widget_data_get(WIDGET(item));
- edje_object_part_text_set(VIEW(item), "elm.text", item->label);
-
- 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);
- if (wd->vertical)
- {
- evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
- evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, 0.5);
- }
- else
- {
- evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL);
- }
- evas_object_size_hint_min_set(VIEW(item), mw, mh);
-}
-
-static void
-_elm_toolbar_item_label_set_cb (void *data, Evas_Object *obj, const char *emission, const char *source)
+elm_toolbar_item_priority_get(const Elm_Object_Item *it)
{
- Elm_Toolbar_Item *item = data;
- _elm_toolbar_item_label_update(item);
- edje_object_signal_callback_del(obj, emission, source,
- _elm_toolbar_item_label_set_cb);
- edje_object_signal_emit (VIEW(item), "elm,state,label,reset", "elm");
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0);
+ return ((Elm_Toolbar_Item *)it)->prio.priority;
}
-static void
-_item_label_set(Elm_Toolbar_Item *item, const char *label, const char *signal)
+EAPI Elm_Object_Item *
+elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label)
{
- const char *s;
-
- if ((label) && (item->label) && (!strcmp(label, item->label))) return;
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Elm_Toolbar_Item *it;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
- eina_stringshare_replace(&item->label, label);
- s = edje_object_data_get(VIEW(item), "transition_animation_on");
- if ((s) && (atoi(s)))
+ EINA_INLIST_FOREACH(wd->items, it)
{
- edje_object_part_text_set(VIEW(item), "elm.text_new", item->label);
- edje_object_signal_emit (VIEW(item), signal, "elm");
- edje_object_signal_callback_add(VIEW(item),
- "elm,state,label_set,done", "elm",
- _elm_toolbar_item_label_set_cb, item);
+ if (!strcmp(it->label, label))
+ return (Elm_Object_Item *)it;
}
- else
- _elm_toolbar_item_label_update(item);
- _resize(WIDGET(item), NULL, NULL, NULL);
+ return NULL;
}
EAPI void
-elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- _item_label_set(item, label, "elm,state,label_set");
-}
-
-static void
-_elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
+elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
{
- Elm_Toolbar_Item_State *it_state;
- Eina_List *l;
- Evas_Coord mw = -1, mh = -1;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
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_swallow(VIEW(item), "elm.swallow.icon", item->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);
- if (wd->vertical)
- {
- evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, -1.0);
- evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, 0.5);
- }
- else
- {
- evas_object_size_hint_weight_set(VIEW(item), -1.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(VIEW(item), 0.5, EVAS_HINT_FILL);
- }
- evas_object_size_hint_min_set(VIEW(item), mw, mh);
+ if (!wd) return;
- EINA_LIST_FOREACH(item->states, l, it_state)
- if (it_state->icon == old_icon)
- return;
- evas_object_del(old_icon);
+ if (item->selected == selected) return;
+ if (selected) _item_select(item);
+ else _item_unselect(item);
}
EAPI Eina_Bool
-elm_toolbar_item_selected_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return item->selected;
-}
-
-EAPI void
-elm_toolbar_item_selected_set(Elm_Toolbar_Item *item, Eina_Bool selected)
+elm_toolbar_item_selected_get(const Elm_Object_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- Widget_Data *wd = elm_widget_data_get(WIDGET(item));
- if (!wd) return;
-
- if (item->selected == selected) return;
-
- if (selected)
- _item_select(item);
- else
- _item_unselect(item);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+ return ((Elm_Toolbar_Item *)it)->selected;
}
-EAPI Elm_Toolbar_Item *
+EAPI Elm_Object_Item *
elm_toolbar_selected_item_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
- return wd->selected_item;
-}
-
-static void
-_elm_toolbar_item_icon_set_cb (void *data, Evas_Object *obj, const char *emission, const char *source)
-{
- Elm_Toolbar_Item *item = data;
- edje_object_part_unswallow(VIEW(item), item->icon);
- _elm_toolbar_item_icon_update(item);
- edje_object_signal_callback_del(obj, emission, source,
- _elm_toolbar_item_icon_set_cb);
- edje_object_signal_emit (VIEW(item), "elm,state,icon,reset", "elm");
+ return (Elm_Object_Item *) wd->selected_item;
}
-static void
-_elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *signal)
+EAPI Elm_Object_Item *
+elm_toolbar_more_item_get(const Evas_Object *obj)
{
- Evas_Object *old_icon;
- int ms = 0;
- const char *s;
-
- if (icon_str)
- eina_stringshare_replace(&item->icon_str, icon_str);
- else
- {
- eina_stringshare_del(item->icon_str);
- item->icon_str = NULL;
- }
- item->icon = icon_obj;
- if (icon_obj)
- {
- ms = (icon_size * _elm_config->scale);
- evas_object_size_hint_min_set(item->icon, ms, ms);
- evas_object_size_hint_max_set(item->icon, ms, ms);
- evas_object_show(item->icon);
- elm_widget_sub_object_add(obj, item->icon);
- }
- s = edje_object_data_get(VIEW(item), "transition_animation_on");
- if ((s) && (atoi(s)))
- {
- old_icon = edje_object_part_swallow_get(VIEW(item),
- "elm.swallow.icon_new");
- if (old_icon)
- {
- elm_widget_sub_object_del(VIEW(item), old_icon);
- evas_object_hide(old_icon);
- }
- edje_object_part_swallow(VIEW(item), "elm.swallow.icon_new",
- item->icon);
- edje_object_signal_emit (VIEW(item), signal, "elm");
- edje_object_signal_callback_add(VIEW(item),
- "elm,state,icon_set,done", "elm",
- _elm_toolbar_item_icon_set_cb, item);
- }
- else
- _elm_toolbar_item_icon_update(item);
- _resize(obj, NULL, NULL, NULL);
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ return (Elm_Object_Item *) wd->more_item;
}
EAPI void
-elm_toolbar_item_icon_set(Elm_Toolbar_Item *item, const char *icon)
+elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon)
{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+
Evas_Object *icon_obj;
Widget_Data *wd;
Evas_Object *obj;
+ Elm_Toolbar_Item * item = (Elm_Toolbar_Item *)it;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
obj = WIDGET(item);
wd = elm_widget_data_get(obj);
if (!wd) return;
}
}
+EAPI const char *
+elm_toolbar_item_icon_get(const Elm_Object_Item *it)
+{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ return ((Elm_Toolbar_Item *)it)->icon_str;
+}
+
+EAPI Evas_Object *
+elm_toolbar_item_object_get(const Elm_Object_Item *it)
+{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+
+ Widget_Data *wd;
+ Evas_Object *obj;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+
+ return VIEW(item);
+}
+
+EAPI Evas_Object *
+elm_toolbar_item_icon_object_get(Elm_Object_Item *it)
+{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ return ((Elm_Toolbar_Item *)it)->icon;
+}
+
EAPI Eina_Bool
-elm_toolbar_item_icon_memfile_set(Elm_Toolbar_Item *item, const void *img, size_t size, const char *format, const char *key)
+elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t size, const char *format, const char *key)
{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+
Evas_Object *icon_obj;
Widget_Data *wd;
Evas_Object *obj;
Eina_Bool ret;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
obj = WIDGET(item);
wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
return EINA_TRUE;
}
-EAPI Evas_Object *
-elm_toolbar_item_object_get(const Elm_Toolbar_Item *item)
+EAPI Eina_Bool
+elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key)
{
- Widget_Data *wd;
- Evas_Object *obj;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- obj = WIDGET(item);
- wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
-
- return VIEW(item);
-}
-
-EAPI Evas_Object *
-elm_toolbar_item_icon_object_get(Elm_Toolbar_Item *item)
-{
+ Evas_Object *icon_obj;
Widget_Data *wd;
Evas_Object *obj;
+ Eina_Bool ret;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- obj = WIDGET(item);
- wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
-
- return item->icon;
-}
-
-EAPI void
-elm_toolbar_item_del(Elm_Toolbar_Item *item)
-{
- Widget_Data *wd;
- Evas_Object *obj2;
- Elm_Toolbar_Item *next;
-
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- wd = elm_widget_data_get(WIDGET(item));
- if (!wd) return;
- obj2 = WIDGET(item);
- next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(item)->next);
- wd->items = eina_inlist_remove(wd->items, EINA_INLIST_GET(item));
- if (!next) next = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items);
- if (wd->always_select && item->selected && next) _item_select(next);
- _item_del(item);
- _theme_hook(obj2);
-}
-
-EAPI void
-elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *item, Evas_Smart_Cb func)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_del_cb_set(item, func);
-}
-
-EAPI Eina_Bool
-elm_toolbar_item_disabled_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return item->disabled;
-}
-
-EAPI void
-elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- _item_disable(item, disabled);
- _resize(WIDGET(item), NULL, NULL, NULL);
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return EINA_FALSE;
+
+ if (file)
+ {
+ icon_obj = _els_smart_icon_add(evas_object_evas_get(obj));
+ evas_object_repeat_events_set(icon_obj, EINA_TRUE);
+ ret = _els_smart_icon_file_key_set(icon_obj, file, key);
+ if (!ret)
+ {
+ evas_object_del(icon_obj);
+ return EINA_FALSE;
+ }
+ _elm_toolbar_item_icon_obj_set(obj, item, icon_obj, NULL, wd->icon_size,
+ "elm,state,icon_set");
+ }
+ else
+ _elm_toolbar_item_icon_obj_set(obj, item, NULL, NULL, 0, "elm,state,icon_set");
+ return EINA_TRUE;
}
EAPI void
-elm_toolbar_item_separator_set(Elm_Toolbar_Item *item, Eina_Bool separator)
+elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
Evas_Object *obj = WIDGET(item);
Widget_Data *wd = elm_widget_data_get(obj);
double scale;
}
EAPI Eina_Bool
-elm_toolbar_item_separator_get(const Elm_Toolbar_Item *item)
+elm_toolbar_item_separator_get(const Elm_Object_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return item->separator;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+ return ((Elm_Toolbar_Item *)it)->separator;
}
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);
if (wd->more_item)
{
_item_del(wd->more_item);
+ elm_widget_item_free(wd->more_item);
wd->more_item = NULL;
}
if (shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
{
- elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, ELM_SMART_SCROLLER_POLICY_OFF);
-
- wd->more_item = _item_new(obj, "more_menu", "More",
- NULL, NULL);
+ elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF,
+ ELM_SMART_SCROLLER_POLICY_OFF);
+ wd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
}
else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF,
ELM_SMART_SCROLLER_POLICY_OFF);
+ else if (shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
+ {
+ elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_AUTO,
+ ELM_SMART_SCROLLER_POLICY_OFF);
+ wd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
+ }
else
elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_AUTO,
ELM_SMART_SCROLLER_POLICY_OFF);
}
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);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- if (wd->align != align)
- evas_object_size_hint_align_set(wd->bx, align, 0.5);
+ if (wd->vertical)
+ {
+ if (wd->align != align)
+ evas_object_size_hint_align_set(wd->bx, 0.5, align);
+ }
+ else
+ {
+ if (wd->align != align)
+ evas_object_size_hint_align_set(wd->bx, align, 0.5);
+ }
wd->align = align;
}
}
EAPI void
-elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu)
+elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
Widget_Data *wd = elm_widget_data_get(WIDGET(item));
if (!wd) return;
else _item_menu_destroy(item);
}
-EAPI void
-elm_toolbar_item_tooltip_text_set(Elm_Toolbar_Item *item, const char *text)
+EAPI Evas_Object *
+elm_toolbar_item_menu_get(const Elm_Object_Item *it)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_tooltip_text_set(item, text);
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+ if (!item->menu) return NULL;
+ Widget_Data *wd = elm_widget_data_get(WIDGET(item));
+ if (!wd) return NULL;
+ return item->o_menu;
}
-EAPI void
-elm_toolbar_item_tooltip_content_cb_set(Elm_Toolbar_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
+EAPI Elm_Toolbar_Item_State *
+elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb);
-}
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-EAPI void
-elm_toolbar_item_tooltip_unset(Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_tooltip_unset(item);
-}
+ Elm_Toolbar_Item_State *it_state;
+ Evas_Object *icon_obj;
+ Evas_Object *obj;
+ Widget_Data *wd;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(WIDGET(item));
+ if (!wd) return NULL;
-EAPI void
-elm_toolbar_item_tooltip_style_set(Elm_Toolbar_Item *item, const char *style)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_tooltip_style_set(item, style);
-}
+ if (!item->states)
+ {
+ it_state = _item_state_new(item->label, item->icon_str, item->icon,
+ item->func, item->base.data);
+ item->states = eina_list_append(item->states, it_state);
+ item->current_state = item->states;
+ }
-EAPI const char *
-elm_toolbar_item_tooltip_style_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_tooltip_style_get(item);
-}
+ icon_obj = elm_icon_add(obj);
+ elm_icon_order_lookup_set(icon_obj, wd->lookup_order);
+ if (!icon_obj) goto error_state_add;
-EAPI void
-elm_toolbar_item_cursor_set(Elm_Toolbar_Item *item, const char *cursor)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_set(item, cursor);
-}
+ if (!_item_icon_set(icon_obj, "toolbar/", icon))
+ {
+ evas_object_del(icon_obj);
+ icon_obj = NULL;
+ icon = NULL;
+ }
-EAPI const char *
-elm_toolbar_item_cursor_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_cursor_get(item);
-}
+ it_state = _item_state_new(label, icon, icon_obj, func, data);
+ item->states = eina_list_append(item->states, it_state);
+ item->func = _elm_toolbar_item_state_cb;
+ item->base.data = NULL;
-EAPI void
-elm_toolbar_item_cursor_unset(Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_unset(item);
-}
+ return it_state;
-EAPI void
-elm_toolbar_item_cursor_style_set(Elm_Toolbar_Item *item, const char *style)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_style_set(item, style);
+error_state_add:
+ if (item->states && !eina_list_next(item->states))
+ {
+ eina_stringshare_del(item->label);
+ eina_stringshare_del(item->icon_str);
+ free(eina_list_data_get(item->states));
+ eina_list_free(item->states);
+ item->states = NULL;
+ }
+ return NULL;
}
-EAPI const char *
-elm_toolbar_item_cursor_style_get(const Elm_Toolbar_Item *item)
+EAPI Eina_Bool
+elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_cursor_style_get(item);
-}
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-EAPI void
-elm_toolbar_item_cursor_engine_only_set(Elm_Toolbar_Item *item, Eina_Bool engine_only)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_cursor_engine_only_set(item, engine_only);
+ Eina_List *del_state;
+ Elm_Toolbar_Item_State *it_state;
+ Elm_Toolbar_Item *item;
+
+ if (!state) return EINA_FALSE;
+
+ item = (Elm_Toolbar_Item *)it;
+ if (!item->states) return EINA_FALSE;
+
+ del_state = eina_list_data_find_list(item->states, state);
+ if (del_state == item->states) return EINA_FALSE;
+ if (del_state == item->current_state)
+ elm_toolbar_item_state_unset(it);
+
+ eina_stringshare_del(state->label);
+ eina_stringshare_del(state->icon_str);
+ if (state->icon) evas_object_del(state->icon);
+ free(state);
+ item->states = eina_list_remove_list(item->states, del_state);
+ if (item->states && !eina_list_next(item->states))
+ {
+ it_state = eina_list_data_get(item->states);
+ item->base.data = it_state->data;
+ item->func = it_state->func;
+ eina_stringshare_del(it_state->label);
+ eina_stringshare_del(it_state->icon_str);
+ free(eina_list_data_get(item->states));
+ eina_list_free(item->states);
+ item->states = NULL;
+ }
+ return EINA_TRUE;
}
EAPI Eina_Bool
-elm_toolbar_item_cursor_engine_only_get(const Elm_Toolbar_Item *item)
+elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state)
{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
- return elm_widget_item_cursor_engine_only_get(item);
-}
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-EAPI Evas_Object *
-elm_toolbar_item_menu_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- Widget_Data *wd = elm_widget_data_get(WIDGET(item));
- if ((!wd) || (!item->menu)) return NULL;
- return item->o_menu;
-}
+ Widget_Data *wd;
+ Eina_List *next_state;
+ Elm_Toolbar_Item_State *it_state;
+ Evas_Object *obj;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
-EAPI Elm_Toolbar_Item *
-elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label)
-{
- Elm_Toolbar_Item *it;
- ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return EINA_FALSE;
+ if (!item->states) return EINA_FALSE;
- if (!wd) return NULL;
- EINA_INLIST_FOREACH(wd->items, it)
+ if (state)
{
- if (!strcmp(it->label, label)) return it;
+ next_state = eina_list_data_find_list(item->states, state);
+ if (!next_state) return EINA_FALSE;
}
+ else
+ next_state = item->states;
- return NULL;
-}
+ if (next_state == item->current_state) return EINA_TRUE;
-EAPI void
-elm_toolbar_item_data_set(Elm_Toolbar_Item *item, const void *data)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
- elm_widget_item_data_set(item, data);
-}
+ it_state = eina_list_data_get(next_state);
+ if (eina_list_data_find(item->current_state, state))
+ {
+ _item_label_set(item, it_state->label, "elm,state,label_set,forward");
+ _elm_toolbar_item_icon_obj_set(obj, item, it_state->icon, it_state->icon_str,
+ wd->icon_size, "elm,state,icon_set,forward");
+ }
+ else
+ {
+ _item_label_set(item, it_state->label, "elm,state,label_set,backward");
+ _elm_toolbar_item_icon_obj_set(obj,
+ item,
+ it_state->icon,
+ it_state->icon_str,
+ wd->icon_size,
+ "elm,state,icon_set,backward");
+ }
+ if (elm_widget_item_disabled_get(item))
+ elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
+ else
+ elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");
-EAPI void *
-elm_toolbar_item_data_get(const Elm_Toolbar_Item *item)
-{
- ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
- return elm_widget_item_data_get(item);
+ item->current_state = next_state;
+ return EINA_TRUE;
}
EAPI void
-elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select)
+elm_toolbar_item_state_unset(Elm_Object_Item *it)
{
- ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
- if (always_select && (!wd->always_select) && wd->items)
- _item_select(ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items));
- wd->always_select = always_select;
+ elm_toolbar_item_state_set(it, NULL);
}
-EAPI Eina_Bool
-elm_toolbar_always_select_mode_get(const Evas_Object *obj)
+EAPI Elm_Toolbar_Item_State *
+elm_toolbar_item_state_get(const Elm_Object_Item *it)
{
- ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return EINA_FALSE;
- return wd->always_select;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+
+ if ((!item->states) || (!item->current_state)) return NULL;
+ if (item->current_state == item->states) return NULL;
+
+ return eina_list_data_get(item->current_state);
}
-EAPI void
-elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select)
+EAPI Elm_Toolbar_Item_State *
+elm_toolbar_item_state_next(Elm_Object_Item *it)
{
- ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
- wd->no_select = no_select;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+
+ Widget_Data *wd;
+ Evas_Object *obj;
+ Eina_List *next_state;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ if (!item->states) return NULL;
+
+ next_state = eina_list_next(item->current_state);
+ if (!next_state)
+ next_state = eina_list_next(item->states);
+ return eina_list_data_get(next_state);
}
-EAPI Eina_Bool
-elm_toolbar_no_select_mode_get(const Evas_Object *obj)
+EAPI Elm_Toolbar_Item_State *
+elm_toolbar_item_state_prev(Elm_Object_Item *it)
{
- ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return EINA_FALSE;
- return wd->no_select;
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+
+ Widget_Data *wd;
+ Evas_Object *obj;
+ Eina_List *prev_state;
+ Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it;
+
+ obj = WIDGET(item);
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ if (!item->states) return NULL;
+
+ prev_state = eina_list_prev(item->current_state);
+ if ((!prev_state) || (prev_state == item->states))
+ prev_state = eina_list_last(item->states);
+ return eina_list_data_get(prev_state);
}
EAPI void
return wd->lookup_order;
}
-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)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->vertical = !horizontal;
+ if (wd->vertical)
+ evas_object_size_hint_align_set(wd->bx, 0.5, wd->align);
+ else
+ evas_object_size_hint_align_set(wd->bx, wd->align, 0.5);
_sizing_eval(obj);
}
return !wd->vertical;
}
+EAPI unsigned int
+elm_toolbar_items_count(const Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) 0;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return 0;
+ return wd->item_count;
+}
+
+EAPI void
+elm_toolbar_items_max_set(Evas_Object *obj, unsigned int max)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ wd->item_max = max;
+}
+
+EAPI unsigned int
+elm_toolbar_items_max_get(const Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) 0;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return 0;
+ return wd->item_max;
+}
+
+EAPI void
+elm_toolbar_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (mode >= ELM_OBJECT_SELECT_MODE_MAX)
+ return;
+ if ((mode == ELM_OBJECT_SELECT_MODE_ALWAYS) &&
+ (wd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS) &&
+ wd->items)
+ _item_select(ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items));
+ if (wd->select_mode != mode)
+ wd->select_mode = mode;
+}
+
+EAPI Elm_Object_Select_Mode
+elm_toolbar_select_mode_get(const Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) ELM_OBJECT_SELECT_MODE_MAX;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return ELM_OBJECT_SELECT_MODE_MAX;
+ return wd->select_mode;
+}
projects / framework / uifw / elementary.git / blobdiff