From ad620cf4db5a89df4a124db6d0454a9c1de11d6d Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Thu, 8 Mar 2012 14:37:37 +0900 Subject: [PATCH] [JungWooHyun] doing merge job ~ --- data/themes/widgets/entry.edc | 35 ------------ src/bin/test_entry.c | 86 ---------------------------- src/bin/test_focus.c | 8 --- src/bin/test_focus2.c | 12 ---- src/bin/test_focus3.c | 11 ---- src/examples/anchorblock_example_01.c | 12 ---- src/lib/elm_focus.h | 104 ---------------------------------- 7 files changed, 268 deletions(-) diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc index 114c8f3..8ab0268 100644 --- a/data/themes/widgets/entry.edc +++ b/data/themes/widgets/entry.edc @@ -41,10 +41,7 @@ group { name: "elm/scroller/entry/default"; description { state: "default" 0.0; rel1.offset: 2 2; rel2.offset: -3 -3; -<<<<<<< HEAD -======= color: 255 255 255 0; ->>>>>>> remotes/origin/upstream } } part { name: "clipper"; @@ -706,11 +703,7 @@ group { name: "elm/entry/base/default"; styles { style { name: "entry_textblock_style"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#000 wrap=word text_class=entry"; -======= base: "font=Sans font_size=10 color=#000 wrap=word text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -718,11 +711,7 @@ group { name: "elm/entry/base/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#00000080 wrap=word text_class=entry"; -======= base: "font=Sans font_size=10 color=#00000080 wrap=word text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -792,11 +781,7 @@ group { name: "elm/entry/base-mixedwrap/default"; styles { style { name: "entry_textblock_style_mixedwrap"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#000 wrap=mixed text_class=entry"; -======= base: "font=Sans font_size=10 color=#000 wrap=mixed text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -804,11 +789,7 @@ group { name: "elm/entry/base-mixedwrap/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style_mixedwrap"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; -======= base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -842,11 +823,7 @@ group { name: "elm/entry/base-charwrap/default"; styles { style { name: "entry_textblock_style_charwrap"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry"; -======= base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -854,11 +831,7 @@ group { name: "elm/entry/base-charwrap/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style_charwrap"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; -======= base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -914,11 +887,7 @@ group { name: "elm/entry/base-single/default"; styles { style { name: "entry_single_textblock_style"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry"; -======= base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -926,11 +895,7 @@ group { name: "elm/entry/base-single/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_single_textblock_disabled_style"; -<<<<<<< HEAD - base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry"; -======= base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry left_margin=4 right_margin=4"; ->>>>>>> remotes/origin/upstream tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index 921191b..57b44c6 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -300,13 +300,8 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en, "Disabled entry"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); - elm_object_disabled_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); elm_object_disabled_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); @@ -316,17 +311,10 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_password_set(en, 1); - elm_entry_single_line_set(en, 1); - elm_object_text_set(en, "Access denied, give up!"); - elm_object_disabled_set(en, 1); -======= elm_entry_password_set(en, EINA_TRUE); elm_entry_single_line_set(en, EINA_TRUE); elm_object_text_set(en, "Access denied, give up!"); elm_object_disabled_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); @@ -336,11 +324,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); -<<<<<<< HEAD - elm_object_disabled_set(en, 1); -======= elm_object_disabled_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL); elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL); elm_object_text_set(en, @@ -353,11 +337,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev elm_box_pack_end(bx, en); sp = elm_separator_add(win); -<<<<<<< HEAD - elm_separator_horizontal_set(sp, 1); -======= elm_separator_horizontal_set(sp, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, sp); evas_object_show(sp); @@ -368,11 +348,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "This is a single line"); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_entry_select_all(en); evas_object_show(en); elm_box_pack_end(bx, en); @@ -384,21 +360,13 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "01234"); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); digits_filter_data.accepted = "0123456789"; digits_filter_data.rejected = NULL; -<<<<<<< HEAD - elm_entry_text_filter_append(en, elm_entry_filter_accept_set, &digits_filter_data); -======= elm_entry_markup_filter_append(en, elm_entry_filter_accept_set, &digits_filter_data); ->>>>>>> remotes/origin/upstream /* No digits entry */ en = elm_entry_add(win); @@ -407,21 +375,13 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "No numbers here"); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); digits_filter_data2.accepted = NULL; digits_filter_data2.rejected = "0123456789"; -<<<<<<< HEAD - elm_entry_text_filter_append(en, elm_entry_filter_accept_set, &digits_filter_data2); -======= elm_entry_markup_filter_append(en, elm_entry_filter_accept_set, &digits_filter_data2); ->>>>>>> remotes/origin/upstream /* Size limited entry */ en = elm_entry_add(win); @@ -430,21 +390,13 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "Just 20 chars"); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); limit_filter_data.max_char_count = 20; limit_filter_data.max_byte_count = 0; -<<<<<<< HEAD - elm_entry_text_filter_append(en, elm_entry_filter_limit_size, &limit_filter_data); -======= elm_entry_markup_filter_append(en, elm_entry_filter_limit_size, &limit_filter_data); ->>>>>>> remotes/origin/upstream /* Byte size limited entry */ en = elm_entry_add(win); @@ -453,21 +405,13 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "And now only 30 bytes"); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); limit_filter_data2.max_char_count = 0; limit_filter_data2.max_byte_count = 30; -<<<<<<< HEAD - elm_entry_text_filter_append(en, elm_entry_filter_limit_size, &limit_filter_data2); -======= elm_entry_markup_filter_append(en, elm_entry_filter_limit_size, &limit_filter_data2); ->>>>>>> remotes/origin/upstream /* Single line password entry */ en_p = elm_entry_add(win); @@ -476,13 +420,8 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev evas_object_size_hint_align_set(en_p, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en_p, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en_p, "Password here"); -<<<<<<< HEAD - elm_entry_single_line_set(en_p, 1); - elm_entry_password_set(en_p, 1); -======= elm_entry_single_line_set(en_p, EINA_TRUE); elm_entry_password_set(en_p, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en_p); elm_box_pack_end(bx, en_p); @@ -490,11 +429,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); bt = elm_icon_add(win); @@ -805,11 +740,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en, "This is a single line"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, en); evas_object_show(en); @@ -1373,11 +1304,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en, "This is a single line"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_part_content_set(ly, "element1", en); evas_object_show(en); @@ -1714,8 +1641,6 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(win); } -<<<<<<< HEAD -======= void test_entry6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -2215,7 +2140,6 @@ test_entry8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(win); } ->>>>>>> remotes/origin/upstream static void _scrolled_entry_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -2223,12 +2147,6 @@ _scrolled_entry_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info elm_object_text_set(en, ""); } -<<<<<<< HEAD -void -test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Evas_Object *win, *bg, *bx, *bx2, *bt, *np; -======= static void _scrolled_entry_save(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -2249,7 +2167,6 @@ void test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *bx, *bx2, *bt, *np, *ch; ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "entry-notepad", ELM_WIN_BASIC); elm_win_title_set(win, "Entry Notepad"); @@ -2287,8 +2204,6 @@ test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve elm_box_pack_end(bx2, bt); evas_object_show(bt); -<<<<<<< HEAD -======= bt = elm_button_add(win); elm_object_text_set(bt, "Save"); evas_object_smart_callback_add(bt, "clicked", _scrolled_entry_save, np); @@ -2306,7 +2221,6 @@ test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve elm_box_pack_end(bx2, ch); evas_object_show(ch); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, bx2); evas_object_show(bx2); diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index 8e23759..eb6d81e 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -116,11 +116,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_object_text_set(en, "This is a single line"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, en); my_show(en); } @@ -153,11 +149,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EVAS_HINT_EXPAND); evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - elm_scroller_bounce_set(sc, 1, 1); -======= elm_scroller_bounce_set(sc, EINA_TRUE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_scroller_content_min_limit(sc, 1, 1); elm_box_pack_end(bx2, sc); my_show(sc); diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c index d21222a..b7f6f5e 100644 --- a/src/bin/test_focus2.c +++ b/src/bin/test_focus2.c @@ -40,11 +40,7 @@ _focus_layout_part(void *data, Evas_Object *o __UNUSED__, void *event_info __UNU Evas_Object *newfocus = (Evas_Object *)edje_object_part_object_get(ed, "sky"); const char *type = evas_object_type_get(newfocus); -<<<<<<< HEAD - printf("evas_object_focus_set(%p, 1) %s\n", newfocus, type); -======= printf("evas_object_focus_set(%p, EINA_TRUE) %s\n", newfocus, type); ->>>>>>> remotes/origin/upstream evas_object_focus_set(newfocus, EINA_TRUE);; } @@ -86,11 +82,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en, "Scrolled Entry that should get focus"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(en); elm_box_pack_end(bx, en); @@ -118,11 +110,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(en, "Scrolled Entry that should get focus"); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_part_content_set(ly, "element2", en); bt = elm_button_add(ly); diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c index e5fb5cd..6a0bf04 100644 --- a/src/bin/test_focus3.c +++ b/src/bin/test_focus3.c @@ -33,11 +33,7 @@ _add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_start(bx, en); evas_object_show(en); } @@ -82,11 +78,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); -======= elm_entry_single_line_set(en, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, en); evas_object_show(en); @@ -119,8 +111,6 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(win); } -<<<<<<< HEAD -======= static void highlight_enabled_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) @@ -312,5 +302,4 @@ test_focus4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_resize(win, 320, 320); evas_object_show(win); } ->>>>>>> remotes/origin/upstream #endif diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c index 300d7e4..06440c5 100644 --- a/src/examples/anchorblock_example_01.c +++ b/src/examples/anchorblock_example_01.c @@ -57,11 +57,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) o = elm_anchorblock_add(win); elm_anchorblock_hover_style_set(o, "popout"); elm_anchorblock_hover_parent_set(o, win); -<<<<<<< HEAD - elm_anchorblock_text_set(o, anchortext); -======= elm_object_text_set(o, anchortext); ->>>>>>> remotes/origin/upstream evas_object_smart_callback_add(o, "anchor,clicked", _anchorblock_clicked_cb, NULL); evas_object_show(o); @@ -77,11 +73,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) o = elm_anchorview_add(win); elm_anchorview_hover_parent_set(o, frame); elm_anchorview_bounce_set(o, EINA_FALSE, EINA_TRUE); -<<<<<<< HEAD - elm_anchorview_text_set(o, anchortext); -======= elm_object_text_set(o, anchortext); ->>>>>>> remotes/origin/upstream evas_object_smart_callback_add(o, "anchor,clicked", _anchorview_clicked_cb, NULL); evas_object_show(o); @@ -126,11 +118,7 @@ _anchorview_clicked_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info static void _btn_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - const char *lbl = elm_button_label_get(obj); -======= const char *lbl = elm_object_text_get(obj); ->>>>>>> remotes/origin/upstream printf("%s: %s\n", lbl, (char *)data); eina_stringshare_del(data); } diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h index 15f0838..5afd697 100644 --- a/src/lib/elm_focus.h +++ b/src/lib/elm_focus.h @@ -12,11 +12,7 @@ * objects by input (tab key) or programmatically. The default * focus chain for an application is the one define by the order in * which the widgets where added in code. One will cycle through -<<<<<<< HEAD - * top level widgets, and, for each one containg sub-objects, cycle -======= * top level widgets, and, for each one containing sub-objects, cycle ->>>>>>> remotes/origin/upstream * through them all, before returning to the level * above. Elementary also allows one to set @b custom focus chains * for their applications. @@ -37,51 +33,6 @@ */ /** -<<<<<<< HEAD - * Get the enable status of the focus highlight - * - * This gets whether the highlight on focused objects is enabled or not - * @ingroup Focus - */ -EAPI Eina_Bool elm_focus_highlight_enabled_get(void); - -/** - * Set the enable status of the focus highlight - * - * @param enable Enable highlight if EINA_TRUE, disable otherwise - * - * Set whether to show or not the highlight on focused objects - * @ingroup Focus - */ -EAPI void elm_focus_highlight_enabled_set(Eina_Bool enable); - -/** - * Get the enable status of the highlight animation - * - * @return The focus hilight mode set - * - * Get whether the focus highlight, if enabled, will animate its switch from - * one object to the next - * - * @ingroup Focus - */ -EAPI Eina_Bool elm_focus_highlight_animate_get(void); - -/** - * Set the enable status of the highlight animation - * - * @param animate Enable animation if EINA_TRUE, disable otherwise - * - * Set whether the focus highlight, if enabled, will animate its switch from - * one object to the next - * - * @ingroup Focus - */ -EAPI void elm_focus_highlight_animate_set(Eina_Bool animate); - -/** -======= ->>>>>>> remotes/origin/upstream * Get the whether an Elementary object has the focus or not. * * @param obj The Elementary object to get the information from @@ -114,11 +65,7 @@ EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj); EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus); /** -<<<<<<< HEAD - * Set the ability for an Element object to be focused -======= * Set the ability for an Elementary object to be focused ->>>>>>> remotes/origin/upstream * * @param obj The Elementary object to operate on * @param enable @c EINA_TRUE if the object can be focused, @c @@ -223,35 +170,6 @@ EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj * first object of chain. * * @param obj The object root of sub-tree -<<<<<<< HEAD - * @param dir Direction to cycle the focus - * - * @ingroup Focus - */ -EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir); - -/** - * Give focus to near object in one direction. - * - * Give focus to near object in direction of one object. - * If none focusable object in given direction, the focus will not change. - * - * @param obj The reference object - * @param x Horizontal component of direction to focus - * @param y Vertical component of direction to focus - * - * @ingroup Focus - */ -EAPI void elm_object_focus_direction_go(Evas_Object *obj, int x, int y); - -/** - * Make the elementary object and its children to be unfocusable - * (or focusable). - * - * @param obj The Elementary object to operate on - * @param tree_unfocusable @c EINA_TRUE for unfocusable, - * @c EINA_FALSE for focusable. -======= * @param dir Direction to move the focus * * @ingroup Focus @@ -265,7 +183,6 @@ EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Dire * @param obj The Elementary object to operate on * @param focusable @c EINA_TRUE for focusable, * @c EINA_FALSE for unfocusable. ->>>>>>> remotes/origin/upstream * * This sets whether the object @p obj and its children objects * are able to take focus or not. If the tree is set as unfocusable, @@ -275,26 +192,6 @@ EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Dire * want to get focus (by focus reverting or by other focus controls). * Then, just use this API before deleting. * -<<<<<<< HEAD - * @see elm_object_tree_unfocusable_get() - * - * @ingroup Focus - */ -EAPI void elm_object_tree_unfocusable_set(Evas_Object *obj, Eina_Bool tree_unfocusable); - -/** - * Get whether an Elementary object and its children are unfocusable or not. - * - * @param obj The Elementary object to get the information from - * @return @c EINA_TRUE, if the tree is unfocussable, - * @c EINA_FALSE if not (and on errors). - * - * @see elm_object_tree_unfocusable_set() - * - * @ingroup Focus - */ -EAPI Eina_Bool elm_object_tree_unfocusable_get(const Evas_Object *obj); -======= * @see elm_object_tree_focus_allow_get() * * @ingroup Focus @@ -314,4 +211,3 @@ EAPI void elm_object_tree_focus_allow_set(Evas_Object *obj, Eina * @ingroup Focus */ EAPI Eina_Bool elm_object_tree_focus_allow_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream -- 2.7.4