struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_add_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_add_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_entry_eraser_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_entry_eraser_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_entry_eraser_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_entry_eraser_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_entry_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_entry_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_entry_single_line_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_entry_single_line_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_entry_single_line_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_entry_single_line_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_guide_text_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_guide_text_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_guide_text_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_guide_text_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_label_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_label_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_label_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_label_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_left_icon_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_left_icon_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
static void utc_UIFW_elm_editfield_left_icon_get_func_02(void)
{
Evas_Object *r = NULL;
- r = elm_editfield_left_icon_get(ef);
+ r = elm_editfield_left_icon_get(NULL);
if (r) {
tet_infoline("elm_editfield_left_icon_get() failed in negative test case");
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_left_icon_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_left_icon_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_right_icon_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_right_icon_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_editfield_right_icon_set_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_editfield_right_icon_set_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_context_menu_disabled_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_context_menu_disabled_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_content_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_content_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_down_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_down_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_is_format_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_is_format_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_is_visible_format_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_is_visible_format_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_next_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_next_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_prev_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_prev_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_cursor_up_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_cursor_up_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_editable_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_editable_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_entry_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_entry_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_imf_context_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_imf_context_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
test_eo = elm_entry_add(test_win);
ctx = elm_entry_imf_context_get(test_eo);
- TET_CHECK_FAIL(NULL, ctx);
+ TET_CHECK_PASS(NULL, ctx);
tet_result(TET_PASS);
tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_entry_imf_context_get");
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_markup_to_utf8_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_markup_to_utf8_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_password_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_password_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_selection_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_selection_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
const char *str = NULL;
str = elm_entry_selection_get(entry);
- if (!ret) {
+ if (!str) {
tet_infoline("elm_entry_selection_get() failed in positive test case");
tet_result(TET_FAIL);
return;
const char *str = NULL;
str = elm_entry_selection_get(NULL);
- if (ret) {
+ if (str) {
tet_infoline("elm_entry_selection_get() failed in negative test case");
tet_result(TET_FAIL);
return;
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_single_line_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_single_line_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_utf8_to_markup_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_utf8_to_markup_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
struct tet_testlist tet_testlist[] = {
{ utc_UIFW_elm_entry_wrap_width_get_func_01, POSITIVE_TC_IDX },
{ utc_UIFW_elm_entry_wrap_width_get_func_02, NEGATIVE_TC_IDX },
+ { NULL, 0 }
};
static void startup(void)
+elementary (1.0.0+svn.61256slp2+build48) unstable; urgency=low
+
+ * Package Upload.
+ * Git: 165.213.180.234:slp/pkgs/e/elementary
+ * Tag: elementary_1.0.0+svn.61256slp2+build48
+
+ -- ChunEon Park <chuneon.park@samsung.com> Mon, 10 Oct 2011 21:08:54 +0900
+
+elementary (1.0.0+svn.61256slp2+build47) unstable; urgency=low
+
+ * Package Upload.
+ * Git: 165.213.180.234:slp/pkgs/e/elementary
+ * Tag: elementary_1.0.0+svn.61256slp2+build47
+
+ -- ChunEon Park <chuneon.park@samsung.com> Fri, 07 Oct 2011 19:22:09 +0900
+
elementary (1.0.0+svn.61256slp2+build46) unstable; urgency=low
* Package Upload.
EAPI const Evas_Object *elm_genlist_item_object_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
EAPI void elm_genlist_item_update(Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
EAPI void elm_genlist_item_item_class_update(Elm_Genlist_Item *it, const Elm_Genlist_Item_Class *itc) EINA_ARG_NONNULL(1, 2);
+ EAPI const Elm_Genlist_Item_Class *elm_genlist_item_item_class_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
EAPI void elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *item, const char *text) EINA_ARG_NONNULL(1);
EAPI void elm_genlist_item_tooltip_content_cb_set(Elm_Genlist_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb) EINA_ARG_NONNULL(1);
EAPI void elm_genlist_item_tooltip_unset(Elm_Genlist_Item *item) EINA_ARG_NONNULL(1);
*/
EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it) EINA_ARG_NONNULL(1);
/**
- * @brief Delete's the given item.
+ * @brief Delete the given item instantly.
*
* @param it The naviframe item
+ *
+ * This just deletes the given item from the naviframe item list instantly.
+ * So this would not emit any signals for view transitions but just change
+ * the current view if the given item is a top one.
+ *
*/
EAPI void elm_naviframe_item_del(Elm_Object_Item *it) EINA_ARG_NONNULL(1);
/**
evas_object_move(wd->arrow, arrow_size.x, arrow_size.y);
}
+//TODO: compress item - different from opensource
+static void
+_compress_item(Evas_Object *obj)
+{
+ Widget_Data *wd;
+ Eina_List *elist;
+ Elm_Ctxpopup_Item *item;
+
+ wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ EINA_LIST_FOREACH(wd->items, elist, item)
+ {
+ edje_object_signal_emit(item->base.view, "elm,state,compress", "elm");
+ }
+}
+
static void
_sizing_eval(Evas_Object *obj)
{
//Base
wd->dir = _calc_base_geometry(obj, &rect);
+
+ //TODO: compress item - different from opensource
+ if (!wd->horizontal && !wd->content)
+ _compress_item(obj);
+
_update_arrow(obj, wd->dir);
_shift_base_by_arrow(wd->arrow, wd->dir, &rect);
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- return NULL;
+ if ((!wd) || (!wd->stack)) return NULL;
+ return wd->stack->data;
}
EAPI void
int i;
int start = 0;
- if (!strcmp(tag_str, "item") && !strcmp(tag_name, "href"))
+ if ((!strncmp(tag_str, "<item", 5) && !strcmp(tag_name, "href")) // EFL img tag
+ || (!strncmp(tag_str, "<img", 4) && !strcmp(tag_name, "src"))) // HTML img tag
start = 1;
for (i = start; i < spCnt; i++)
if (!startTag)
startTag = strstr(insertStr, "</item");
if (startTag)
- endTag = strstr(insertStr, ">");
+ endTag = strstr(startTag, ">");
else
break;
if (!endTag || startTag > endTag)
wd->r_items = NULL;
}
- _selected_item_indicate(wd->selected_item);
_sizing_eval(obj);
}
elm_widget_sub_object_del(obj, wd->licon);
if (icon)
{
- if (!(edje_object_part_swallow(wd->base, "left_icon", icon)))
- return;
+ edje_object_part_swallow(wd->base, "left_icon", icon);
wd->licon = icon;
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
elm_widget_sub_object_del(obj, wd->ricon);
if (icon)
{
- if ( !(edje_object_part_swallow(wd->base, "right_icon", icon)) )
- return;
+ edje_object_part_swallow(wd->base, "right_icon", icon);
wd->ricon = icon;
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
elm_entry_wrap_width_set(Evas_Object *obj, Evas_Coord w)
{
Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
if (wd->wrap_w == w) return;
wd->wrap_w = w;
_sizing_eval(obj);
elm_entry_wrap_width_get(const Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
return wd->wrap_w;
}
static void
_item_select(Elm_Genlist_Item *it)
{
+ Eina_List *l;
+ Evas_Object *obj;
+ Evas_Object *parent = it->base.widget;
if ((it->wd->no_select) || (it->delete_me) || (it->mode_view)) return;
if (it->selected)
{
it->selected = EINA_TRUE;
it->wd->selected = eina_list_append(it->wd->selected, it);
call:
- evas_object_ref(it->base.widget);
+ evas_object_ref(parent);
it->walking++;
it->wd->walking++;
- if (it->func.func) it->func.func((void *)it->func.data, it->base.widget, it);
+ if (it->wd->last_selected_item && (it != it->wd->last_selected_item))
+ {
+ EINA_LIST_FOREACH(it->wd->last_selected_item->icon_objs, l, obj)
+ elm_widget_focused_object_clear(obj);
+ }
+ if (it->func.func) it->func.func((void *)it->func.data, parent, it);
if (!it->delete_me)
- evas_object_smart_callback_call(it->base.widget, SIG_SELECTED, it);
+ evas_object_smart_callback_call(parent, SIG_SELECTED, it);
it->walking--;
it->wd->walking--;
if ((it->wd->clear_me) && (!it->wd->walking))
{
- elm_genlist_clear(it->base.widget);
- return;
+ elm_genlist_clear(parent);
+ goto end;
}
else
{
if ((!it->walking) && (it->delete_me))
{
if (!it->relcount) _item_del(it);
+ goto end;
}
}
if (it && it->wd) it->wd->last_selected_item = it; // TODO: Remove 'if'?
- evas_object_unref(it->base.widget);
+end:
+ evas_object_unref(parent);
}
static void
{
Elm_Genlist_Item *it = data, *it_tmp;
Eina_List *list, *l;
- //static Eina_Bool contracted = EINA_FALSE;
it->long_timer = NULL;
if ((it->disabled) || (it->dragging) || (it->display_only) || (it->wd->rename_it))
evas_event_freeze(te);
it->nocache = EINA_FALSE;
_mode_item_unrealize(it);
+ if (it->group_item)
+ evas_object_raise(it->group_item->base.view);
snprintf(buf, sizeof(buf), "elm,state,%s,passive,finished", it->wd->mode_type);
edje_object_signal_callback_del_full(obj, buf, "elm", _mode_finished_signal_cb, it);
evas_event_thaw(te);
free(itc);
}
+static const char *
+_item_label_hook(Elm_Genlist_Item *it, const char *part)
+{
+ if (!it->itc->func.label_get) return NULL;
+ return edje_object_part_text_get(it->base.view, part);
+}
+
static void
_icon_focused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
}
static void
+_item_label_realize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source)
+{
+ if (it->itc->func.label_get)
+ {
+ const Eina_List *l;
+ const char *key;
+
+ *source = elm_widget_stringlist_get(edje_object_data_get(target, "labels"));
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ char *s = it->itc->func.label_get
+ ((void *)it->base.data, it->base.widget, key);
+
+ if (s)
+ {
+ edje_object_part_text_set(target, key, s);
+ free(s);
+ }
+ else
+ {
+ edje_object_part_text_set(target, key, "");
+ }
+ }
+ }
+}
+
+static Eina_List *
+_item_icon_realize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source)
+{
+ Eina_List *res = NULL;
+
+ if (it->itc->func.icon_get)
+ {
+ const Eina_List *l;
+ const char *key;
+
+ *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ Evas_Object *ic = it->itc->func.icon_get
+ ((void *)it->base.data, it->base.widget, key);
+
+ if (ic)
+ {
+ res = eina_list_append(res, ic);
+ edje_object_part_swallow(target, key, ic);
+ evas_object_show(ic);
+ elm_widget_sub_object_add(it->base.widget, ic);
+ evas_object_event_callback_add(ic, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it);
+ if (it->disabled)
+ elm_widget_disabled_set(ic, EINA_TRUE);
+ }
+ }
+ }
+
+ return res;
+}
+
+static void
+_item_state_realize(Elm_Genlist_Item *it,
+ Evas_Object *target,
+ Eina_List **source)
+{
+ if (it->itc->func.state_get)
+ {
+ const Eina_List *l;
+ const char *key;
+ char buf[4096];
+
+ *source = elm_widget_stringlist_get(edje_object_data_get(target, "states"));
+ EINA_LIST_FOREACH(*source, l, key)
+ {
+ Eina_Bool on = it->itc->func.state_get
+ ((void *)it->base.data, it->base.widget, key);
+
+ if (on)
+ {
+ snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
+ edje_object_signal_emit(target, buf, "elm");
+ }
+ else
+ {
+ snprintf(buf, sizeof(buf), "elm,state,%s,passive", key);
+ edje_object_signal_emit(target, buf, "elm");
+ }
+ }
+ }
+}
+
+static void
_item_realize(Elm_Genlist_Item *it,
int in,
Eina_Bool calc)
}
else
{
- if (it->itc->func.label_get)
+ _item_label_realize(it, it->base.view, &it->labels);
+ it->icon_objs = _item_icon_realize(it, it->base.view, &it->icons);
+ _item_state_realize(it, it->base.view, &it->states);
+ if (it->itc->func.icon_get) // for rename mode
{
const Eina_List *l;
const char *key;
-
- it->labels =
- elm_widget_stringlist_get(edje_object_data_get(it->base.view,
- "labels"));
- EINA_LIST_FOREACH(it->labels, l, key)
- {
- char *s = it->itc->func.label_get
- ((void *)it->base.data, it->base.widget, l->data);
-
- if (s)
- {
- edje_object_part_text_set(it->base.view, l->data, s);
- free(s);
- }
- else if (itc)
- edje_object_part_text_set(it->base.view, l->data, "");
- }
- }
- if (it->itc->func.icon_get)
- {
- const Eina_List *l;
- const char *key;
-
- it->icons =
- elm_widget_stringlist_get(edje_object_data_get(it->base.view,
- "icons"));
- EINA_LIST_FOREACH(it->icons, l, key)
- {
- Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, l->data);
-
- if (ic)
- {
- it->icon_objs = eina_list_append(it->icon_objs, ic);
- edje_object_part_swallow(it->base.view, key, ic);
- evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
- evas_object_event_callback_add(ic, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it);
- if (it->disabled)
- elm_widget_disabled_set(ic, EINA_TRUE);
- }
- }
if (it->renamed)
{
it->icons =
- elm_widget_stringlist_get(edje_object_data_get(it->base.view, "renames"));
+ elm_widget_stringlist_get(edje_object_data_get(it->base.view, "renames"));
EINA_LIST_FOREACH(it->icons, l, key)
{
Evas_Object *ic = it->itc->func.icon_get
- ((void *)it->base.data, it->base.widget, l->data);
+ ((void *)it->base.data, it->base.widget, l->data);
if (ic)
{
- it->icon_objs = eina_list_append(it->icon_objs, ic);
- edje_object_part_swallow(it->base.view, key, ic);
- evas_object_show(ic);
- elm_widget_sub_object_add(it->base.widget, ic);
- // FIXME: if entry calcuates its cursor position correctly and conformant works,
- // genlist does not need to handle this focus thing.
- evas_object_smart_callback_add(ic, "focused", _icon_focused, it);
- evas_object_smart_callback_add(ic, "unfocused", _icon_unfocused, it);
+ it->icon_objs = eina_list_append(it->icon_objs, ic);
+ edje_object_part_swallow(it->base.view, key, ic);
+ evas_object_show(ic);
+ elm_widget_sub_object_add(it->base.widget, ic);
+ // FIXME: if entry calcuates its cursor position correctly and conformant works,
+ // genlist does not need to handle this focus thing.
+ evas_object_smart_callback_add(ic, "focused", _icon_focused, it);
+ evas_object_smart_callback_add(ic, "unfocused", _icon_unfocused, it);
}
}
- }
- }
- if (it->itc->func.state_get)
- {
- const Eina_List *l;
- const char *key;
-
- it->states =
- elm_widget_stringlist_get(edje_object_data_get(it->base.view,
- "states"));
- EINA_LIST_FOREACH(it->states, l, key)
- {
- Eina_Bool on = it->itc->func.state_get
- ((void *)it->base.data, it->base.widget, l->data);
-
- if (on)
- {
- snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
- edje_object_signal_emit(it->base.view, buf, "elm");
- }
- else if (itc)
- {
- snprintf(buf, sizeof(buf), "elm,state,%s,passive", key);
- edje_object_signal_emit(it->base.view, buf, "elm");
- }
}
}
if (!it->mincalcd || it->wd->pan_resize || ((it->wd->height_for_width) && (it->w != it->minw)))
}
else
{
- edje_object_mirrored_set(it->base.view, elm_widget_mirrored_get(it->base.widget));
+ edje_object_mirrored_set(it->base.view,
+ elm_widget_mirrored_get(it->base.widget));
+ edje_object_scale_set(it->base.view,
+ elm_widget_scale_get(it->base.widget)
+ * _elm_config->scale);
_item_cache_add(it);
}
elm_widget_stringlist_free(it->labels);
}
static void
-_item_block_realize(Item_Block *itb,
- int in,
- int full)
+_item_block_realize(Item_Block *itb)
{
- const Eina_List *l;
- Elm_Genlist_Item *it;
-
if (itb->realized) return;
- evas_event_freeze(evas_object_evas_get(itb->wd->obj));
- EINA_LIST_FOREACH(itb->items, l, it)
- {
- if (it->delete_me) continue;
- if (full) _item_realize(it, in, EINA_FALSE);
- in++;
- }
itb->realized = EINA_TRUE;
itb->want_unrealize = EINA_FALSE;
- evas_event_thaw(evas_object_evas_get(itb->wd->obj));
- evas_event_thaw_eval(evas_object_evas_get(itb->wd->obj));
}
static void
if (it->block->count == 1)
it->wd->reorder_rel = it;
}
- else if ((it->wd->reorder_start_y >= it->block->y) && (roy - oy + roh/2 <= it->block->y - it->wd->pan_y))
+ else if ((it->wd->reorder_start_y >= it->block->y) &&
+ (roy - oy + (roh / 2) <= it->block->y - it->wd->pan_y))
{
it->block->reorder_offset = it->wd->reorder_it->h;
}
}
else
{
- if (!it->dragging) _item_unrealize(it, EINA_FALSE);
+ if (!it->dragging && (!it->wd->item_moving_effect_timer)) _item_unrealize(it, EINA_FALSE);
}
}
in++;
Widget_Data *wd = data;
Item_Block *itb, *chb = NULL;
Evas_Coord minw = -1, minh = 0, y = 0, ow;
- int in = 0, minw_change = 0;
- Eina_Bool changed = EINA_FALSE;
+ int in = 0;
double t0, t;
+ Eina_Bool minw_change = EINA_FALSE;
Eina_Bool did_must_recalc = EINA_FALSE;
if (!wd) return;
{
if (itb->realized) _item_block_unrealize(itb);
}
- if ((itb->changed) || (changed) ||
- ((itb->must_recalc) && (!did_must_recalc)))
+ if ((itb->changed) || ((itb->must_recalc) && (!did_must_recalc)))
{
- if ((changed) || (itb->must_recalc))
+ if (itb->must_recalc)
{
Eina_List *l;
Elm_Genlist_Item *it;
cvx, cvy, cvw, cvh))
{
if ((!itb->realized) || (itb->changed))
- _item_block_realize(itb, in, 0);
+ _item_block_realize(itb);
_item_block_position(itb, in);
}
else
_mouse_move, it);
/* label_get, icon_get, state_get */
- if (it->itc->func.label_get)
- {
- const Eina_List *l;
- const char *key;
-
- it->mode_labels =
- elm_widget_stringlist_get(edje_object_data_get(it->mode_view,
- "labels"));
- EINA_LIST_FOREACH(it->mode_labels, l, key)
- {
- char *s = it->itc->func.label_get
- ((void *)it->base.data, it->base.widget, l->data);
-
- if (s)
- {
- edje_object_part_text_set(it->mode_view, l->data, s);
- free(s);
- }
- }
- }
+ _item_label_realize(it, it->mode_view, &it->mode_labels);
if (it->itc->func.icon_get)
{
const Eina_List *l;
}
}
}
- if (it->itc->func.state_get)
- {
- const Eina_List *l;
- const char *key;
-
- it->mode_states =
- elm_widget_stringlist_get(edje_object_data_get(it->mode_view,
- "states"));
- EINA_LIST_FOREACH(it->mode_states, l, key)
- {
- Eina_Bool on = it->itc->func.state_get
- ((void *)it->base.data, it->base.widget, l->data);
-
- if (on)
- {
- snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
- edje_object_signal_emit(it->mode_view, buf, "elm");
- }
- }
- }
-
+ _item_state_realize(it, it->mode_view, &it->mode_states);
edje_object_part_swallow(it->mode_view,
edje_object_data_get(it->mode_view, "mode_part"),
it->base.view);
evas_event_freeze(evas_object_evas_get(it->wd->obj));
_mode_item_realize(it);
+ if (it->group_item)
+ evas_object_raise(it->group_item->base.view);
_item_position(it, it->mode_view, it->scrl_x, it->scrl_y);
evas_event_thaw(evas_object_evas_get(it->wd->obj));
evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
wd->mode_item = NULL;
}
+
+static void
+_item_auto_scroll(void *data)
+{
+ Widget_Data *wd = data;
+ if (!wd) return;
+
+ if ((wd->expand_item) && (!wd->auto_scrolled))
+ {
+ Elm_Genlist_Item *it;
+ Eina_List *l;
+ Evas_Coord ox, oy, ow, oh;
+ evas_object_geometry_get(wd->obj, &ox, &oy, &ow, &oh);
+
+ wd->auto_scrolled = EINA_TRUE;
+ if (wd->expand_item->scrl_y > (oh + oy) / 2)
+ {
+ EINA_LIST_FOREACH(wd->expand_item->items, l, it)
+ {
+ elm_genlist_item_bring_in(it);
+ }
+ }
+ }
+}
EAPI Evas_Object *
elm_genlist_add(Evas_Object *parent)
{
it->func.data = func_data;
it->mouse_cursor = NULL;
it->expanded_depth = 0;
+ elm_widget_item_text_get_hook_set(it, _item_label_hook);
if (it->parent)
{
Evas_Object *obj;
if (it->disabled == disabled) return;
if (it->delete_me) return;
- it->disabled = disabled;
+ it->disabled = !!disabled;
if (it->selected)
elm_genlist_item_selected_set(it, EINA_FALSE);
if (it->realized)
}
static Evas_Object *
_elm_genlist_item_label_create(void *data,
- Evas_Object *obj,
+ Evas_Object *obj __UNUSED__,
+ Evas_Object *tooltip,
void *item __UNUSED__)
{
- Evas_Object *label = elm_label_add(obj);
+ Evas_Object *label = elm_label_add(tooltip);
if (!label)
return NULL;
elm_object_style_set(label, "tooltip");
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- elm_smart_scroller_bounce_allow_get(obj, h_bounce, v_bounce);
+ elm_smart_scroller_bounce_allow_get(wd->scr, h_bounce, v_bounce);
}
EAPI void
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
+ if ((!wd) || (!wd->scr)) return;
if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
(policy_v >= ELM_SCROLLER_POLICY_LAST))
return;
- if (wd->scr)
- elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
+ elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
}
EAPI void
elm_genlist_item_update(it);
}
-/**
- * Set genlist item mode
- *
- * @param item The genlist item
- * @param mode Mode name
- * @param mode_set Boolean to define set or unset mode.
- *
- * @ingroup Genlist
- */
EAPI void
elm_genlist_item_mode_set(Elm_Genlist_Item *it,
const char *mode_type,
if (mode_set) _item_mode_set(it);
}
-/**
- * Get active genlist mode type
- *
- * @param obj The genlist object
- *
- * @ingroup Genlist
- */
EAPI const char *
elm_genlist_mode_get(const Evas_Object *obj)
{
return wd->mode_type;
}
-/**
- * Get active genlist mode item
- *
- * @param obj The genlist object
- *
- * @ingroup Genlist
- */
EAPI const Elm_Genlist_Item *
elm_genlist_mode_item_get(const Evas_Object *obj)
{
it = elm_genlist_item_prev_get(it);
}
}
+ if (wd->calc_job) ecore_job_del(wd->calc_job);
+ wd->calc_job = ecore_job_add(_calc_job, wd);
}
else
{
_item_auto_scroll(wd);
evas_object_lower(wd->alpha_bg);
evas_object_hide(wd->alpha_bg);
- if (wd->calc_job) ecore_job_del(wd->calc_job);
- wd->calc_job = ecore_job_add(_calc_job, wd);
elm_smart_scroller_bounce_animator_disabled_set(wd->scr, EINA_FALSE);
wd->move_effect_mode = ELM_GENLIST_ITEM_MOVE_EFFECT_NONE;
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
return item->renamed;
}
-
-static void
-_item_auto_scroll(void *data)
-{
- Widget_Data *wd = data;
- if (!wd) return;
-
- if ((wd->expand_item) && (!wd->auto_scrolled))
- {
- Elm_Genlist_Item *it;
- Eina_List *l;
- Evas_Coord ox, oy, ow, oh;
- evas_object_geometry_get(wd->obj, &ox, &oy, &ow, &oh);
-
- wd->auto_scrolled = EINA_TRUE;
- if (wd->expand_item->scrl_y > (oh + oy) / 2)
- {
- EINA_LIST_FOREACH(wd->expand_item->items, l, it)
- {
- elm_genlist_item_bring_in(it);
- }
- }
- }
-}
static void _theme_hook(Evas_Object *obj);
static void _on_focus_hook(void *data, Evas_Object *obj);
static void _sizing_eval(Evas_Object *obj);
-static void _clicked(void *data, Evas_Object *obj, void *event_info);
+static void _clicked(void *data, Evas_Object *obj,
+ const char *emission, const char *source);
static void _changed(void *data, Evas_Object *obj, void *event_info);
static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info);
}
static void _clicked(void *data, Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
+ const char *emission __UNUSED__, const char *source __UNUSED__)
{
- Widget_Data *wd = elm_widget_data_get(data);
- if (!wd) return;
-
evas_object_smart_callback_call(data, "clicked", NULL);
}
}
static void
-_basebg_clicked(void *data, Evas_Object *obj, const char *emission __UNUSED__,
- const char *source)
+_searchsymbol_clicked(void *data, Evas_Object *obj __UNUSED__,
+ const char *emission __UNUSED__,
+ const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
-
- if (!strcmp(source, "base_bg"))
- _clicked(data, obj, NULL);
+ evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
}
static void
-_searchsymbol_clicked(void *data, Evas_Object *obj __UNUSED__,
- const char *emission __UNUSED__,
- const char *source __UNUSED__)
+_elm_searchbar_text_set(Evas_Object *obj, const char *item, const char *text)
{
- Widget_Data *wd = elm_widget_data_get(data);
-
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (item && strcmp(item, "default")) return;
if (!wd) return;
- evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
+ elm_entry_entry_set(elm_editfield_entry_get(wd->ef), text);
}
+static const char *
+_elm_searchbar_text_get(const Evas_Object *obj, const char *item)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (item && strcmp(item, "default")) return NULL;
+ if (!wd) return NULL;
+ return elm_entry_entry_get(elm_editfield_entry_get(wd->ef));
+}
+
+
/**
* Add a new searchbar to the parent
* @param parent The parent object
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
- elm_widget_on_focus_hook_set( obj, _on_focus_hook, NULL );
- elm_widget_can_focus_set(obj, 1 );
+ elm_widget_on_focus_hook_set( obj, _on_focus_hook, NULL);
+ elm_widget_can_focus_set(obj, EINA_TRUE);
+ elm_widget_text_set_hook_set(obj, _elm_searchbar_text_set);
+ elm_widget_text_get_hook_set(obj, _elm_searchbar_text_get);
wd->base = edje_object_add(e);
- if (wd->base == NULL) return NULL;
-
_elm_theme_object_set(obj, wd->base, "searchbar", "base", "default");
+ elm_widget_resize_object_set(obj, wd->base);
// Add Entry
- wd->ef = elm_editfield_add(parent);
+ wd->ef = elm_editfield_add(obj);
elm_object_style_set(wd->ef, "searchbar/default");
edje_object_part_swallow(wd->base, "search_textfield", wd->ef);
elm_editfield_guide_text_set(wd->ef, E_("Search"));
elm_editfield_entry_single_line_set(wd->ef, EINA_TRUE);
elm_editfield_eraser_set(wd->ef, EINA_TRUE);
- evas_object_smart_callback_add(wd->ef, "clicked", _clicked, obj);
evas_object_smart_callback_add(elm_editfield_entry_get(wd->ef), "changed", _changed, obj);
- edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _basebg_clicked, obj);
+ edje_object_signal_callback_add(wd->base, "mouse,clicked,1", "*", _clicked, obj);
edje_object_signal_callback_add(wd->base, "elm,action,click", "", _searchsymbol_clicked, obj);
- elm_widget_sub_object_add(obj, wd->ef);
-
// Add Button
- wd->cancel_btn = elm_button_add(parent);
+ wd->cancel_btn = elm_button_add(obj);
edje_object_part_swallow(wd->base, "button_cancel", wd->cancel_btn);
-
snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
elm_object_style_set(wd->cancel_btn, buf);
-
elm_object_text_set(wd->cancel_btn, E_("Cancel"));
evas_object_smart_callback_add(wd->cancel_btn, "clicked", _cancel_clicked, obj);
- elm_widget_sub_object_add(obj, wd->cancel_btn);
wd->cancel_btn_ani_flag = EINA_FALSE;
wd->cancel_btn_show_mode = EINA_TRUE;
wd->boundary_mode = EINA_TRUE;
- elm_widget_resize_object_set(obj, wd->base);
-
_sizing_eval(obj);
return obj;
*/
EAPI void elm_searchbar_text_set(Evas_Object *obj, const char *entry)
{
- ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
-
- elm_entry_entry_set(elm_editfield_entry_get(wd->ef), entry);
+ _elm_searchbar_text_set(obj, NULL, entry);
}
/**
*/
EAPI const char* elm_searchbar_text_get(Evas_Object *obj)
{
- ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
-
- return elm_entry_entry_get(elm_editfield_entry_get(wd->ef));
+ return _elm_searchbar_text_get(obj, NULL);
}
/**
{
Widget_Data *wd = elm_widget_data_get((Evas_Object*)data);
if (elm_widget_disabled_get(data)) return;
- edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
- edje_object_message_signal_process(wd->slider);
_val_fetch(data);
_units_set(data);
_indicator_set(data);
+ edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
+ edje_object_message_signal_process(wd->slider);
}
static void
if (elm_widget_disabled_get(data)) return;
_val_fetch(data);
evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
- edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
- edje_object_message_signal_process(wd->slider);
_units_set(data);
_indicator_set(data);
elm_widget_scroll_freeze_push(data);
+ edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
+ edje_object_message_signal_process(wd->slider);
}
static void
projects / framework / uifw / elementary.git / commitdiff