From: Goun Lee Date: Tue, 11 Oct 2011 09:33:27 +0000 (+0900) Subject: Merge "[elm_multibuttonentry]Changed UX: Added button to close expanded box Change... X-Git-Tag: REL_F_I9200_20111014_1~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d1100cd66bf9654f93b863c813f7d53183af3e0;hp=6041977c07afb4e5d060acf9c8eaec4947b52dae;p=framework%2Fuifw%2Felementary.git Merge "[elm_multibuttonentry]Changed UX: Added button to close expanded box Change-Id: Ic5488ea6fd472c87532f249d145b6371fea179b1" --- diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_add_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_add_func.c index 487e01c..73563a2 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_add_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_add_func.c @@ -46,6 +46,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_get_func.c index 85e72e9..cf5aca2 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_set_func.c index a516a0c..29df972 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_set_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_get_func.c index 9d3a913..0ea0e6a 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_get_func.c index 3166810..5f181b2 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_set_func.c index 97ec8fc..d772d95 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_set_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_get_func.c index 7aee1ab..0939ba6 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_set_func.c index c8d40fe..54864f1 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_set_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_get_func.c index 8f9ca66..75ce807 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_set_func.c index b732f2b..6953abb 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_label_set_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c index ed760da..942de2b 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c @@ -48,6 +48,7 @@ enum { 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) @@ -103,7 +104,7 @@ static void utc_UIFW_elm_editfield_left_icon_get_func_01(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"); diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c index 2178736..2800b34 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c @@ -48,6 +48,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c index 203cd31..296c0f6 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c @@ -48,6 +48,7 @@ enum { 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) diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c index 0f7c726..7335101 100644 --- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c +++ b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c @@ -48,6 +48,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_context_menu_disabled_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_context_menu_disabled_get_func.c index 8d46ac4..98115ff 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_context_menu_disabled_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_context_menu_disabled_get_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_content_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_content_get_func.c index f18d1cc..f2de52c 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_content_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_content_get_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_down_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_down_func.c index afbde64..ee126a9 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_down_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_down_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_format_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_format_get_func.c index 230c6fd..7a1d9ea 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_format_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_format_get_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_visible_format_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_visible_format_get_func.c index c672fcb..8dcad5d 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_visible_format_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_is_visible_format_get_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_next_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_next_func.c index cdacbaa..21f05ea 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_next_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_next_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_prev_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_prev_func.c index 62d1f5d..820d3a6 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_prev_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_prev_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_up_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_up_func.c index fa53742..9ec4441 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_up_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_cursor_up_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_editable_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_editable_get_func.c index 699585c..1604e4c 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_editable_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_editable_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_entry_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_entry_get_func.c index b7665a4..8f4fe5b 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_entry_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_entry_get_func.c @@ -48,6 +48,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_imf_context_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_imf_context_get_func.c index 6d8c6b4..fa88966 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_imf_context_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_imf_context_get_func.c @@ -69,6 +69,7 @@ enum { 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) @@ -127,7 +128,7 @@ static void utc_UIFW_elm_entry_imf_context_get_func_01(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"); diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_markup_to_utf8_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_markup_to_utf8_func.c index 1858ca3..3ab2031 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_markup_to_utf8_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_markup_to_utf8_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_password_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_password_get_func.c index f471244..74090d8 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_password_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_password_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_selection_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_selection_get_func.c index 70be112..937e64a 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_selection_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_selection_get_func.c @@ -47,6 +47,7 @@ enum { 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) @@ -83,7 +84,7 @@ static void utc_UIFW_elm_entry_selection_get_func_01(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; @@ -99,7 +100,7 @@ static void utc_UIFW_elm_entry_selection_get_func_02(void) 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; diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_single_line_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_single_line_get_func.c index 957fdc4..cbdc78d 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_single_line_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_single_line_get_func.c @@ -47,6 +47,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_utf8_to_markup_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_utf8_to_markup_func.c index 05ce51b..c9512d9 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_utf8_to_markup_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_utf8_to_markup_func.c @@ -69,6 +69,7 @@ enum { 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) diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c index c2a7b73..8aa2922 100644 --- a/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c +++ b/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c @@ -48,6 +48,7 @@ enum { 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) diff --git a/debian/changelog b/debian/changelog index 57230f5..6a2d5b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +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 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 Fri, 07 Oct 2011 19:22:09 +0900 + elementary (1.0.0+svn.61256slp2+build46) unstable; urgency=low * Package Upload. diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index f749661..de7dc67 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -5471,6 +5471,7 @@ extern "C" { 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); @@ -8378,9 +8379,14 @@ extern "C" { */ 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); /** diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index c667b55..9510106 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -583,6 +583,23 @@ _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir) 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) { @@ -625,6 +642,11 @@ _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); diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 5af6e32..b666622 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -964,8 +964,8 @@ elm_naviframe_bottom_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 NULL; + if ((!wd) || (!wd->stack)) return NULL; + return wd->stack->data; } EAPI void diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c index 2b4794b..7c87a89 100644 --- a/src/lib/elm_cnp_helper.c +++ b/src/lib/elm_cnp_helper.c @@ -773,7 +773,8 @@ _get_tag_value(const char *tag_str, const char *tag_name) int i; int start = 0; - if (!strcmp(tag_str, "item") && !strcmp(tag_name, "href")) + if ((!strncmp(tag_str, ""); + endTag = strstr(startTag, ">"); else break; if (!endTag || startTag > endTag) diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 8a08584..8713c82 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -954,7 +954,6 @@ elm_diskselector_round_set(Evas_Object * obj, Eina_Bool round) wd->r_items = NULL; } - _selected_item_indicate(wd->selected_item); _sizing_eval(obj); } diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c index 0cacabd..b773f10 100644 --- a/src/lib/elm_editfield.c +++ b/src/lib/elm_editfield.c @@ -508,8 +508,7 @@ elm_editfield_left_icon_set(Evas_Object *obj, Evas_Object *icon) 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, @@ -558,8 +557,7 @@ elm_editfield_right_icon_set(Evas_Object *obj, Evas_Object *icon) 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, diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index b962fb2..0e114ea 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -4870,6 +4870,7 @@ EAPI void 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); @@ -4886,6 +4887,7 @@ EAPI Evas_Coord elm_entry_wrap_width_get(const Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; return wd->wrap_w; } diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 33afe02..95a4473 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -875,6 +875,9 @@ _item_del(Elm_Genlist_Item *it) 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) { @@ -884,28 +887,35 @@ _item_select(Elm_Genlist_Item *it) 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 @@ -1072,7 +1082,6 @@ _long_press(void *data) { 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)) @@ -1538,6 +1547,8 @@ _mode_finished_signal_cb(void *data, 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); @@ -1685,6 +1696,13 @@ _item_cache_free(Item_Cache *itc) 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__) { @@ -1700,6 +1718,100 @@ _icon_unfocused(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS } 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) @@ -1875,97 +1987,33 @@ _item_realize(Elm_Genlist_Item *it, } 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))) @@ -2055,7 +2103,11 @@ _item_unrealize(Elm_Genlist_Item *it, } 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); @@ -2128,25 +2180,11 @@ _item_block_recalc(Item_Block *itb, } 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 @@ -2200,7 +2238,8 @@ _get_space_for_reorder_item(Elm_Genlist_Item *it) 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; } @@ -2378,7 +2417,7 @@ _item_block_position(Item_Block *itb, } else { - if (!it->dragging) _item_unrealize(it, EINA_FALSE); + if (!it->dragging && (!it->wd->item_moving_effect_timer)) _item_unrealize(it, EINA_FALSE); } } in++; @@ -2455,9 +2494,9 @@ _calc_job(void *data) 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; @@ -2478,10 +2517,9 @@ _calc_job(void *data) { 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; @@ -2931,7 +2969,7 @@ _pan_calculate(Evas_Object *obj) 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 @@ -3104,26 +3142,7 @@ _mode_item_realize(Elm_Genlist_Item *it) _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; @@ -3148,27 +3167,7 @@ _mode_item_realize(Elm_Genlist_Item *it) } } } - 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); @@ -3227,6 +3226,8 @@ _item_mode_set(Elm_Genlist_Item *it) 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)); @@ -3255,6 +3256,30 @@ _item_mode_unset(Widget_Data *wd) 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) { @@ -3362,6 +3387,7 @@ _item_new(Widget_Data *wd, 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) { @@ -4236,7 +4262,7 @@ elm_genlist_item_disabled_set(Elm_Genlist_Item *it, 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) @@ -4548,10 +4574,11 @@ elm_genlist_item_item_class_get(const Elm_Genlist_Item *it) } 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"); @@ -4824,7 +4851,7 @@ elm_genlist_bounce_get(const Evas_Object *obj, 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 @@ -4894,12 +4921,11 @@ elm_genlist_scroller_policy_set(Evas_Object *obj, { 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 @@ -4929,15 +4955,6 @@ elm_genlist_realized_items_update(Evas_Object *obj) 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, @@ -4981,13 +4998,6 @@ elm_genlist_item_mode_set(Elm_Genlist_Item *it, 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) { @@ -4997,13 +5007,6 @@ 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) { @@ -5210,6 +5213,8 @@ _item_moving_effect_timer_cb(void *data) 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 { @@ -5262,8 +5267,6 @@ _item_moving_effect_timer_cb(void *data) _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; @@ -5607,27 +5610,3 @@ elm_genlist_item_rename_mode_get(Elm_Genlist_Item *item) 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); - } - } - } -} diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c index 4140740..2682682 100644 --- a/src/lib/elm_searchbar.c +++ b/src/lib/elm_searchbar.c @@ -28,7 +28,8 @@ static void _del_hook(Evas_Object *obj); 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); @@ -105,11 +106,8 @@ static void _sizing_eval(Evas_Object *obj) } 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); } @@ -149,28 +147,37 @@ static void _cancel_clicked(void *data, Evas_Object *obj __UNUSED__, } 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 @@ -193,46 +200,39 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent) 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; @@ -248,11 +248,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent) */ 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); } /** @@ -265,11 +261,7 @@ EAPI void elm_searchbar_text_set(Evas_Object *obj, const char *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); } /** diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index e835482..a7abcad 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -420,11 +420,11 @@ _drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, { 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 @@ -434,11 +434,11 @@ _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUS 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