#include "elm_priv.h"
#define MAX_STR 256
+<<<<<<< HEAD
+#define MIN_W_ENTRY 20
+=======
#define MIN_W_ENTRY 10
+>>>>>>> remotes/origin/upstream
typedef enum _Multibuttonentry_Pos
{
MULTIBUTTONENTRY_POS_END,
MULTIBUTTONENTRY_POS_BEFORE,
MULTIBUTTONENTRY_POS_AFTER,
+<<<<<<< HEAD
+ MULTIBUTTONENTRY_POS_NUM
+=======
+>>>>>>> remotes/origin/upstream
} Multibuttonentry_Pos;
typedef enum _Multibuttonentry_Button_State
{
MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT,
MULTIBUTTONENTRY_BUTTON_STATE_SELECTED,
+<<<<<<< HEAD
+ MULTIBUTTONENTRY_BUTTON_STATE_NUM
+ } Multibuttonentry_Button_State;
+
+=======
} Multibuttonentry_Button_State;
+>>>>>>> remotes/origin/upstream
typedef enum _MultiButtonEntry_Closed_Button_Type
{
MULTIBUTTONENTRY_CLOSED_IMAGE,
Evas_Object *button;
Evas_Coord vw, rw; // vw: visual width, real width
Eina_Bool visible: 1;
+<<<<<<< HEAD
+=======
Evas_Smart_Cb func;
+>>>>>>> remotes/origin/upstream
};
typedef struct _Elm_Multibuttonentry_Item_Filter
{
+<<<<<<< HEAD
+ Elm_Multibuttonentry_Item_Filter_callback callback_func;
+=======
Elm_Multibuttonentry_Item_Filter_Cb callback_func;
+>>>>>>> remotes/origin/upstream
void *data;
} Elm_Multibuttonentry_Item_Filter;
Eina_List *current;
Eina_List *filter_list;
+<<<<<<< HEAD
+=======
const char *labeltxt, *guidetexttxt;
+>>>>>>> remotes/origin/upstream
int n_str;
Multibuttonentry_View_State view_state;
int shrink;
Eina_Bool focused: 1;
Eina_Bool last_btn_select: 1;
+<<<<<<< HEAD
+ Eina_Bool view_mode;
+ Elm_Multibuttonentry_Item_Filter_callback add_callback;
+=======
Elm_Multibuttonentry_Item_Filter_Cb add_callback;
+>>>>>>> remotes/origin/upstream
void *add_callback_data;
};
static void _changed_size_hint_cb(void *data, Evas *evas, Evas_Object *obj, void *event);
static void _resize_cb(void *data, Evas *evas, Evas_Object *obj, void *event);
static void _event_init(Evas_Object *obj);
+<<<<<<< HEAD
+static void _shrink_mode_set(Evas_Object *obj, int shrink);
+=======
static void _shrink_mode_set(Evas_Object *obj, Eina_Bool shrink);
+>>>>>>> remotes/origin/upstream
static void _view_update(Evas_Object *obj);
static void _set_label(Evas_Object *obj, const char *str);
static void _change_current_button_state(Evas_Object *obj, Multibuttonentry_Button_State state);
static void _del_button_obj(Evas_Object *obj, Evas_Object *btn);
static void _del_button_item(Elm_Multibuttonentry_Item *item);
static void _select_button(Evas_Object *obj, Evas_Object *btn);
+<<<<<<< HEAD
+static Elm_Multibuttonentry_Item *_add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos,
+ const Elm_Multibuttonentry_Item *reference, void *data);
+static void _add_button(Evas_Object *obj, const char *str);
+=======
static Elm_Object_Item *_add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, const void *ref, Evas_Smart_Cb func, void *data);
+>>>>>>> remotes/origin/upstream
static void _evas_mbe_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _entry_changed_cb(void *data, Evas_Object *obj, void *event_info);
static void _entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Evas_Coord _calculate_item_max_height(Evas_Object *box, Evas_Object_Box_Data *priv, int obj_index);
static void _box_layout_cb(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
static void _item_text_set_hook(Elm_Object_Item *it,
+<<<<<<< HEAD
+ const char *part,
+ const char *label);
+static const char * _item_text_get_hook(const Elm_Object_Item *it,
+ const char *part);
+=======
const char *part,
const char *label);
static const char *_item_text_get_hook(const Elm_Object_Item *it,
* Code refactoring
* use evas_object_smart_callback_descriptions_set for smart callbacks.
*/
+>>>>>>> remotes/origin/upstream
static void
_del_hook(Evas_Object *obj)
}
wd->current = NULL;
+<<<<<<< HEAD
+ if (wd->entry) evas_object_del (wd->entry);
+ if (wd->label) evas_object_del (wd->label);
+ if (wd->guidetext) evas_object_del (wd->guidetext);
+ if (wd->end) evas_object_del (wd->end);
+=======
if (wd->labeltxt) eina_stringshare_del(wd->labeltxt);
if (wd->guidetexttxt) eina_stringshare_del(wd->guidetexttxt);
if (wd->entry) evas_object_del(wd->entry);
if (wd->label) evas_object_del(wd->label);
if (wd->guidetext) evas_object_del(wd->guidetext);
if (wd->end) evas_object_del(wd->end);
+>>>>>>> remotes/origin/upstream
if (wd->rect_for_end) evas_object_del(wd->rect_for_end);
}
if (!wd) return;
_elm_theme_object_set(obj, wd->base, "multibuttonentry", "base", elm_widget_style_get(obj));
+<<<<<<< HEAD
+ if (wd->box) edje_object_part_swallow (wd->base, "box.swallow", wd->box);
+=======
if (wd->box) edje_object_part_swallow(wd->base, "box.swallow", wd->box);
+>>>>>>> remotes/origin/upstream
edje_object_scale_set(wd->base, elm_widget_scale_get(obj) * _elm_config->scale);
EINA_LIST_FOREACH(wd->items, l, item)
{
if (item->button)
+<<<<<<< HEAD
+ _elm_theme_object_set(obj, item->button, "multibuttonentry", "btn", elm_widget_style_get (obj));
+=======
_elm_theme_object_set(obj, item->button, "multibuttonentry", "btn", elm_widget_style_get(obj));
+>>>>>>> remotes/origin/upstream
edje_object_scale_set(item->button, elm_widget_scale_get(obj) * _elm_config->scale);
}
if (!wd) return;
evas_object_geometry_get(wd->box, NULL, NULL, &w, &h);
+<<<<<<< HEAD
+ if (wd->h_box < h) evas_object_smart_callback_call (data, "expanded", NULL);
+ else if (wd->h_box > h) evas_object_smart_callback_call (data, "shrank", NULL);
+=======
if (wd->h_box < h) evas_object_smart_callback_call(data, "expanded", NULL);
else if (wd->h_box > h) evas_object_smart_callback_call(data, "contracted", NULL);
+>>>>>>> remotes/origin/upstream
wd->w_box = w;
wd->h_box = h;
else
{
evas_object_hide(wd->guidetext);
+<<<<<<< HEAD
+ if (!wd->view_mode)
+ {
+ elm_box_pack_end(wd->box, wd->entry);
+ evas_object_show(wd->entry);
+ }
+=======
elm_box_pack_end(wd->box, wd->entry);
evas_object_show(wd->entry);
+>>>>>>> remotes/origin/upstream
if (elm_widget_focus_get(obj) || wd->focused)
if (!wd->current)
elm_object_focus_set(wd->entry, EINA_TRUE);
}
static void
+<<<<<<< HEAD
+_shrink_mode_set(Evas_Object *obj, int shrink)
+=======
_shrink_mode_set(Evas_Object *obj, Eina_Bool shrink)
+>>>>>>> remotes/origin/upstream
{
Widget_Data *wd = elm_widget_data_get(obj);
Eina_List *l;
wd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
}
+<<<<<<< HEAD
+ if (shrink == 1)
+ {
+ Evas_Coord w=0, w_tmp=0;
+=======
if (shrink == EINA_TRUE)
{
Evas_Coord w = 0, w_tmp = 0;
+>>>>>>> remotes/origin/upstream
Evas_Coord box_inner_item_width_padding = 0;
elm_box_padding_get(wd->box, &box_inner_item_width_padding, NULL);
evas_object_show(wd->end);
wd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
+<<<<<<< HEAD
+ evas_object_smart_callback_call(obj, "shrink,state,changed", (void *)1);
+=======
evas_object_smart_callback_call(obj, "expand,state,changed", (void *)1);
+>>>>>>> remotes/origin/upstream
break;
}
}
wd->rect_for_end = evas_object_rectangle_add(e);
evas_object_color_set(wd->rect_for_end, 0, 0, 0, 0);
}
+<<<<<<< HEAD
+ evas_object_size_hint_min_set(wd->rect_for_end, rectSize, closed_height * elm_scale_get());
+=======
evas_object_size_hint_min_set(wd->rect_for_end, rectSize, closed_height * _elm_config->scale);
+>>>>>>> remotes/origin/upstream
elm_box_pack_end(wd->box, wd->rect_for_end);
evas_object_show(wd->rect_for_end);
evas_object_show(wd->end);
wd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
+<<<<<<< HEAD
+ evas_object_smart_callback_call(obj, "shrink,state,changed", (void *)0);
+=======
evas_object_smart_callback_call(obj, "expand,state,changed", (void *)0);
+>>>>>>> remotes/origin/upstream
break;
}
}
}
wd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
+<<<<<<< HEAD
+ evas_object_smart_callback_call(obj, "shrink,state,changed", (void *)wd->shrink);
+=======
evas_object_smart_callback_call(obj, "expand,state,changed", (void *)(long)wd->shrink);
+>>>>>>> remotes/origin/upstream
}
if (wd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK)
{
// update buttons in shrink mode
if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+<<<<<<< HEAD
+ _shrink_mode_set(obj, 1);
+=======
_shrink_mode_set(obj, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
// update guidetext
_set_vis_guidetext(obj);
}
static void
+<<<<<<< HEAD
+_set_label(Evas_Object *obj, const char* str)
+=======
_set_label(Evas_Object *obj, const char *str)
+>>>>>>> remotes/origin/upstream
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !str) return;
+<<<<<<< HEAD
+=======
eina_stringshare_replace(&wd->labeltxt, str);
+>>>>>>> remotes/origin/upstream
if (wd->label)
{
Evas_Coord width, height, sum_width = 0;
}
static void
+<<<<<<< HEAD
+_set_guidetext(Evas_Object *obj, const char* str)
+=======
_set_guidetext(Evas_Object *obj, const char *str)
+>>>>>>> remotes/origin/upstream
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !str) return;
+<<<<<<< HEAD
+ if (!wd->guidetext)
+ {
+ if (! (wd->guidetext = edje_object_add (evas_object_evas_get (obj)))) return;
+ _elm_theme_object_set(obj, wd->guidetext, "multibuttonentry", "guidetext", elm_widget_style_get(obj));
+ evas_object_size_hint_weight_set(wd->guidetext, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(wd->guidetext, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ }
+
+ if (wd->guidetext) edje_object_part_text_set (wd->guidetext, "elm.text", str);
+ _view_update(obj);
+=======
eina_stringshare_replace(&wd->guidetexttxt, str);
if (wd->guidetext == NULL)
edje_object_part_text_set(wd->guidetext, "elm.text", str);
_view_update(obj);
}
+>>>>>>> remotes/origin/upstream
}
static void
Elm_Multibuttonentry_Item *item = NULL;
if (!wd || wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
+<<<<<<< HEAD
+ _select_button(data, obj);
+
+ if ((wd->current) && ((item = eina_list_data_get(wd->current)) != NULL))
+ evas_object_smart_callback_call(data, "item,clicked", item);
+=======
_change_current_button(data, obj);
if (wd->current)
evas_object_smart_callback_call(data, "item,clicked", item);
_select_button(data, item->button);
}
+>>>>>>> remotes/origin/upstream
}
static void
}
}
if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+<<<<<<< HEAD
+ _shrink_mode_set(obj, 1);
+=======
_shrink_mode_set(obj, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
if (!eina_list_count(wd->items))
_set_vis_guidetext(obj);
_resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww)
{
Evas_Coord rw, vw;
+<<<<<<< HEAD
+ Evas_Coord w_text, h_btn, padding_outer = 0;
+=======
Evas_Coord w_text, h_btn, padding_outer, padding_inner = 0;
+>>>>>>> remotes/origin/upstream
Evas_Coord w_btn = 0, button_max_width = 0;
const char *size_str;
edje_object_part_geometry_get(btn, "elm.base", NULL, NULL, NULL, &h_btn);
edje_object_part_geometry_get(btn, "elm.btn.text", NULL, NULL, &w_text, NULL);
edje_object_part_geometry_get(btn, "right.padding", NULL, NULL, &padding_outer, NULL);
+<<<<<<< HEAD
+ w_btn = w_text + 2*padding_outer;
+=======
w_btn = w_text + 2*padding_outer + 2*padding_inner;
+>>>>>>> remotes/origin/upstream
rw = w_btn;
static Eina_Bool
_item_del_pre_hook(Elm_Object_Item *it)
{
+<<<<<<< HEAD
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+ _del_button_item((Elm_Multibuttonentry_Item *) it);
+ return EINA_TRUE;
+}
+
+static Elm_Multibuttonentry_Item*
+_add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, const Elm_Multibuttonentry_Item *reference, void *data)
+{
+ Elm_Multibuttonentry_Item *item;
+ Elm_Multibuttonentry_Item_Filter *item_filter;
+=======
_del_button_item((Elm_Multibuttonentry_Item *)it);
return EINA_TRUE;
}
Elm_Multibuttonentry_Item *item;
Elm_Multibuttonentry_Item_Filter *item_filter;
Elm_Multibuttonentry_Item *reference = (Elm_Multibuttonentry_Item *)ref;
+>>>>>>> remotes/origin/upstream
Eina_List *l;
Evas_Object *btn;
Evas_Coord width = -1, height = -1;
char *str_utf8 = NULL;
+<<<<<<< HEAD
+
+ Widget_Data *wd = elm_widget_data_get(obj);
+
+ if (!wd || !wd->box || !wd->entry) return NULL;
+=======
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !wd->box || !wd->entry) return NULL;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
if (!str) return NULL;
+>>>>>>> remotes/origin/upstream
EINA_LIST_FOREACH(wd->filter_list, l, item_filter)
{
item->vw = vw;
item->visible = EINA_TRUE;
+<<<<<<< HEAD
+=======
if (func)
{
item->func = func;
}
+>>>>>>> remotes/origin/upstream
switch (pos)
{
case MULTIBUTTONENTRY_POS_START:
if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
{
elm_widget_sub_object_add(obj, btn);
+<<<<<<< HEAD
+ _shrink_mode_set(obj, 1);
+=======
_shrink_mode_set(obj, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
}
else
{
if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
_set_vis_guidetext(obj);
if (wd->entry)
+<<<<<<< HEAD
+ {
+ if (!wd->view_mode)
+ elm_box_pack_before(wd->box, btn, wd->entry);
+ else
+ elm_box_pack_end(wd->box, btn);
+ }
+=======
elm_box_pack_before(wd->box, btn, wd->entry);
+>>>>>>> remotes/origin/upstream
else
elm_box_pack_end(wd->box, btn);
}
{
elm_widget_sub_object_add(obj, btn);
evas_object_hide(btn);
+<<<<<<< HEAD
+ _shrink_mode_set(obj, 1);
+=======
_shrink_mode_set(obj, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
}
else
{
if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
_set_vis_guidetext(obj);
if (wd->entry)
+<<<<<<< HEAD
+ {
+ if (!wd->view_mode)
+ elm_box_pack_before(wd->box, btn, wd->entry);
+ else
+ elm_box_pack_end(wd->box, btn);
+ }
+=======
elm_box_pack_before(wd->box, btn, wd->entry);
+>>>>>>> remotes/origin/upstream
else
elm_box_pack_end(wd->box, btn);
}
if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
{
elm_widget_sub_object_add(obj, btn);
+<<<<<<< HEAD
+ _shrink_mode_set(obj, 1);
+=======
_shrink_mode_set(obj, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
}
else
{
if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
_set_vis_guidetext(obj);
if (wd->entry)
+<<<<<<< HEAD
+ {
+ if (!wd->view_mode)
+ elm_box_pack_before(wd->box, btn, wd->entry);
+ else
+ elm_box_pack_end(wd->box, btn);
+ }
+=======
elm_box_pack_before(wd->box, btn, wd->entry);
+>>>>>>> remotes/origin/upstream
else
elm_box_pack_end(wd->box, btn);
}
free(str_utf8);
+<<<<<<< HEAD
+ return item;
+}
+
+static void
+_add_button(Evas_Object *obj, const char *str)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ _add_button_item(obj, str, MULTIBUTTONENTRY_POS_END, NULL, NULL);
+}
+
+static Elm_Multibuttonentry_Item_Filter*
+_filter_new(Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+=======
return (Elm_Object_Item *)item;
}
static Elm_Multibuttonentry_Item_Filter*
_filter_new(Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
+>>>>>>> remotes/origin/upstream
{
Elm_Multibuttonentry_Item_Filter *item_filter = ELM_NEW(Elm_Multibuttonentry_Item_Filter);
if (!item_filter) return NULL;
{
if (wd->current &&
((strcmp(ev->keyname, "BackSpace") == 0) ||
+<<<<<<< HEAD
+ (strcmp(ev->keyname, "BackSpace (") == 0)))
+=======
(strcmp(ev->keyname, "Delete") == 0)))
+>>>>>>> remotes/origin/upstream
{
item = eina_list_data_get(wd->current);
if (item)
}
else if (((!wd->current && (wd->n_str == 0) &&
(strcmp(ev->keyname, "BackSpace") == 0)) ||
+<<<<<<< HEAD
+ (strcmp(ev->keyname, "BackSpace (") == 0)))
+=======
(strcmp(ev->keyname, "Delete") == 0)))
+>>>>>>> remotes/origin/upstream
{
item = eina_list_data_get(eina_list_last(wd->items));
if (item)
if (!wd) return;
+<<<<<<< HEAD
+ if ((wd->n_str == 1) && (strcmp(ev->keyname, "BackSpace") == 0 || (strcmp(ev->keyname, "BackSpace (") == 0 )))
+=======
if ((wd->n_str == 1) && (strcmp(ev->keyname, "BackSpace") == 0 || (strcmp(ev->keyname, "Delete") == 0 )))
+>>>>>>> remotes/origin/upstream
wd->last_btn_select = EINA_FALSE;
}
if ((strcmp(str, "") != 0) && (strcmp(ev->keyname, "KP_Enter") == 0 || strcmp(ev->keyname, "Return") == 0 ))
{
+<<<<<<< HEAD
+ _add_button(data, str);
+=======
_add_button_item(data, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
+>>>>>>> remotes/origin/upstream
wd->n_str = 0;
}
}
str = elm_object_text_get(wd->entry);
if (strlen(str))
+<<<<<<< HEAD
+ _add_button(data, str);
+=======
_add_button_item(data, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
+>>>>>>> remotes/origin/upstream
}
static void
_entry_resized_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Coord en_x, en_y, en_w, en_h;
+<<<<<<< HEAD
+=======
Evas_Coord bx_x, bx_y;
+>>>>>>> remotes/origin/upstream
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
evas_object_geometry_get(wd->entry, &en_x, &en_y, &en_w, &en_h);
+<<<<<<< HEAD
+
+ if (wd->focused)
+ elm_widget_show_region_set(wd->entry, en_x, en_y, en_w, en_h, EINA_TRUE);
+=======
evas_object_geometry_get(wd->box, &bx_x, &bx_y, NULL, NULL);
if (wd->focused)
elm_widget_show_region_set(wd->box, en_x - bx_x, en_y - bx_y, en_w,
en_h, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
}
static void
if (!wd->box)
{
+<<<<<<< HEAD
+ wd->box = elm_box_add (obj);
+=======
wd->box = elm_box_add(obj);
+>>>>>>> remotes/origin/upstream
if (!wd->box) return;
elm_widget_sub_object_add(obj, wd->box);
elm_box_layout_set(wd->box, _box_layout_cb, NULL, NULL);
if (!wd->entry)
{
+<<<<<<< HEAD
+ wd->entry = elm_entry_add (obj);
+ if (!wd->entry) return;
+ elm_entry_scrollable_set(wd->entry, EINA_TRUE);
+=======
wd->entry = elm_entry_add(obj);
if (!wd->entry) return;
+>>>>>>> remotes/origin/upstream
elm_entry_single_line_set(wd->entry, EINA_TRUE);
elm_object_text_set(wd->entry, "");
elm_entry_input_panel_enabled_set(wd->entry, EINA_FALSE);
evas_object_size_hint_min_set(wd->entry, MIN_W_ENTRY, 0);
evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+<<<<<<< HEAD
+ if (wd->box) elm_box_pack_end (wd->box, wd->entry);
+=======
if (wd->box) elm_box_pack_end(wd->box, wd->entry);
+>>>>>>> remotes/origin/upstream
evas_object_show(wd->entry);
wd->view_state = MULTIBUTTONENTRY_VIEW_ENTRY;
}
end_type = edje_object_data_get(wd->base, "closed_button_type");
if (!end_type || !strcmp(end_type, "label"))
{
+<<<<<<< HEAD
+ wd->end = elm_label_add (obj);
+=======
wd->end = elm_label_add(obj);
+>>>>>>> remotes/origin/upstream
if (!wd->end) return;
elm_object_style_set(wd->end, "extended/multibuttonentry_default");
wd->end_type = MULTIBUTTONENTRY_CLOSED_LABEL;
if (size_str) button_min_height = (Evas_Coord)atoi(size_str);
wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE;
+<<<<<<< HEAD
+ evas_object_size_hint_min_set(wd->end, button_min_width * elm_scale_get(), button_min_height * elm_scale_get());
+=======
evas_object_size_hint_min_set(wd->end,
button_min_width * _elm_config->scale,
button_min_height * _elm_config->scale);
+>>>>>>> remotes/origin/upstream
elm_widget_sub_object_add(obj, wd->end);
}
}
if (wx)
{
+<<<<<<< HEAD
+ if ((elm_widget_is(opt->obj)) && (!(strcmp(elm_widget_type_get(opt->obj), "entry"))) && (mnw == -1))
+ mnw = MIN_W_ENTRY;
+
+=======
+>>>>>>> remotes/origin/upstream
if (mnw != -1 && (w - cw) >= mnw)
ww = w - cw;
else
ww = w;
}
else
+<<<<<<< HEAD
+ ww = mnw;
+=======
ww = mnw;
+>>>>>>> remotes/origin/upstream
if ((cw + mnw) > w)
{
Evas_Coord mnw, mnh, cw = 0, cmaxh = 0, w, ww;
const Eina_List *l;
Evas_Object_Box_Option *opt;
+<<<<<<< HEAD
+ int index = 0;
+=======
int local_index = 0;
+>>>>>>> remotes/origin/upstream
double wx;
evas_object_geometry_get(box, NULL, NULL, &w, NULL);
if (wx)
{
+<<<<<<< HEAD
+ if ((elm_widget_is(opt->obj)) && (!(strcmp(elm_widget_type_get(opt->obj), "entry"))) && (mnw == -1))
+ mnw = MIN_W_ENTRY;
+
+ if (mnw != -1 && (w - cw) >= mnw)
+ ww = w - cw;
+ else
+ ww = w;
+ }
+ else
+ ww = mnw;
+
+ if ((cw + ww) > w)
+ {
+ if (index > obj_index) return cmaxh;
+=======
if (mnw != -1 && (w - cw) >= mnw)
ww = w - cw;
else
if ((cw + ww) > w)
{
if (local_index > obj_index) return cmaxh;
+>>>>>>> remotes/origin/upstream
cw = 0;
cmaxh = 0;
}
cw += ww;
if (cmaxh < mnh) cmaxh = mnh;
+<<<<<<< HEAD
+ index++;
+=======
local_index++;
+>>>>>>> remotes/origin/upstream
}
return cmaxh;
if (wx)
{
+<<<<<<< HEAD
+ if ((elm_widget_is(obj)) && (!(strcmp(elm_widget_type_get(obj), "entry"))) && (mnw == -1))
+ mnw = MIN_W_ENTRY;
+
+ if (mnw != -1 && (w - cw) >= mnw)
+ ww = w - cw;
+ else
+ ww = w;
+ }
+ else
+ ww = mnw;
+=======
if (mnw != -1 && (w - cw) >= mnw)
ww = w - cw;
else
}
else
ww = mnw;
+>>>>>>> remotes/origin/upstream
hh = _calculate_item_max_height(o, priv, obj_index);
ow = mnw;
static void
_item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
{
+<<<<<<< HEAD
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+
+ Elm_Multibuttonentry_Item *item;
+ if (part && strcmp(part, "default")) return;
+ if (!label) return;
+ item = (Elm_Multibuttonentry_Item *) it;
+=======
Elm_Multibuttonentry_Item *item;
if (part && strcmp(part, "default")) return;
if (!label) return;
item = (Elm_Multibuttonentry_Item *)it;
+>>>>>>> remotes/origin/upstream
edje_object_part_text_set(item->button, "elm.btn.text", label);
_resize_button(item->button, &item->rw, &item->vw);
}
static const char *
_item_text_get_hook(const Elm_Object_Item *it, const char *part)
{
+<<<<<<< HEAD
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ Elm_Multibuttonentry_Item *item;
+ if (part && strcmp(part, "default")) return NULL;
+ item = (Elm_Multibuttonentry_Item *) it;
+=======
Elm_Multibuttonentry_Item *item;
if (part && strcmp(part, "default")) return NULL;
item = (Elm_Multibuttonentry_Item *)it;
+>>>>>>> remotes/origin/upstream
return edje_object_part_text_get(item->button, "elm.btn.text");
}
_text_set_hook(Evas_Object *obj, const char *part, const char *label)
{
ELM_CHECK_WIDTYPE(obj, widtype);
+<<<<<<< HEAD
+ if (part && strcmp(part, "default")) return;
+ if (label) _set_label(obj, label);
+ else _set_label(obj, "");
+=======
if (!part || !strcmp(part, "default"))
{
if (label) _set_label(obj, label);
if (label) _set_guidetext(obj, label);
else _set_guidetext(obj, "");
}
+>>>>>>> remotes/origin/upstream
}
static const char *
_text_get_hook(const Evas_Object *obj, const char *part)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+<<<<<<< HEAD
+ Widget_Data *wd;
+ if (part && strcmp(part, "default")) return NULL;
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ if (wd->label) return edje_object_part_text_get(wd->label, "mbe.label");
+=======
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
{
return wd->guidetexttxt;
}
+>>>>>>> remotes/origin/upstream
return NULL;
}
wd->focused = EINA_FALSE;
wd->last_btn_select = EINA_TRUE;
wd->n_str = 0;
+<<<<<<< HEAD
+ wd->rect_for_end= NULL;
+=======
wd->rect_for_end = NULL;
+>>>>>>> remotes/origin/upstream
wd->add_callback = NULL;
wd->add_callback_data = NULL;
return wd->entry;
}
+<<<<<<< HEAD
+EAPI const char *
+=======
EINA_DEPRECATED EAPI const char *
+>>>>>>> remotes/origin/upstream
elm_multibuttonentry_label_get(const Evas_Object *obj)
{
return _text_get_hook(obj, NULL);
}
+<<<<<<< HEAD
+EAPI void
+=======
EINA_DEPRECATED EAPI void
+>>>>>>> remotes/origin/upstream
elm_multibuttonentry_label_set(Evas_Object *obj, const char *label)
{
_text_set_hook(obj, NULL, label);
}
+<<<<<<< HEAD
+EAPI const char *
+=======
EINA_DEPRECATED EAPI const char *
+>>>>>>> remotes/origin/upstream
elm_multibuttonentry_guide_text_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
return NULL;
}
+<<<<<<< HEAD
+EAPI void
+=======
EINA_DEPRECATED EAPI void
+>>>>>>> remotes/origin/upstream
elm_multibuttonentry_guide_text_set(Evas_Object *obj, const char *guidetext)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+<<<<<<< HEAD
+ if (guidetext)
+ _set_guidetext(obj, guidetext);
+ else
+ _set_guidetext(obj, "");
+}
+
+EAPI int
+elm_multibuttonentry_shrink_mode_get(const Evas_Object *obj)
+{
+=======
_set_guidetext(obj, guidetext);
}
EAPI Eina_Bool
elm_multibuttonentry_expanded_get(const Evas_Object *obj)
{
+>>>>>>> remotes/origin/upstream
ELM_CHECK_WIDTYPE(obj, widtype) -1;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return -1;
+<<<<<<< HEAD
+ return wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ? 1 : 0;
+}
+
+EAPI void
+elm_multibuttonentry_shrink_mode_set(Evas_Object *obj, int shrink)
+{
+=======
return (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ? EINA_FALSE : EINA_TRUE);
}
EAPI void
elm_multibuttonentry_expanded_set(Evas_Object *obj, Eina_Bool expanded)
{
+>>>>>>> remotes/origin/upstream
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !wd->box ||
+<<<<<<< HEAD
+ ((wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) ? 1 : 0) == shrink) return;
+ _shrink_mode_set(obj, shrink);
+}
+
+EAPI Elm_Object_Item *
+elm_multibuttonentry_item_prepend(Evas_Object *obj, const char *label, void *data)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Elm_Multibuttonentry_Item *item;
+ if (!label) return NULL;
+ item = _add_button_item(obj, label, MULTIBUTTONENTRY_POS_START, NULL, data);
+ return (Elm_Object_Item *) item;
+}
+
+EAPI Elm_Object_Item *
+elm_multibuttonentry_item_append(Evas_Object *obj, const char *label, void *data)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Elm_Multibuttonentry_Item *item;
+ if (!label) return NULL;
+ item = _add_button_item(obj, label, MULTIBUTTONENTRY_POS_END, NULL, data);
+ return (Elm_Object_Item *) item;
+}
+
+EAPI Elm_Object_Item *
+elm_multibuttonentry_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *label, void *data)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Elm_Multibuttonentry_Item *item;
+ if (!label) return NULL;
+ item = _add_button_item(obj, label, MULTIBUTTONENTRY_POS_BEFORE,
+ (Elm_Multibuttonentry_Item *) before, data);
+ return (Elm_Object_Item *) item;
+}
+
+EAPI Elm_Object_Item *
+elm_multibuttonentry_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *label, void *data)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Elm_Multibuttonentry_Item *item;
+ if (!label) return NULL;
+ item = _add_button_item(obj, label, MULTIBUTTONENTRY_POS_AFTER,
+ (Elm_Multibuttonentry_Item *) after, data);
+ return (Elm_Object_Item *) item;
+=======
((wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) ? EINA_FALSE : EINA_TRUE) == expanded) return;
if (expanded)
elm_multibuttonentry_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data)
{
return _add_button_item(obj, label, MULTIBUTTONENTRY_POS_AFTER, after, func, data);
+>>>>>>> remotes/origin/upstream
}
EAPI const Eina_List *
}
EAPI void
+<<<<<<< HEAD
+elm_multibuttonentry_item_select(Elm_Object_Item *it, Eina_Bool selected)
+{
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+ Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *) it;
+=======
elm_multibuttonentry_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *)it;
+>>>>>>> remotes/origin/upstream
if (selected) _select_button(WIDGET(item), item->button);
else _select_button(WIDGET(item), NULL);
}
+<<<<<<< HEAD
+EAPI void
+elm_multibuttonentry_item_unselect_all(Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ _select_button(obj, NULL);
+=======
EAPI Eina_Bool
elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it)
{
//TODO : To be implemented.
if (!it) return EINA_FALSE;
return EINA_TRUE;
+>>>>>>> remotes/origin/upstream
}
EAPI void
EINA_LIST_FOREACH(wd->items, l, _item)
{
+<<<<<<< HEAD
+ if (_item == (Elm_Multibuttonentry_Item *) it)
+=======
if (_item == (Elm_Multibuttonentry_Item *)it)
+>>>>>>> remotes/origin/upstream
{
l = eina_list_prev(l);
if (!l) return NULL;
EINA_LIST_FOREACH(wd->items, l, _item)
{
+<<<<<<< HEAD
+ if (_item == (Elm_Multibuttonentry_Item *) it)
+=======
if (_item == (Elm_Multibuttonentry_Item *)it)
+>>>>>>> remotes/origin/upstream
{
l = eina_list_next(l);
if (!l) return NULL;
EAPI void *
elm_multibuttonentry_item_data_get(const Elm_Object_Item *it)
{
+<<<<<<< HEAD
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+=======
+>>>>>>> remotes/origin/upstream
return elm_widget_item_data_get(it);
}
EAPI void
elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data)
{
+<<<<<<< HEAD
+ ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+=======
+>>>>>>> remotes/origin/upstream
return elm_widget_item_data_set(it, data);
}
EAPI void
+<<<<<<< HEAD
+elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+=======
elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
+>>>>>>> remotes/origin/upstream
{
Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
EINA_LIST_FOREACH(wd->filter_list, l, _item_filter)
{
+<<<<<<< HEAD
+ if ( _item_filter && ((_item_filter->callback_func == func) && (_item_filter->data == data)))
+=======
if (_item_filter && ((_item_filter->callback_func == func) && (_item_filter->data == data)))
+>>>>>>> remotes/origin/upstream
{
printf("Already Registered this item filter!!!!\n");
return;
}
EAPI void
+<<<<<<< HEAD
+elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+=======
elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
+>>>>>>> remotes/origin/upstream
{
Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL;
Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
}
EAPI void
+<<<<<<< HEAD
+elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_callback func, void *data)
+=======
elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data)
+>>>>>>> remotes/origin/upstream
{
Widget_Data *wd;
Eina_List *l;
}
}
}
+<<<<<<< HEAD
+
+EAPI void
+elm_multibuttonentry_view_mode(Evas_Object *obj, Eina_Bool view_mode)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ wd->view_mode = view_mode;
+
+ if (view_mode)
+ {
+ elm_box_unpack(wd->box, wd->entry);
+ evas_object_hide(wd->entry);
+ }
+ else
+ _view_update(obj);
+}
+=======
+>>>>>>> remotes/origin/upstream
projects / framework / uifw / elementary.git / blobdiff