From 9d446c30b60c3d6661b641aa6f04b4a8f3752c0d Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Fri, 9 Mar 2012 14:14:46 +0900 Subject: [PATCH] 3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout - removed conflicsts --- data/themes/widgets/index.edc | 7 - data/themes/widgets/naviframe.edc | 4 - doc/widgets/widget_preview_index.c | 7 - src/bin/test_3d.c | 8 - src/bin/test_gesture_layer2.c | 4 - src/bin/test_gesture_layer3.c | 4 - src/bin/test_glview.c | 41 --- src/bin/test_glview_simple.c | 6 - src/bin/test_index.c | 91 ------ src/bin/test_naviframe.c | 12 - src/bin/test_transit.c | 9 - src/edje_externals/elm_index.c | 12 - src/examples/index_example_01.c | 13 - src/examples/index_example_02.c | 16 - src/lib/elc_fileselector.c | 160 --------- src/lib/elc_naviframe.c | 645 ------------------------------------- src/lib/elc_naviframe.h | 73 ----- src/lib/elm_frame.c | 109 ------- src/lib/elm_frame.h | 40 --- src/lib/elm_gesture_layer.c | 319 ------------------ src/lib/elm_gesture_layer.h | 83 ----- src/lib/elm_glview.c | 33 -- src/lib/elm_glview.h | 87 ----- src/lib/elm_layout.c | 134 -------- src/lib/elm_layout.h | 76 ----- src/lib/elm_transit.c | 21 -- src/lib/elm_transit.h | 131 -------- 27 files changed, 2145 deletions(-) diff --git a/data/themes/widgets/index.edc b/data/themes/widgets/index.edc index b598d1b..1eaee91 100644 --- a/data/themes/widgets/index.edc +++ b/data/themes/widgets/index.edc @@ -126,11 +126,7 @@ group { name: "elm/index/base/vertical/default"; } } } -<<<<<<< HEAD - part { name: "over1"; -======= part { name: "over1"; ->>>>>>> remotes/origin/upstream mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0; @@ -413,8 +409,6 @@ group { name: "elm/index/item_odd/vertical/default"; } } } -<<<<<<< HEAD -======= group { name: "elm/index/base/horizontal/default"; images { image: "bt_base1.png" COMP; @@ -812,5 +806,4 @@ group { name: "elm/index/item_odd/horizontal/default"; } } } ->>>>>>> remotes/origin/upstream diff --git a/data/themes/widgets/naviframe.edc b/data/themes/widgets/naviframe.edc index a0753f1..71d2850 100644 --- a/data/themes/widgets/naviframe.edc +++ b/data/themes/widgets/naviframe.edc @@ -111,11 +111,7 @@ group { name:"elm/naviframe/item/basic/default"; description { state: "default" 0.0; min: 40 40; max: 40 40; -<<<<<<< HEAD - fixed: 1 1; -======= fixed: 1 1; ->>>>>>> remotes/origin/upstream align: 1 0.5; rel1.to: "elm.text.title"; rel1.relative: 0 0; diff --git a/doc/widgets/widget_preview_index.c b/doc/widgets/widget_preview_index.c index 4b3246a..3e655ce 100644 --- a/doc/widgets/widget_preview_index.c +++ b/doc/widgets/widget_preview_index.c @@ -33,16 +33,9 @@ for (i = 0; i < (sizeof(dict) / sizeof(dict[0])); i++) list_it = elm_list_item_append(o, dict[i], NULL, NULL, NULL, NULL); snprintf(buf, sizeof(buf), "%c", dict[i][0]); -<<<<<<< HEAD - elm_index_item_append(id, buf, list_it); - } - -elm_index_active_set(id, EINA_TRUE); -======= elm_index_item_append(id, buf, NULL, list_it); } elm_index_autohide_disabled_set(id, EINA_FALSE); ->>>>>>> remotes/origin/upstream #include "widget_preview_tmpl_foot.c" diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c index 235309d..17b880b 100644 --- a/src/bin/test_3d.c +++ b/src/bin/test_3d.c @@ -1,8 +1,5 @@ #include -<<<<<<< HEAD -======= #include "test.h" ->>>>>>> remotes/origin/upstream #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif @@ -245,13 +242,8 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U { Evas_Object *win, *bg, *bx, *sl; -<<<<<<< HEAD - win = elm_win_add(NULL, "3d", ELM_WIN_BASIC); - elm_win_title_set(win, "3D"); -======= win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC); elm_win_title_set(win, "Box Vert"); ->>>>>>> remotes/origin/upstream elm_win_autodel_set(win, EINA_TRUE); bg = elm_bg_add(win); diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c index 28c6b61..b2b0469 100644 --- a/src/bin/test_gesture_layer2.c +++ b/src/bin/test_gesture_layer2.c @@ -502,11 +502,7 @@ Evas_Object *create_gesture_box(Evas_Object *win, icon_properties *icons, snprintf(buf, sizeof(buf), "%s/images/g_layer/%s_1.png", elm_app_data_dir_get(), icons[idx].name); elm_icon_file_set(icons[idx].icon, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(icons[idx].icon, 0, 0); -======= elm_icon_resizable_set(icons[idx].icon, 0, 0); ->>>>>>> remotes/origin/upstream evas_object_size_hint_align_set(icons[idx].icon, 0.5, 0.5); _icon_color_set(&icons[idx], INI_R, INI_G, INI_B, INI_A); elm_box_pack_end(bx, icons[idx].icon); diff --git a/src/bin/test_gesture_layer3.c b/src/bin/test_gesture_layer3.c index c80ba31..9ecc159 100644 --- a/src/bin/test_gesture_layer3.c +++ b/src/bin/test_gesture_layer3.c @@ -377,11 +377,7 @@ momentum_move(void *_po, void *event_info) { Photo_Object *po = (Photo_Object *) _po; Elm_Gesture_Momentum_Info *p = (Elm_Gesture_Momentum_Info *) event_info; -<<<<<<< HEAD - printf("momentum move <%d,%d>\n", p->x2, p->y2); -======= printf("momentum move <%d,%d> fingers=<%d> mx,my=<%d,%d>\n", p->x2, p->y2, p->n, p->mx, p->my); ->>>>>>> remotes/origin/upstream po->bx = p->x2 - po->dx; po->by = p->y2 - po->dy; diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c index 7b991d6..ecade55 100644 --- a/src/bin/test_glview.c +++ b/src/bin/test_glview.c @@ -341,10 +341,6 @@ static const char vertex_shader[] = " gl_FragColor = color + white * dot(light_direction, rotated_normal);\n" "}\n"; -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void gears_init(GLData *gld) { @@ -391,10 +387,6 @@ gears_init(GLData *gld) gld->gear3 = make_gear(gld, 1.3, 2.0, 0.5, 10, 0.7); } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void gldata_init(GLData *gld) { @@ -448,10 +440,6 @@ _del_gl(Evas_Object *obj) free(gld); } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void _resize_gl(Evas_Object *obj) { @@ -465,11 +453,6 @@ _resize_gl(Evas_Object *obj) gears_reshape(gld, w,h); } -<<<<<<< HEAD - - -======= ->>>>>>> remotes/origin/upstream static void _draw_gl(Evas_Object *obj) { @@ -494,10 +477,6 @@ _on_done(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) evas_object_del((Evas_Object*)data); } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { @@ -505,10 +484,6 @@ _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event ecore_animator_del(ani); } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void _key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) { @@ -579,10 +554,6 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve gld->mouse_down = 0; } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream void test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -599,10 +570,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_title_set(win, "GLView"); elm_win_autodel_set(win, EINA_TRUE); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream // add a standard bg bg = elm_bg_add(win); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -635,10 +602,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_UP, _mouse_up, gl); evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, gl); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream // Animator and other vars ani = ecore_animator_add(_anim, gl); gld->glapi = elm_glview_gl_api_get(gl); @@ -646,10 +609,6 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_data_set(gl, "gld", gld); evas_object_event_callback_add(gl, EVAS_CALLBACK_DEL, _del, gl); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream /* add an ok button */ bt = elm_button_add(win); elm_object_text_set(bt, "OK"); diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c index 9a81128..4846950 100644 --- a/src/bin/test_glview_simple.c +++ b/src/bin/test_glview_simple.c @@ -239,17 +239,11 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve if (!(gld = calloc(1, sizeof(GLData)))) return; // Set the engine to opengl_x11 -<<<<<<< HEAD - elm_engine_set("opengl_x11"); - - win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC); -======= elm_config_preferred_engine_set("opengl_x11"); win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC); // Set preferred engine back to default from config elm_config_preferred_engine_set(NULL); ->>>>>>> remotes/origin/upstream elm_win_title_set(win, "GLView Simple"); elm_win_autodel_set(win, EINA_TRUE); diff --git a/src/bin/test_index.c b/src/bin/test_index.c index e304de4..be43dab 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -1,14 +1,9 @@ #include -<<<<<<< HEAD -======= #include "test.h" ->>>>>>> remotes/origin/upstream #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif #ifndef ELM_LIB_QUICKLAUNCH -<<<<<<< HEAD -======= struct _Idx_Data_Type { Evas_Object *id; /* Pointer to Index */ @@ -116,7 +111,6 @@ _api_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) elm_object_disabled_set(obj, a->state == API_STATE_LAST); } ->>>>>>> remotes/origin/upstream static Elm_Genlist_Item_Class itci; char *gli_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { @@ -130,17 +124,6 @@ char *gli_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __U } void -<<<<<<< HEAD -index_changed2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) -{ - // called on a change but delayed in case multiple changes happen in a - // short timespan - elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info)); -} - -void -index_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -======= _index_delay_changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { // called on a change but delayed in case multiple changes happen in a @@ -151,19 +134,12 @@ _index_delay_changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void void _index_changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { // this is calld on every change, no matter how often // elm_genlist_item_bring_in(event_info); } void -<<<<<<< HEAD -index_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) -{ - // called on final select - elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info)); -======= _index_selected_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { // called on final select @@ -181,47 +157,26 @@ static void id_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { printf("Current Index : %s\n", elm_index_item_letter_get((const Elm_Object_Item *)event_info)); ->>>>>>> remotes/origin/upstream } void test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - Evas_Object *win, *bg, *gl, *id; - Elm_Object_Item *glit; - int i, j; -======= Evas_Object *win, *bg, *bxx, *gl, *id, *bt; Elm_Object_Item *glit; int i, j; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "index", ELM_WIN_BASIC); elm_win_title_set(win, "Index"); elm_win_autodel_set(win, EINA_TRUE); -<<<<<<< HEAD -======= evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); ->>>>>>> remotes/origin/upstream bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); -<<<<<<< HEAD - gl = elm_genlist_add(win); - evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, gl); - evas_object_show(gl); - - id = elm_index_add(win); - evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, id); - -======= bxx = elm_box_add(win); elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -246,7 +201,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bxx, gl); ->>>>>>> remotes/origin/upstream evas_object_show(id); itci.item_style = "default"; @@ -268,17 +222,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info char buf[32]; snprintf(buf, sizeof(buf), "%c", 'A' + ((j >> 4) & 0xf)); -<<<<<<< HEAD - elm_index_item_append(id, buf, glit); - } - j += 2; - } - evas_object_smart_callback_add(id, "delay,changed", index_changed2, NULL); - evas_object_smart_callback_add(id, "changed", index_changed, NULL); - evas_object_smart_callback_add(id, "selected", index_selected, NULL); - elm_index_item_go(id, 0); - -======= elm_index_item_append(id, buf, id_cb, glit); if (*buf == 'G') /* Just init dt->item later used in API test */ api->dt.item = glit; @@ -289,7 +232,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(id, "changed", _index_changed_cb, NULL); evas_object_smart_callback_add(id, "selected", _index_selected_cb, NULL); elm_index_level_go(id, 0); ->>>>>>> remotes/origin/upstream evas_object_resize(win, 320, 480); evas_object_show(win); } @@ -346,11 +288,7 @@ test_index2_it_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __U snprintf(letter, sizeof(letter), "%c", label[0]); list_it = elm_list_item_sorted_insert(gui->lst, label, NULL, NULL, NULL, NULL, test_index2_cmp); -<<<<<<< HEAD - elm_index_item_sorted_insert(gui->id, letter, list_it, test_index2_icmp, -======= elm_index_item_sorted_insert(gui->id, letter, NULL, list_it, test_index2_icmp, ->>>>>>> remotes/origin/upstream test_index2_cmp); elm_list_go(gui->lst); /* FIXME it's not showing the recently added item */ @@ -362,10 +300,6 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Test_Index2_Elements *gui = data; const char *label, *label_next; -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream Elm_Object_Item *list_it, *list_it_next; Elm_Object_Item *iit; @@ -376,11 +310,7 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) { iit = elm_index_item_find(gui->id, list_it); if (iit) elm_object_item_del(iit); -<<<<<<< HEAD - elm_list_item_del(list_it); -======= elm_object_item_del(list_it); ->>>>>>> remotes/origin/upstream return; } @@ -393,11 +323,7 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) else elm_object_item_del(iit); -<<<<<<< HEAD - elm_list_item_del(list_it); -======= elm_object_item_del(list_it); ->>>>>>> remotes/origin/upstream } void @@ -431,17 +357,10 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info gui->id = elm_index_add(win); evas_object_size_hint_weight_set(gui->id, EVAS_HINT_EXPAND, -<<<<<<< HEAD - EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, gui->id); - evas_object_smart_callback_add(gui->id, "delay,changed", - test_index2_id_changed, NULL); -======= EVAS_HINT_EXPAND); elm_win_resize_object_add(win, gui->id); evas_object_smart_callback_add(gui->id, "delay,changed", test_index2_id_changed, NULL); ->>>>>>> remotes/origin/upstream evas_object_show(gui->id); gui->entry = elm_entry_add(win); @@ -464,25 +383,15 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info gui->lst = elm_list_add(win); elm_box_pack_end(box, gui->lst); evas_object_size_hint_weight_set(gui->lst, EVAS_HINT_EXPAND, -<<<<<<< HEAD - EVAS_HINT_EXPAND); - evas_object_size_hint_fill_set(gui->lst, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(gui->lst, "selected", test_index2_it_del, - gui); -======= EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(gui->lst, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_smart_callback_add(gui->lst, "selected", test_index2_it_del, gui); ->>>>>>> remotes/origin/upstream elm_list_go(gui->lst); evas_object_show(gui->lst); evas_object_resize(win, 320, 480); evas_object_show(win); } -<<<<<<< HEAD -======= ->>>>>>> remotes/origin/upstream #endif diff --git a/src/bin/test_naviframe.c b/src/bin/test_naviframe.c index 2c3dd79..4db8ac3 100644 --- a/src/bin/test_naviframe.c +++ b/src/bin/test_naviframe.c @@ -44,22 +44,14 @@ _title_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i } void -<<<<<<< HEAD -_title_visible(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -======= _title_visible(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { elm_naviframe_item_title_visible_set(data, !elm_naviframe_item_title_visible_get(data)); } void -<<<<<<< HEAD -_promote(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -======= _promote(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { elm_naviframe_item_promote(data); } @@ -81,12 +73,8 @@ _page5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) evas_object_data_get(nf, "page1")); content = _content_new(nf, img5); -<<<<<<< HEAD - it = elm_naviframe_item_insert_after(elm_naviframe_top_item_get(nf), -======= it = elm_naviframe_item_insert_after(obj, elm_naviframe_top_item_get(nf), ->>>>>>> remotes/origin/upstream "Page 5", bt, bt2, diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c index e681f12..5512447 100644 --- a/src/bin/test_transit.c +++ b/src/bin/test_transit.c @@ -39,10 +39,6 @@ _custom_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double progress) EINA_LIST_FOREACH(objs, elist, obj) evas_object_resize(obj, w, h); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream } static Elm_Transit_Effect * @@ -613,9 +609,4 @@ test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_resize(win, 400, 400); evas_object_show(win); } -<<<<<<< HEAD - - -======= ->>>>>>> remotes/origin/upstream #endif diff --git a/src/edje_externals/elm_index.c b/src/edje_externals/elm_index.c index eccb991..b516602 100644 --- a/src/edje_externals/elm_index.c +++ b/src/edje_externals/elm_index.c @@ -18,11 +18,7 @@ external_index_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr else return; if (p->active_exists) -<<<<<<< HEAD - elm_index_active_set(obj, p->active_exists); -======= elm_index_autohide_disabled_set(obj, p->active_exists); ->>>>>>> remotes/origin/upstream } static Eina_Bool @@ -32,11 +28,7 @@ external_index_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - elm_index_active_set(obj, param->i); -======= elm_index_autohide_disabled_set(obj, param->i); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } @@ -53,11 +45,7 @@ external_index_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - param->i = elm_index_active_get(obj); -======= param->i = elm_index_autohide_disabled_get(obj); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } diff --git a/src/examples/index_example_01.c b/src/examples/index_example_01.c index 4a026f6..41d7bbb 100644 --- a/src/examples/index_example_01.c +++ b/src/examples/index_example_01.c @@ -40,11 +40,7 @@ _index_item_del(void *data, data == elm_index_item_data_get(event_info) ? "OK" : "FAIL, something went wrong"); -<<<<<<< HEAD - elm_list_item_del(data); -======= elm_object_item_del(data); ->>>>>>> remotes/origin/upstream } /* delete an index item */ @@ -121,10 +117,6 @@ elm_main(int argc __UNUSED__, { Evas_Object *win, *bg, *hbox, *vbox, *bt, *sep; Elm_Object_Item *lit; -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream unsigned int i; char curr = 0; @@ -169,12 +161,7 @@ elm_main(int argc __UNUSED__, /* indexing by first letters */ snprintf(buf, sizeof(buf), "%c", curr); -<<<<<<< HEAD - - elm_index_item_append(d.index, buf, lit); -======= elm_index_item_append(d.index, buf, NULL, lit); ->>>>>>> remotes/origin/upstream index_it = elm_index_item_find(d.index, lit); elm_object_item_del_cb_set(index_it, _index_item_del); diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c index 4c67d03..5e2df84 100644 --- a/src/examples/index_example_02.c +++ b/src/examples/index_example_02.c @@ -34,11 +34,7 @@ _index_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { -<<<<<<< HEAD - elm_gengrid_item_bring_in(event_info); -======= elm_gengrid_item_bring_in(event_info, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } static void @@ -101,11 +97,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *grid, *index; -<<<<<<< HEAD - Elm_Gengrid_Item *it; -======= Elm_Object_Item *gg_it; ->>>>>>> remotes/origin/upstream unsigned int i; Elm_Gengrid_Item_Class gic; @@ -142,19 +134,11 @@ elm_main(int argc __UNUSED__, { char buf[32]; -<<<<<<< HEAD - it = elm_gengrid_item_append(grid, &gic, (void *)i, NULL, NULL); - - /* indexing by first letters */ - snprintf(buf, sizeof(buf), "%c", items[i][0]); - elm_index_item_sorted_insert(index, buf, it, _index_icmp, NULL); -======= gg_it = elm_gengrid_item_append(grid, &gic, (void *)i, NULL, NULL); /* indexing by first letters */ snprintf(buf, sizeof(buf), "%c", items[i][0]); elm_index_item_sorted_insert(index, buf, NULL, gg_it, _index_icmp, NULL); ->>>>>>> remotes/origin/upstream } evas_object_smart_callback_add(index, "delay,changed", _index_changed, NULL); diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index 998d3b9..565ddea 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -78,21 +78,8 @@ typedef enum { ELM_FILE_LAST } Elm_Fileselector_Type; -<<<<<<< HEAD -static Elm_Genlist_Item_Class list_itc[ELM_FILE_LAST] = { - { "default", { NULL, NULL, NULL, NULL } }, - { "default", { NULL, NULL, NULL, NULL } }, - { "default", { NULL, NULL, NULL, NULL } } -}; -static Elm_Gengrid_Item_Class grid_itc[ELM_FILE_LAST] = { - { "default", { NULL, NULL, NULL, NULL } }, - { "default", { NULL, NULL, NULL, NULL } }, - { "default", { NULL, NULL, NULL, NULL } } -}; -======= static Elm_Genlist_Item_Class *list_itc[ELM_FILE_LAST]; static Elm_Gengrid_Item_Class *grid_itc[ELM_FILE_LAST]; ->>>>>>> remotes/origin/upstream static const char *widtype = NULL; @@ -132,23 +119,17 @@ static void _del_hook(Evas_Object *obj) { Widget_Data *wd; -<<<<<<< HEAD -======= int i; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD -======= for (i = 0; i < ELM_FILE_LAST; ++i) { elm_genlist_item_class_free(list_itc[i]); elm_gengrid_item_class_free(grid_itc[i]); } ->>>>>>> remotes/origin/upstream #ifdef HAVE_EIO if (wd->current) eio_file_cancel(wd->current); @@ -437,24 +418,15 @@ _sel(void *data, Widget_Data *wd; void *old_sd; char *dir; -<<<<<<< HEAD -======= //This event_info could be a list or gengrid item Elm_Object_Item *it = event_info; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(data); if (!wd) return; sd = malloc(sizeof(*sd)); sd->fs = data; -<<<<<<< HEAD - sd->path = wd->mode == ELM_FILESELECTOR_LIST ? - elm_object_item_data_get(event_info) : - elm_gengrid_item_data_get(event_info); -======= sd->path = elm_object_item_data_get(it); ->>>>>>> remotes/origin/upstream if (!sd->path) { @@ -588,27 +560,13 @@ _filter_cb(void *data __UNUSED__, Eio_File *handler, const Eina_File_Direct_Info if (info->type == EINA_FILE_DIR) { -<<<<<<< HEAD - eio_file_associate_direct_add(handler, "type/grid", &grid_itc[ELM_DIRECTORY], NULL); - eio_file_associate_direct_add(handler, "type/list", &list_itc[ELM_DIRECTORY], NULL); -======= eio_file_associate_direct_add(handler, "type/grid", grid_itc[ELM_DIRECTORY], NULL); eio_file_associate_direct_add(handler, "type/list", list_itc[ELM_DIRECTORY], NULL); ->>>>>>> remotes/origin/upstream } else { if (evas_object_image_extension_can_load_get(info->path + info->name_start)) { -<<<<<<< HEAD - eio_file_associate_direct_add(handler, "type/grid", &grid_itc[ELM_FILE_IMAGE], NULL); - eio_file_associate_direct_add(handler, "type/list", &list_itc[ELM_FILE_IMAGE], NULL); - } - else - { - eio_file_associate_direct_add(handler, "type/grid", &grid_itc[ELM_FILE_UNKNOW], NULL); - eio_file_associate_direct_add(handler, "type/list", &list_itc[ELM_FILE_UNKNOW], NULL); -======= eio_file_associate_direct_add(handler, "type/grid", grid_itc[ELM_FILE_IMAGE], NULL); eio_file_associate_direct_add(handler, "type/list", list_itc[ELM_FILE_IMAGE], NULL); } @@ -616,7 +574,6 @@ _filter_cb(void *data __UNUSED__, Eio_File *handler, const Eina_File_Direct_Info { eio_file_associate_direct_add(handler, "type/grid", grid_itc[ELM_FILE_UNKNOW], NULL); eio_file_associate_direct_add(handler, "type/list", list_itc[ELM_FILE_UNKNOW], NULL); ->>>>>>> remotes/origin/upstream } } @@ -626,19 +583,6 @@ _filter_cb(void *data __UNUSED__, Eio_File *handler, const Eina_File_Direct_Info static int _file_grid_cmp(const void *a, const void *b) { -<<<<<<< HEAD - const Elm_Gengrid_Item *ga = a; - const Elm_Gengrid_Item *gb = b; - const Elm_Gengrid_Item_Class *ca = elm_gengrid_item_item_class_get(ga); - const Elm_Gengrid_Item_Class *cb = elm_gengrid_item_item_class_get(gb); - - if (ca == &grid_itc[ELM_DIRECTORY]) - { - if (cb != &grid_itc[ELM_DIRECTORY]) - return -1; - } - else if (cb == &grid_itc[ELM_DIRECTORY]) -======= const Elm_Object_Item *ga = a; const Elm_Object_Item *gb = b; const Elm_Gengrid_Item_Class *ca = elm_gengrid_item_item_class_get(ga); @@ -650,16 +594,11 @@ _file_grid_cmp(const void *a, const void *b) return -1; } else if (cb == grid_itc[ELM_DIRECTORY]) ->>>>>>> remotes/origin/upstream { return 1; } -<<<<<<< HEAD - return strcoll(elm_gengrid_item_data_get(ga), elm_gengrid_item_data_get(gb)); -======= return strcoll(elm_object_item_data_get(ga), elm_object_item_data_get(gb)); ->>>>>>> remotes/origin/upstream } static int @@ -670,21 +609,12 @@ _file_list_cmp(const void *a, const void *b) const Elm_Genlist_Item_Class *ca = elm_genlist_item_item_class_get(la); const Elm_Genlist_Item_Class *cb = elm_genlist_item_item_class_get(lb); -<<<<<<< HEAD - if (ca == &list_itc[ELM_DIRECTORY]) - { - if (cb != &list_itc[ELM_DIRECTORY]) - return -1; - } - else if (cb == &list_itc[ELM_DIRECTORY]) -======= if (ca == list_itc[ELM_DIRECTORY]) { if (cb != list_itc[ELM_DIRECTORY]) return -1; } else if (cb == list_itc[ELM_DIRECTORY]) ->>>>>>> remotes/origin/upstream { return 1; } @@ -727,17 +657,6 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS if (wr->wd->mode == ELM_FILESELECTOR_LIST) { -<<<<<<< HEAD - Eina_Bool is_dir = (eio_file_associate_find(handler, "type/list") == &list_itc[ELM_DIRECTORY]); - - elm_genlist_item_direct_sorted_insert(wr->wd->files_list, eio_file_associate_find(handler, "type/list"), - eina_stringshare_ref(eio_file_associate_find(handler, "filename")), - wr->parent, wr->wd->expand && is_dir ? ELM_GENLIST_ITEM_SUBITEMS : ELM_GENLIST_ITEM_NONE, - _file_list_cmp, NULL, NULL); - } - else if (wr->wd->mode == ELM_FILESELECTOR_GRID) - elm_gengrid_item_direct_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"), -======= Eina_Bool is_dir = (eio_file_associate_find(handler, "type/list") == list_itc[ELM_DIRECTORY]); elm_genlist_item_sorted_insert(wr->wd->files_list, eio_file_associate_find(handler, "type/list"), @@ -747,7 +666,6 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS } else if (wr->wd->mode == ELM_FILESELECTOR_GRID) elm_gengrid_item_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"), ->>>>>>> remotes/origin/upstream eina_stringshare_ref(eio_file_associate_find(handler, "filename")), _file_grid_cmp, NULL, NULL); } @@ -836,16 +754,6 @@ _populate(Evas_Object *obj, EINA_LIST_FREE(dirs, real) { if (wd->mode == ELM_FILESELECTOR_LIST) -<<<<<<< HEAD - elm_genlist_item_append(wd->files_list, &list_itc[ELM_DIRECTORY], - real, /* item data */ - parent, - wd->expand ? ELM_GENLIST_ITEM_SUBITEMS : - ELM_GENLIST_ITEM_NONE, - NULL, NULL); - else if (wd->mode == ELM_FILESELECTOR_GRID) - elm_gengrid_item_append(wd->files_grid, &grid_itc[ELM_DIRECTORY], -======= elm_genlist_item_append(wd->files_list, list_itc[ELM_DIRECTORY], real, /* item data */ parent, @@ -854,7 +762,6 @@ _populate(Evas_Object *obj, NULL, NULL); else if (wd->mode == ELM_FILESELECTOR_GRID) elm_gengrid_item_append(wd->files_grid, grid_itc[ELM_DIRECTORY], ->>>>>>> remotes/origin/upstream real, /* item data */ NULL, NULL); } @@ -865,28 +772,17 @@ _populate(Evas_Object *obj, ELM_FILE_IMAGE : ELM_FILE_UNKNOW; if (wd->mode == ELM_FILESELECTOR_LIST) -<<<<<<< HEAD - elm_genlist_item_append(wd->files_list, &list_itc[type], -======= elm_genlist_item_append(wd->files_list, list_itc[type], ->>>>>>> remotes/origin/upstream real, /* item data */ parent, ELM_GENLIST_ITEM_NONE, NULL, NULL); else if (wd->mode == ELM_FILESELECTOR_GRID) -<<<<<<< HEAD - elm_gengrid_item_append(wd->files_grid, &grid_itc[type], -======= elm_gengrid_item_append(wd->files_grid, grid_itc[type], ->>>>>>> remotes/origin/upstream real, /* item data */ NULL, NULL); } #else -<<<<<<< HEAD -======= if (wd->expand && wd->current) return ; ->>>>>>> remotes/origin/upstream if (wd->current) eio_file_cancel(wd->current); wr = malloc(sizeof (Widget_Request)); @@ -966,19 +862,6 @@ elm_fileselector_add(Evas_Object *parent) elm_widget_sub_object_add(obj, bt); wd->home_button = bt; -<<<<<<< HEAD - list_itc[ELM_DIRECTORY].func.content_get = grid_itc[ELM_DIRECTORY].func.content_get = _itc_icon_folder_get; - list_itc[ELM_FILE_IMAGE].func.content_get = grid_itc[ELM_FILE_IMAGE].func.content_get = _itc_icon_image_get; - list_itc[ELM_FILE_UNKNOW].func.content_get = grid_itc[ELM_FILE_UNKNOW].func.content_get = _itc_icon_file_get; - - for (i = 0; i < ELM_FILE_LAST; ++i) - { - list_itc[i].func.text_get = grid_itc[i].func.text_get = _itc_text_get; - list_itc[i].func.state_get = grid_itc[i].func.state_get = _itc_state_get; - list_itc[i].func.del = grid_itc[i].func.del = _itc_del; - } - -======= for (i = 0; i < ELM_FILE_LAST; ++i) { list_itc[i] = elm_genlist_item_class_new(); @@ -997,7 +880,6 @@ elm_fileselector_add(Evas_Object *parent) list_itc[ELM_FILE_UNKNOW]->func.content_get = grid_itc[ELM_FILE_UNKNOW]->func.content_get = _itc_icon_file_get; ->>>>>>> remotes/origin/upstream li = elm_genlist_add(parent); elm_widget_mirrored_automatic_set(li, EINA_FALSE); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -1009,12 +891,8 @@ elm_fileselector_add(Evas_Object *parent) evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -<<<<<<< HEAD - s = elm_finger_size_get() * 2; -======= // XXX: will fail for dynamic finger size changing s = _elm_config->finger_size * 2; ->>>>>>> remotes/origin/upstream elm_gengrid_item_size_set(grid, s, s); elm_gengrid_align_set(grid, 0.0, 0.0); @@ -1090,11 +968,7 @@ elm_fileselector_is_save_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; -<<<<<<< HEAD - return elm_object_disabled_get(wd->filename_entry); -======= return !elm_object_disabled_get(wd->filename_entry); ->>>>>>> remotes/origin/upstream } EAPI void @@ -1195,12 +1069,6 @@ elm_fileselector_expandable_get(const Evas_Object *obj) EAPI void elm_fileselector_path_set(Evas_Object *obj, -<<<<<<< HEAD - const char *path) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - _populate(obj, path, NULL); -======= const char *_path) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -1208,7 +1076,6 @@ elm_fileselector_path_set(Evas_Object *obj, path = ecore_file_realpath(_path); _populate(obj, path, NULL); free(path); ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -1297,17 +1164,6 @@ elm_fileselector_selected_get(const Evas_Object *obj) if (wd->mode == ELM_FILESELECTOR_LIST) { -<<<<<<< HEAD - Elm_Object_Item *it; - it = elm_genlist_selected_item_get(wd->files_list); - if (it) return elm_genlist_item_data_get(it); - } - else - { - Elm_Object_Item *it; - it = elm_gengrid_selected_item_get(wd->files_grid); - if (it) return elm_object_item_data_get(it); -======= Elm_Object_Item *gl_it = elm_genlist_selected_item_get(wd->files_list); if (gl_it) return elm_object_item_data_get(gl_it); } @@ -1315,7 +1171,6 @@ elm_fileselector_selected_get(const Evas_Object *obj) { Elm_Object_Item *gg_it = elm_gengrid_selected_item_get(wd->files_grid); if (gg_it) return elm_object_item_data_get(gg_it); ->>>>>>> remotes/origin/upstream } return wd->path; @@ -1323,36 +1178,25 @@ elm_fileselector_selected_get(const Evas_Object *obj) EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, -<<<<<<< HEAD - const char *path) -======= const char *_path) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; -<<<<<<< HEAD -======= Eina_Bool ret = EINA_TRUE; char *path; path = ecore_file_realpath(_path); ->>>>>>> remotes/origin/upstream if (ecore_file_is_dir(path)) _populate(obj, path, NULL); else { if (!ecore_file_exists(path)) -<<<<<<< HEAD - return EINA_FALSE; -======= { ret = EINA_FALSE; goto clean_up; } ->>>>>>> remotes/origin/upstream _populate(obj, ecore_file_dir_get(path), NULL); if (wd->filename_entry) @@ -1363,12 +1207,8 @@ elm_fileselector_selected_set(Evas_Object *obj, } } -<<<<<<< HEAD - return EINA_TRUE; -======= clean_up: free(path); return ret; ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 747919b..b586583 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -19,10 +19,6 @@ struct _Elm_Naviframe_Content_Item_Pair { EINA_INLIST; const char *part; -<<<<<<< HEAD - Evas_Object *content; -======= ->>>>>>> remotes/origin/upstream Elm_Naviframe_Item *it; }; @@ -30,10 +26,6 @@ struct _Elm_Naviframe_Text_Item_Pair { EINA_INLIST; const char *part; -<<<<<<< HEAD - const char *text; -======= ->>>>>>> remotes/origin/upstream }; struct _Elm_Naviframe_Item @@ -55,19 +47,6 @@ struct _Elm_Naviframe_Item static const char *widtype = NULL; -<<<<<<< HEAD -static const char SIG_TRANSITION_FINISHED[] = "transition,finished"; -static const char SIG_PUSH_FINISHED[] = "push,finished"; -static const char SIG_POP_FINISHED[] = "pop,finished"; -static const char SIG_TITLE_CLICKED[] = "title,clicked"; - -static const Evas_Smart_Cb_Description _signals[] = { - {SIG_TRANSITION_FINISHED, ""}, - {SIG_TITLE_CLICKED, ""}, - {NULL, NULL} -}; - -======= //widget signals static const char SIG_TRANSITION_FINISHED[] = "transition,finished"; static const char SIG_TITLE_CLICKED[] = "title,clicked"; @@ -93,17 +72,12 @@ static void _content_set_hook(Evas_Object *obj, Evas_Object *content); static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part); static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part); ->>>>>>> remotes/origin/upstream static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _emit_hook(Evas_Object *obj, const char *emission, const char *source); static void _disable_hook(Evas_Object *obj); -<<<<<<< HEAD -static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); -======= ->>>>>>> remotes/origin/upstream static void _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label); @@ -195,12 +169,9 @@ static Elm_Naviframe_Item * _item_new(Evas_Object *obj, Evas_Object *next_btn, Evas_Object *content, const char *item_style); -<<<<<<< HEAD -======= static Eina_Bool _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next); ->>>>>>> remotes/origin/upstream static void _del_hook(Evas_Object *obj) @@ -219,10 +190,7 @@ _del_hook(Evas_Object *obj) Elm_Naviframe_Item); wd->stack = eina_inlist_remove(wd->stack, wd->stack->last); _item_del(it); -<<<<<<< HEAD -======= elm_widget_item_free(it); ->>>>>>> remotes/origin/upstream if (!wd->stack) break; } } @@ -249,30 +217,15 @@ _theme_hook(Evas_Object *obj) _item_style_set(it, it->style); _item_title_visible_update(it); } -<<<<<<< HEAD - - _elm_widget_mirrored_reload(obj); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); -======= ->>>>>>> remotes/origin/upstream } static void _emit_hook(Evas_Object *obj, const char *emission, const char *source) { -<<<<<<< HEAD - ELM_CHECK_WIDTYPE(obj, widtype); - - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - edje_object_signal_emit(wd->base, emission, source); -======= Elm_Object_Item *it = elm_naviframe_top_item_get(obj); if (!it) return; return elm_object_item_signal_emit(it, emission, source); ->>>>>>> remotes/origin/upstream } static void @@ -282,36 +235,12 @@ _disable_hook(Evas_Object *obj __UNUSED__) } static void -<<<<<<< HEAD -_mirrored_set(Evas_Object *obj, Eina_Bool rtl) -{ - Widget_Data *wd; - Elm_Naviframe_Item *it; - - wd = elm_widget_data_get(obj); - if (!wd) return; - - EINA_INLIST_FOREACH(wd->stack, it) - edje_object_mirrored_set(VIEW(it), rtl); - edje_object_mirrored_set(wd->base, rtl); -} - -static void -======= ->>>>>>> remotes/origin/upstream _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - - Elm_Naviframe_Text_Item_Pair *pair = NULL; - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; -======= Elm_Naviframe_Text_Item_Pair *pair = NULL; Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream char buf[1024]; if (!part || !strcmp(part, "default")) @@ -337,31 +266,17 @@ _item_text_set_hook(Elm_Object_Item *it, navi_it->text_list = eina_inlist_append(navi_it->text_list, EINA_INLIST_GET(pair)); } -<<<<<<< HEAD - - eina_stringshare_replace(&pair->text, label); - edje_object_part_text_set(VIEW(navi_it), buf, label); -======= elm_object_part_text_set(VIEW(navi_it), buf, label); ->>>>>>> remotes/origin/upstream if (label) { snprintf(buf, sizeof(buf), "elm,state,%s,show", buf); -<<<<<<< HEAD - edje_object_signal_emit(VIEW(navi_it), buf, "elm"); -======= elm_object_signal_emit(VIEW(navi_it), buf, "elm"); ->>>>>>> remotes/origin/upstream } else { snprintf(buf, sizeof(buf), "elm,state,%s,hide", buf); -<<<<<<< HEAD - edje_object_signal_emit(VIEW(navi_it), buf, "elm"); -======= elm_object_signal_emit(VIEW(navi_it), buf, "elm"); ->>>>>>> remotes/origin/upstream } _sizing_eval(WIDGET(navi_it)); @@ -370,12 +285,6 @@ _item_text_set_hook(Elm_Object_Item *it, static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Naviframe_Text_Item_Pair *pair = NULL; - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; -======= ->>>>>>> remotes/origin/upstream char buf[1024]; if (!part || !strcmp(part, "default")) @@ -385,16 +294,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part) else snprintf(buf, sizeof(buf), "%s", part); -<<<<<<< HEAD - EINA_INLIST_FOREACH(navi_it->text_list, pair) - { - if (!strcmp(buf, pair->part)) - return pair->text; - } - return NULL; -======= return elm_object_part_text_get(VIEW(it), buf); ->>>>>>> remotes/origin/upstream } static void @@ -402,37 +302,20 @@ _item_content_set_hook(Elm_Object_Item *it, const char *part, Evas_Object *content) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; - - //specified parts - if ((!part) || (!strcmp(part, "elm.swallow.content"))) -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts if (!part || !strcmp("default", part)) ->>>>>>> remotes/origin/upstream { _item_content_set(navi_it, content); return; } -<<<<<<< HEAD - else if (!strcmp(part, "elm.swallow.prev_btn")) -======= else if (!strcmp(part, "prev_btn")) ->>>>>>> remotes/origin/upstream { _title_prev_btn_set(navi_it, content, EINA_FALSE); return; } -<<<<<<< HEAD - else if (!strcmp(part, "elm.swallow.next_btn")) -======= else if (!strcmp(part, "next_btn")) ->>>>>>> remotes/origin/upstream { _title_next_btn_set(navi_it, content); return; @@ -450,18 +333,6 @@ _item_content_set_hook(Elm_Object_Item *it, static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Naviframe_Content_Item_Pair *pair = NULL; - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; - - //specified parts - if ((!part) || (!strcmp(part, "elm.swallow.content"))) - return navi_it->content; - else if (!strcmp(part, "elm.swallow.prev_btn")) - return navi_it->title_prev_btn; - else if (!strcmp(part, "elm.swallow.next_btn")) -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts @@ -470,38 +341,17 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part) else if (!strcmp(part, "prev_btn")) return navi_it->title_prev_btn; else if (!strcmp(part, "next_btn")) ->>>>>>> remotes/origin/upstream return navi_it->title_next_btn; else if (!strcmp(part, "icon")) return navi_it->title_icon; //common parts -<<<<<<< HEAD - EINA_INLIST_FOREACH(navi_it->content_list, pair) - { - if (!strcmp(part, pair->part)) - return pair->content; - } - return NULL; -======= return elm_object_part_content_get(VIEW(navi_it), part); ->>>>>>> remotes/origin/upstream } static Evas_Object * _item_content_unset_hook(Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; - - //specified parts - if (!part || !strcmp("elm.swallow.content", part)) - return _item_content_unset(navi_it); - else if (!strcmp(part, "elm.swallow.prev_btn")) - return _title_prev_btn_unset(navi_it); - else if (!strcmp(part, "elm.swallow.next_btn")) -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts @@ -510,7 +360,6 @@ _item_content_unset_hook(Elm_Object_Item *it, const char *part) else if (!strcmp(part, "prev_btn")) return _title_prev_btn_unset(navi_it); else if (!strcmp(part, "next_btn")) ->>>>>>> remotes/origin/upstream return _title_next_btn_unset(navi_it); else if (!strcmp(part, "icon")) return _title_icon_unset(navi_it); @@ -523,28 +372,16 @@ _item_signal_emit_hook(Elm_Object_Item *it, const char *emission, const char *source) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; - edje_object_signal_emit(VIEW(navi_it), emission, source); -======= elm_object_signal_emit(VIEW(it), emission, source); ->>>>>>> remotes/origin/upstream } static void _item_title_visible_update(Elm_Naviframe_Item *navi_it) { if (navi_it->title_visible) -<<<<<<< HEAD - edje_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm"); - else - edje_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm"); -======= elm_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm"); else elm_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm"); ->>>>>>> remotes/origin/upstream } static void @@ -564,13 +401,9 @@ _sizing_eval(Evas_Object *obj) { evas_object_move(VIEW(it), x, y); evas_object_resize(VIEW(it), w, h); -<<<<<<< HEAD - edje_object_size_min_calc(VIEW(it), &it->minw, &it->minh); -======= edje_object_size_min_calc(elm_layout_edje_get(VIEW(it)), &it->minw, &it->minh); ->>>>>>> remotes/origin/upstream if (it->minw > minw) minw = it->minw; if (it->minh > minh) minh = it->minh; } @@ -626,18 +459,12 @@ _back_btn_new(Evas_Object *obj) btn = elm_button_add(obj); if (!btn) return NULL; evas_object_smart_callback_add(btn, "clicked", _back_btn_clicked, obj); -<<<<<<< HEAD - snprintf(buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj)); -======= snprintf(buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj)); ->>>>>>> remotes/origin/upstream elm_object_style_set(btn, buf); return btn; } -<<<<<<< HEAD -======= static void _text_set_hook(Evas_Object *obj, const char *part, const char *label) @@ -678,7 +505,6 @@ _content_get_hook(const Evas_Object *obj, const char *part) return elm_object_item_part_content_get(it, part); } ->>>>>>> remotes/origin/upstream static void _title_content_del(void *data, Evas *e __UNUSED__, @@ -689,11 +515,7 @@ _title_content_del(void *data, Elm_Naviframe_Content_Item_Pair *pair = data; Elm_Naviframe_Item *it = pair->it; snprintf(buf, sizeof(buf), "elm,state,%s,hide", pair->part); -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), buf, "elm"); -======= elm_object_signal_emit(VIEW(it), buf, "elm"); ->>>>>>> remotes/origin/upstream it->content_list = eina_inlist_remove(it->content_list, EINA_INLIST_GET(pair)); eina_stringshare_del(pair->part); @@ -709,11 +531,7 @@ _title_prev_btn_del(void *data, Elm_Naviframe_Item *it = data; it->back_btn = EINA_FALSE; it->title_prev_btn = NULL; -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm"); -======= elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm"); ->>>>>>> remotes/origin/upstream } static void @@ -724,11 +542,7 @@ _title_next_btn_del(void *data, { Elm_Naviframe_Item *it = data; it->title_next_btn = NULL; -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm"); -======= elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm"); ->>>>>>> remotes/origin/upstream } static void @@ -739,11 +553,7 @@ _title_icon_del(void *data, { Elm_Naviframe_Item *it = data; it->title_icon = NULL; -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm"); -======= elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm"); ->>>>>>> remotes/origin/upstream } static void @@ -754,11 +564,7 @@ _item_content_del(void *data, { Elm_Naviframe_Item *it = data; it->content = NULL; -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm"); -======= elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm"); ->>>>>>> remotes/origin/upstream } static void @@ -768,32 +574,13 @@ _title_content_set(Elm_Naviframe_Item *it, { char buf[1024]; Elm_Naviframe_Content_Item_Pair *pair = NULL; -<<<<<<< HEAD -======= Evas_Object *prev_content = NULL; ->>>>>>> remotes/origin/upstream EINA_INLIST_FOREACH(it->content_list, pair) if (!strcmp(part, pair->part)) break; if (pair) { -<<<<<<< HEAD - if (pair->content != content) - { - if (content) - { - evas_object_event_callback_del(pair->content, - EVAS_CALLBACK_DEL, - _title_content_del); - evas_object_event_callback_del(pair->content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); - snprintf(buf, sizeof(buf), "elm,state,%s,hide", part); - edje_object_signal_emit(VIEW(it), buf, "elm"); - } - evas_object_del(pair->content); -======= prev_content = elm_object_part_content_get(VIEW(it), part); if (prev_content != content) { @@ -806,7 +593,6 @@ _title_content_set(Elm_Naviframe_Item *it, elm_object_signal_emit(VIEW(it), buf, "elm"); } evas_object_del(prev_content); ->>>>>>> remotes/origin/upstream if (!content) return; } } @@ -824,34 +610,16 @@ _title_content_set(Elm_Naviframe_Item *it, it->content_list = eina_inlist_append(it->content_list, EINA_INLIST_GET(pair)); } -<<<<<<< HEAD - if (pair->content != content) - { - elm_widget_sub_object_add(WIDGET(it), content); -======= if (prev_content != content) { ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _title_content_del, pair); -<<<<<<< HEAD - evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, - WIDGET(it)); - } - edje_object_part_swallow(VIEW(it), part, content); - snprintf(buf, sizeof(buf), "elm,state,%s,show", part); - edje_object_signal_emit(VIEW(it), buf, "elm"); - pair->content = content; -======= } elm_object_part_content_set(VIEW(it), part, content); snprintf(buf, sizeof(buf), "elm,state,%s,show", part); elm_object_signal_emit(VIEW(it), buf, "elm"); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); } @@ -862,36 +630,16 @@ _title_prev_btn_set(Elm_Naviframe_Item *it, Eina_Bool back_btn) { if (it->title_prev_btn == btn) return; -<<<<<<< HEAD - - if (it->title_prev_btn) - evas_object_del(it->title_prev_btn); - - it->title_prev_btn = btn; - if (!btn) return; - - elm_widget_sub_object_add(WIDGET(it), btn); -======= if (it->title_prev_btn) evas_object_del(it->title_prev_btn); it->title_prev_btn = btn; if (!btn) return; ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(btn, EVAS_CALLBACK_DEL, _title_prev_btn_del, it); -<<<<<<< HEAD - evas_object_event_callback_add(btn, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, - WIDGET(it)); - edje_object_part_swallow(VIEW(it), "elm.swallow.prev_btn", btn); - edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm"); -======= elm_object_part_content_set(VIEW(it), "elm.swallow.prev_btn", btn); elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm"); ->>>>>>> remotes/origin/upstream it->back_btn = back_btn; _sizing_eval(WIDGET(it)); @@ -901,36 +649,16 @@ static void _title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn) { if (it->title_next_btn == btn) return; -<<<<<<< HEAD - - if (it->title_next_btn) - evas_object_del(it->title_next_btn); - - it->title_next_btn = btn; - if (!btn) return; - - elm_widget_sub_object_add(WIDGET(it), btn); -======= if (it->title_next_btn) evas_object_del(it->title_next_btn); it->title_next_btn = btn; if (!btn) return; ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(btn, EVAS_CALLBACK_DEL, _title_next_btn_del, it); -<<<<<<< HEAD - evas_object_event_callback_add(btn, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, - WIDGET(it)); - edje_object_part_swallow(VIEW(it), "elm.swallow.next_btn", btn); - edje_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm"); -======= elm_object_part_content_set(VIEW(it), "elm.swallow.next_btn", btn); elm_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm"); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); } @@ -939,36 +667,16 @@ static void _title_icon_set(Elm_Naviframe_Item *it, Evas_Object *icon) { if (it->title_icon == icon) return; -<<<<<<< HEAD - - if (it->title_icon) - evas_object_del(it->title_icon); - - it->title_icon = icon; - if (!icon) return; - - elm_widget_sub_object_add(WIDGET(it), icon); -======= if (it->title_icon) evas_object_del(it->title_icon); it->title_icon = icon; if (!icon) return; ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(icon, EVAS_CALLBACK_DEL, _title_icon_del, it); -<<<<<<< HEAD - evas_object_event_callback_add(icon, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, - WIDGET(it)); - edje_object_part_swallow(VIEW(it), "elm.swallow.icon", icon); - edje_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm"); -======= elm_object_part_content_set(VIEW(it), "elm.swallow.icon", icon); elm_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm"); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); } @@ -979,23 +687,11 @@ _item_content_unset(Elm_Naviframe_Item *it) Evas_Object *content = it->content; if (!content) return NULL; -<<<<<<< HEAD - elm_widget_sub_object_del(WIDGET(it), content); - edje_object_part_unswallow(VIEW(it), content); - edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm"); - evas_object_event_callback_del(content, - EVAS_CALLBACK_DEL, - _item_content_del); - evas_object_event_callback_del(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); -======= elm_object_part_content_unset(VIEW(it), "elm.swallow.content"); elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm"); evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_content_del); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); it->content = NULL; @@ -1008,23 +704,11 @@ _title_prev_btn_unset(Elm_Naviframe_Item *it) Evas_Object *content = it->title_prev_btn; if (!content) return NULL; -<<<<<<< HEAD - elm_widget_sub_object_del(WIDGET(it), content); - edje_object_part_unswallow(VIEW(it), content); - edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm"); - evas_object_event_callback_del(content, - EVAS_CALLBACK_DEL, - _title_prev_btn_del); - evas_object_event_callback_del(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); -======= elm_object_part_content_unset(VIEW(it), "elm.swallow.prev_btn"); elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm"); evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _title_prev_btn_del); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); it->title_prev_btn = NULL; @@ -1037,23 +721,11 @@ _title_next_btn_unset(Elm_Naviframe_Item *it) Evas_Object *content = it->title_next_btn; if (!content) return NULL; -<<<<<<< HEAD - elm_widget_sub_object_del(WIDGET(it), content); - edje_object_part_unswallow(VIEW(it), content); - edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm"); - evas_object_event_callback_del(content, - EVAS_CALLBACK_DEL, - _title_next_btn_del); - evas_object_event_callback_del(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); -======= elm_object_part_content_unset(VIEW(it), "elm.swallow.next_btn"); elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm"); evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _title_next_btn_del); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); it->title_next_btn = NULL; @@ -1066,23 +738,11 @@ _title_icon_unset(Elm_Naviframe_Item *it) Evas_Object *content = it->title_icon; if (!content) return NULL; -<<<<<<< HEAD - elm_widget_sub_object_del(WIDGET(it), content); - edje_object_part_unswallow(VIEW(it), content); - edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm"); - evas_object_event_callback_del(content, - EVAS_CALLBACK_DEL, - _title_icon_del); - evas_object_event_callback_del(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); -======= elm_object_part_content_unset(VIEW(it), "elm.swallow.icon"); elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm"); evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _title_icon_del); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); it->title_icon = NULL; @@ -1100,11 +760,7 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part) { if (!strcmp(part, pair->part)) { -<<<<<<< HEAD - content = pair->content; -======= content = elm_object_part_content_get(VIEW(it), part); ->>>>>>> remotes/origin/upstream eina_stringshare_del(pair->part); it->content_list = eina_inlist_remove(it->content_list, EINA_INLIST_GET(pair)); @@ -1115,25 +771,12 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part) if (!content) return NULL; -<<<<<<< HEAD - elm_widget_sub_object_del(WIDGET(it), content); - edje_object_part_unswallow(VIEW(it), content); - snprintf(buf, sizeof(buf), "elm,state,%s,hide", part); - edje_object_signal_emit(VIEW(it), buf, "elm"); - evas_object_event_callback_del(content, - EVAS_CALLBACK_DEL, - _title_content_del); - evas_object_event_callback_del(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); -======= elm_object_part_content_unset(VIEW(it), part); snprintf(buf, sizeof(buf), "elm,state,%s,hide", part); elm_object_signal_emit(VIEW(it), buf, "elm"); evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _title_content_del); ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(it)); return content; @@ -1145,38 +788,13 @@ _item_del(Elm_Naviframe_Item *it) Widget_Data *wd; Elm_Naviframe_Content_Item_Pair *content_pair; Elm_Naviframe_Text_Item_Pair *text_pair; -<<<<<<< HEAD -======= Evas_Object *content; ->>>>>>> remotes/origin/upstream if (!it) return; wd = elm_widget_data_get(WIDGET(it)); if (!wd) return; -<<<<<<< HEAD - if (it->title_prev_btn) - evas_object_del(it->title_prev_btn); - if (it->title_next_btn) - evas_object_del(it->title_next_btn); - if (it->title_icon) - evas_object_del(it->title_icon); - if ((it->content) && (!wd->preserve)) - evas_object_del(it->content); - - while (it->content_list) - { - content_pair = EINA_INLIST_CONTAINER_GET(it->content_list, - Elm_Naviframe_Content_Item_Pair); - evas_object_event_callback_del(content_pair->content, - EVAS_CALLBACK_DEL, - _title_content_del); - evas_object_event_callback_del(content_pair->content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints); - evas_object_del(content_pair->content); -======= while (it->content_list) { content_pair = @@ -1186,7 +804,6 @@ _item_del(Elm_Naviframe_Item *it) evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _title_content_del); ->>>>>>> remotes/origin/upstream eina_stringshare_del(content_pair->part); it->content_list = eina_inlist_remove(it->content_list, it->content_list); @@ -1198,10 +815,6 @@ _item_del(Elm_Naviframe_Item *it) text_pair = EINA_INLIST_CONTAINER_GET(it->text_list, Elm_Naviframe_Text_Item_Pair); eina_stringshare_del(text_pair->part); -<<<<<<< HEAD - eina_stringshare_del(text_pair->text); -======= ->>>>>>> remotes/origin/upstream it->text_list = eina_inlist_remove(it->text_list, it->text_list); free(text_pair); @@ -1213,18 +826,10 @@ _item_del(Elm_Naviframe_Item *it) static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - Elm_Naviframe_Item *navi_it; - Widget_Data *wd; - - navi_it =(Elm_Naviframe_Item *) it; -======= Elm_Naviframe_Item *navi_it; Widget_Data *wd; navi_it =(Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(WIDGET(navi_it)); if (!wd) return EINA_FALSE; @@ -1263,20 +868,12 @@ _pushed_finished(void *data, if (!wd) return; evas_object_hide(VIEW(it)); -<<<<<<< HEAD - evas_object_smart_callback_call(WIDGET(it), - SIG_PUSH_FINISHED, - data); - if (wd->freeze_events) - evas_object_freeze_events_set(VIEW(it), EINA_FALSE); -======= if (wd->freeze_events) evas_object_freeze_events_set(VIEW(it), EINA_FALSE); elm_widget_item_smart_callback_call(it, SIG_ITEM_HIDE_FINISHED, NULL); ->>>>>>> remotes/origin/upstream } static void @@ -1287,12 +884,6 @@ _popped_finished(void *data, { Elm_Naviframe_Item *it = data; if (!it) return; -<<<<<<< HEAD - evas_object_smart_callback_call(WIDGET(it), - SIG_POP_FINISHED, - data); -======= ->>>>>>> remotes/origin/upstream _item_del(data); elm_widget_item_free(data); } @@ -1332,20 +923,6 @@ _item_content_set(Elm_Naviframe_Item *navi_it, Evas_Object *content) { if (navi_it->content == content) return; if (navi_it->content) evas_object_del(navi_it->content); -<<<<<<< HEAD - elm_widget_sub_object_add(WIDGET(navi_it), content); - edje_object_part_swallow(VIEW(navi_it), - "elm.swallow.content", - content); - if (content) - edje_object_signal_emit(VIEW(navi_it), - "elm,state,content,show", - "elm"); - else - edje_object_signal_emit(VIEW(navi_it), - "elm,state,content,hide", - "elm"); -======= elm_object_part_content_set(VIEW(navi_it), "elm.swallow.content", content); if (content) @@ -1353,18 +930,10 @@ _item_content_set(Elm_Naviframe_Item *navi_it, Evas_Object *content) else elm_object_signal_emit(VIEW(navi_it), "elm,state,content,hide", "elm"); ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _item_content_del, navi_it); -<<<<<<< HEAD - evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, - WIDGET(navi_it)); -======= ->>>>>>> remotes/origin/upstream navi_it->content = content; _sizing_eval(WIDGET(navi_it)); } @@ -1389,57 +958,6 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style) snprintf(buf, sizeof(buf), "item/%s", item_style); eina_stringshare_replace(&navi_it->style, item_style); } -<<<<<<< HEAD - _elm_theme_object_set(WIDGET(navi_it), - VIEW(navi_it), - "naviframe", - buf, - elm_widget_style_get(WIDGET(navi_it))); - //recover item - EINA_INLIST_FOREACH(navi_it->text_list, text_pair) - _item_text_set_hook((Elm_Object_Item *) navi_it, - text_pair->part, - text_pair->text); - - EINA_INLIST_FOREACH(navi_it->content_list, content_pair) - _item_content_set_hook((Elm_Object_Item *) navi_it, - content_pair->part, - content_pair->content); - //content - if (navi_it->content) - { - edje_object_part_swallow(VIEW(navi_it), - "elm.swallow.content", - navi_it->content); - edje_object_signal_emit(VIEW(navi_it), - "elm,state,content,show", - "elm"); - } - - //prev button - if (navi_it->title_prev_btn) - { - edje_object_part_swallow(VIEW(navi_it), - "elm.swallow.prev_btn", - navi_it->title_prev_btn); - edje_object_signal_emit(VIEW(navi_it), - "elm,state,prev_btn,show", - "elm"); - } - - //next button - if (navi_it->title_next_btn) - { - edje_object_part_swallow(VIEW(navi_it), - "elm.swallow.next_btn", - navi_it->title_next_btn); - edje_object_signal_emit(VIEW(navi_it), - "elm,state,next_btn,show", - "elm"); - } - - navi_it->title_visible = EINA_TRUE; -======= elm_layout_theme_set(VIEW(navi_it), "naviframe", buf, @@ -1470,7 +988,6 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style) // why does this forcibly enable title? isnt that separate to style? // navi_it->title_visible = EINA_TRUE; ->>>>>>> remotes/origin/upstream _sizing_eval(WIDGET(navi_it)); wd = elm_widget_data_get(WIDGET(navi_it)); @@ -1507,25 +1024,6 @@ _item_new(Evas_Object *obj, elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook); //item base layout -<<<<<<< HEAD - VIEW(it) = edje_object_add(evas_object_evas_get(obj)); - edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj)); - evas_object_smart_member_add(VIEW(it), wd->base); - elm_widget_sub_object_add(obj, VIEW(it)); - edje_object_signal_callback_add(VIEW(it), - "elm,action,show,finished", - "", - _show_finished, it); - edje_object_signal_callback_add(VIEW(it), - "elm,action,pushed,finished", - "", - _pushed_finished, it); - edje_object_signal_callback_add(VIEW(it), - "elm,action,popped,finished", - "", - _popped_finished, it); - edje_object_signal_callback_add(VIEW(it), -======= VIEW(it) = elm_layout_add(obj); evas_object_smart_member_add(VIEW(it), wd->base); @@ -1546,17 +1044,12 @@ _item_new(Evas_Object *obj, "", _popped_finished, it); elm_object_signal_callback_add(VIEW(it), ->>>>>>> remotes/origin/upstream "elm,action,title,clicked", "", _title_clicked, it); _item_style_set(it, item_style); -<<<<<<< HEAD - _item_text_set_hook((Elm_Object_Item *) it, "elm.text.title", title_label); -======= _item_text_set_hook((Elm_Object_Item *)it, "elm.text.title", title_label); ->>>>>>> remotes/origin/upstream //title buttons if ((!prev_btn) && wd->auto_pushed && eina_inlist_count(wd->stack)) @@ -1573,8 +1066,6 @@ _item_new(Evas_Object *obj, return it; } -<<<<<<< HEAD -======= static Eina_Bool _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next) { @@ -1585,7 +1076,6 @@ _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object ** next); } ->>>>>>> remotes/origin/upstream EAPI Evas_Object * elm_naviframe_add(Evas_Object *parent) { @@ -1601,15 +1091,6 @@ elm_naviframe_add(Evas_Object *parent) elm_widget_del_hook_set(obj, _del_hook); elm_widget_disable_hook_set(obj, _disable_hook); elm_widget_theme_hook_set(obj, _theme_hook); -<<<<<<< HEAD - elm_widget_signal_emit_hook_set(obj, _emit_hook); - - //base - wd->base = edje_object_add(e); - edje_object_mirrored_set(wd->base, elm_widget_mirrored_get(obj)); - elm_widget_resize_object_set(obj, wd->base); - _elm_theme_object_set(obj, wd->base, "naviframe", "base", "default"); -======= elm_widget_text_set_hook_set(obj, _text_set_hook); elm_widget_text_get_hook_set(obj, _text_get_hook); elm_widget_content_set_hook_set(obj, _content_set_hook); @@ -1628,7 +1109,6 @@ elm_naviframe_add(Evas_Object *parent) obj); elm_widget_resize_object_set(obj, wd->base); elm_layout_theme_set(wd->base, "naviframe", "base", "default"); ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj); @@ -1668,24 +1148,6 @@ elm_naviframe_item_push(Evas_Object *obj, evas_object_freeze_events_set(VIEW(it), EINA_TRUE); evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE); } -<<<<<<< HEAD - edje_object_signal_emit(VIEW(prev_it), - "elm,state,cur,pushed", - "elm"); - edje_object_signal_emit(VIEW(it), - "elm,state,new,pushed", - "elm"); - edje_object_message_signal_process(VIEW(prev_it)); - edje_object_message_signal_process(VIEW(it)); - } - wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it)); - _sizing_eval(obj); - return (Elm_Object_Item *) it; -} - -EAPI Elm_Object_Item * -elm_naviframe_item_insert_before(Elm_Object_Item *before, -======= elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm"); elm_object_signal_emit(VIEW(it), "elm,state,new,pushed", "elm"); edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); @@ -1700,26 +1162,18 @@ elm_naviframe_item_insert_before(Elm_Object_Item *before, EAPI Elm_Object_Item * elm_naviframe_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, ->>>>>>> remotes/origin/upstream const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) { -<<<<<<< HEAD -======= ELM_CHECK_WIDTYPE(obj, widtype) NULL; ->>>>>>> remotes/origin/upstream ELM_OBJ_ITEM_CHECK_OR_RETURN(before, NULL); Elm_Naviframe_Item *it; Widget_Data *wd; -<<<<<<< HEAD - wd = elm_widget_data_get(WIDGET(before)); -======= wd = elm_widget_data_get(obj); ->>>>>>> remotes/origin/upstream if (!wd) return NULL; it = _item_new(WIDGET(before), title_label, prev_btn, next_btn, content, @@ -1727,16 +1181,6 @@ elm_naviframe_item_insert_before(Evas_Object *obj, if (!it) return NULL; wd->stack = -<<<<<<< HEAD - eina_inlist_prepend_relative(wd->stack, EINA_INLIST_GET(it), - EINA_INLIST_GET(((Elm_Naviframe_Item *) before))); - _sizing_eval(WIDGET(before)); - return (Elm_Object_Item *) it; -} - -EAPI Elm_Object_Item * -elm_naviframe_item_insert_after(Elm_Object_Item *after, -======= eina_inlist_prepend_relative(wd->stack, EINA_INLIST_GET(it), EINA_INLIST_GET(((Elm_Naviframe_Item *) before))); @@ -1747,26 +1191,18 @@ elm_naviframe_item_insert_after(Elm_Object_Item *after, EAPI Elm_Object_Item * elm_naviframe_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, ->>>>>>> remotes/origin/upstream const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) { -<<<<<<< HEAD -======= ELM_CHECK_WIDTYPE(obj, widtype) NULL; ->>>>>>> remotes/origin/upstream ELM_OBJ_ITEM_CHECK_OR_RETURN(after, NULL); Elm_Naviframe_Item *it; Widget_Data *wd; -<<<<<<< HEAD - wd = elm_widget_data_get(WIDGET(after)); -======= wd = elm_widget_data_get(obj); ->>>>>>> remotes/origin/upstream if (!wd) return NULL; it = _item_new(WIDGET(after), title_label, prev_btn, next_btn, content, @@ -1779,18 +1215,11 @@ elm_naviframe_item_insert_after(Evas_Object *obj, evas_object_show(VIEW(it)); } wd->stack = -<<<<<<< HEAD - eina_inlist_append_relative(wd->stack, EINA_INLIST_GET(it), - EINA_INLIST_GET(((Elm_Naviframe_Item *) after))); - _sizing_eval(WIDGET(after)); - return (Elm_Object_Item *) it; -======= eina_inlist_append_relative(wd->stack, EINA_INLIST_GET(it), EINA_INLIST_GET(((Elm_Naviframe_Item *) after))); _sizing_eval(WIDGET(after)); return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -1806,10 +1235,6 @@ elm_naviframe_item_pop(Evas_Object *obj) it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(obj); if (!it) return NULL; -<<<<<<< HEAD - elm_widget_tree_unfocusable_set(it->content, EINA_TRUE); -======= ->>>>>>> remotes/origin/upstream if (wd->preserve) content = it->content; @@ -1824,16 +1249,6 @@ elm_naviframe_item_pop(Evas_Object *obj) evas_object_freeze_events_set(VIEW(it), EINA_TRUE); evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE); } -<<<<<<< HEAD - edje_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm"); - evas_object_show(VIEW(prev_it)); - evas_object_raise(VIEW(prev_it)); - edje_object_signal_emit(VIEW(prev_it), - "elm,state,prev,popped", - "elm"); - edje_object_message_signal_process(VIEW(it)); - edje_object_message_signal_process(VIEW(prev_it)); -======= elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm"); evas_object_show(VIEW(prev_it)); evas_object_raise(VIEW(prev_it)); @@ -1845,7 +1260,6 @@ elm_naviframe_item_pop(Evas_Object *obj) elm_widget_item_smart_callback_call(prev_it, SIG_ITEM_SHOW_BEGIN, NULL); ->>>>>>> remotes/origin/upstream } else { @@ -1864,11 +1278,7 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it) Widget_Data *wd; Eina_Inlist *l, *prev_l; -<<<<<<< HEAD - navi_it = (Elm_Naviframe_Item *) it; -======= navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(WIDGET(navi_it)); if (!wd) return; @@ -1879,11 +1289,7 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it) while(l) { if (EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item) == -<<<<<<< HEAD - ((Elm_Naviframe_Item *) it)) break; -======= ((Elm_Naviframe_Item *)it)) break; ->>>>>>> remotes/origin/upstream prev_l = l->prev; wd->stack = eina_inlist_remove(wd->stack, l); _item_del(EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item)); @@ -1902,45 +1308,21 @@ elm_naviframe_item_promote(Elm_Object_Item *it) Elm_Naviframe_Item *prev_it; Widget_Data *wd; -<<<<<<< HEAD - navi_it = (Elm_Naviframe_Item *) it; -======= navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(navi_it->base.widget); if (!wd) return; if (it == elm_naviframe_top_item_get(navi_it->base.widget)) return; -<<<<<<< HEAD - wd->stack = eina_inlist_demote(wd->stack, EINA_INLIST_GET(navi_it)); - prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev, - Elm_Naviframe_Item); -======= elm_widget_tree_unfocusable_set(navi_it->content, EINA_FALSE); wd->stack = eina_inlist_demote(wd->stack, EINA_INLIST_GET(navi_it)); prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev, Elm_Naviframe_Item); elm_widget_tree_unfocusable_set(prev_it->content, EINA_FALSE); ->>>>>>> remotes/origin/upstream if (wd->freeze_events) { evas_object_freeze_events_set(VIEW(it), EINA_TRUE); evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE); } -<<<<<<< HEAD - edje_object_signal_emit(VIEW(prev_it), - "elm,state,cur,pushed", - "elm"); - evas_object_show(VIEW(navi_it)); - evas_object_raise(VIEW(navi_it)); - edje_object_signal_emit(VIEW(navi_it), - "elm,state,new,pushed", - "elm"); - edje_object_message_signal_process(VIEW(prev_it)); - edje_object_message_signal_process(VIEW(navi_it)); -} - -======= elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm"); @@ -1971,7 +1353,6 @@ elm_naviframe_item_simple_promote(Evas_Object *obj, Evas_Object *content) } ->>>>>>> remotes/origin/upstream EAPI void elm_naviframe_item_del(Elm_Object_Item *it) { @@ -2020,14 +1401,8 @@ EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; - - //Return if new style is exsiting one. -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream if (item_style) if (!strcmp(item_style, navi_it->style)) return; @@ -2041,11 +1416,7 @@ EAPI const char * elm_naviframe_item_style_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream return navi_it->style; } @@ -2053,11 +1424,7 @@ EAPI void elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream visible = !!visible; if (navi_it->title_visible == visible) return; @@ -2070,11 +1437,7 @@ EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -<<<<<<< HEAD - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; -======= Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; ->>>>>>> remotes/origin/upstream return navi_it->title_visible; } @@ -2096,25 +1459,17 @@ elm_naviframe_prev_btn_auto_pushed_get(const Evas_Object *obj) return wd->auto_pushed; } -<<<<<<< HEAD -EAPI Eina_Inlist * -======= EAPI Eina_List * ->>>>>>> remotes/origin/upstream elm_naviframe_items_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; -<<<<<<< HEAD - return wd->stack; -======= Eina_List *ret = NULL; Elm_Naviframe_Item *itr; EINA_INLIST_FOREACH(wd->stack, itr) ret = eina_list_append(ret, itr); return ret; ->>>>>>> remotes/origin/upstream } EAPI void diff --git a/src/lib/elc_naviframe.h b/src/lib/elc_naviframe.h index 627cfab..d43d209 100644 --- a/src/lib/elc_naviframe.h +++ b/src/lib/elc_naviframe.h @@ -6,11 +6,7 @@ * * Naviframe provides functions to switch different pages with stack * mechanism. It means if one page(item) needs to be changed to the new one, -<<<<<<< HEAD - * then naviframe would push the new page to it's internal stack. Of course, -======= * then naviframe would push the new page to its internal stack. Of course, ->>>>>>> remotes/origin/upstream * it can be back to the previous page by popping the top page. Naviframe * provides some transition effect while the pages are switching (same as * pager). @@ -18,16 +14,6 @@ * Since each item could keep the different styles, users could keep the * same look & feel for the pages or different styles for the items in it's * application. -<<<<<<< HEAD - * - * Signals that you can add callback for are: - * @li "transition,finished" - When the transition is finished in changing - * the item - * @li "title,clicked" - User clicked title area - * - * Default contents parts of the naviframe items that you can use for are: - * @li "default" - A main content of the page -======= * * Default content parts of the naviframe that you can use content hooks for * are: @@ -53,7 +39,6 @@ * Default content parts of the naviframe items that you can use content hooks * for are: * @li "default" - The main content of the page ->>>>>>> remotes/origin/upstream * @li "icon" - An icon in the title area * @li "prev_btn" - A button to go to the previous page * @li "next_btn" - A button to go to the next page @@ -64,14 +49,11 @@ * * Supported elm_object common APIs. * @li elm_object_signal_emit -<<<<<<< HEAD -======= * @li elm_object_part_text_set * @li elm_object_part_text_get * @li elm_object_part_content_set * @li elm_object_part_content_get * @li elm_object_part_content_unset ->>>>>>> remotes/origin/upstream * * Supported elm_object_item common APIs. * @li elm_object_item_part_text_set @@ -82,35 +64,6 @@ * @li elm_object_item_signal_emit */ -<<<<<<< HEAD - //Available commonly - #define ELM_NAVIFRAME_ITEM_CONTENT "elm.swallow.content" - #define ELM_NAVIFRAME_ITEM_ICON "elm.swallow.icon" - #define ELM_NAVIFRAME_ITEM_OPTIONHEADER "elm.swallow.optionheader" - #define ELM_NAVIFRAME_ITEM_TITLE_LABEL "elm.text.title" - #define ELM_NAVIFRAME_ITEM_PREV_BTN "elm.swallow.prev_btn" - #define ELM_NAVIFRAME_ITEM_TITLE_LEFT_BTN "elm.swallow.left_btn" - #define ELM_NAVIFRAME_ITEM_TITLE_RIGHT_BTN "elm.swallow.right_btn" - #define ELM_NAVIFRAME_ITEM_TITLE_MORE_BTN "elm.swallow.more_btn" - #define ELM_NAVIFRAME_ITEM_CONTROLBAR "elm.swallow.controlbar" - #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_CLOSE "elm,state,optionheader,close", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_OPEN "elm,state,optionheader,open", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_CLOSE "elm,state,optionheader,instant_close", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_OPEN "elm,state,optionheader,instant_open", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_CONTROLBAR_CLOSE "elm,state,controlbar,close", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_CONTROLBAR_OPEN "elm,state,controlbar,open", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_CONTROLBAR_INSTANT_CLOSE "elm,state,controlbar,instant_close", "" - #define ELM_NAVIFRAME_ITEM_SIGNAL_CONTROLBAR_INSTANT_OPEN "elm,state,controlbar,instant_open", "" - - //Available only in a style - "2line" - #define ELM_NAVIFRAME_ITEM_OPTIONHEADER2 "elm.swallow.optionheader2" - - //Available only in a style - "segment" - #define ELM_NAVIFRAME_ITEM_SEGMENT2 "elm.swallow.segment2" - #define ELM_NAVIFRAME_ITEM_SEGMENT3 "elm.swallow.segment3" - -======= ->>>>>>> remotes/origin/upstream /** * @addtogroup Naviframe * @{ @@ -160,10 +113,7 @@ EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *titl /** * @brief Insert a new item into the naviframe before item @p before. * -<<<<<<< HEAD -======= * @param obj The naviframe object ->>>>>>> remotes/origin/upstream * @param before The naviframe item to insert before. * @param title_label The label in the title area. The name of the title * label part is "elm.text.title" @@ -190,19 +140,12 @@ EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *titl * * @ingroup Naviframe */ -<<<<<<< HEAD -EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); -======= EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); ->>>>>>> remotes/origin/upstream /** * @brief Insert a new item into the naviframe after item @p after. * -<<<<<<< HEAD -======= * @param obj The naviframe object ->>>>>>> remotes/origin/upstream * @param after The naviframe item to insert after. * @param title_label The label in the title area. The name of the title * label part is "elm.text.title" @@ -229,11 +172,7 @@ EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Evas_Object *obj, Elm_Obj * * @ingroup Naviframe */ -<<<<<<< HEAD -EAPI Elm_Object_Item *elm_naviframe_item_insert_after(Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); -======= EAPI Elm_Object_Item *elm_naviframe_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); ->>>>>>> remotes/origin/upstream /** * @brief Pop an item that is on top of the stack @@ -405,14 +344,6 @@ EAPI Eina_Bool elm_naviframe_prev_btn_auto_pushed_get(const Evas_Object * * @brief Get a list of all the naviframe items. * * @param obj The naviframe object -<<<<<<< HEAD - * @return An Eina_Inlist* of naviframe items, #Elm_Object_Item, - * or @c NULL on failure. - * - * @ingroup Naviframe - */ -EAPI Eina_Inlist *elm_naviframe_items_get(const Evas_Object *obj); -======= * @return An Eina_List of naviframe items, #Elm_Object_Item, * or @c NULL on failure. * @note The returned list MUST be freed. @@ -420,7 +351,6 @@ EAPI Eina_Inlist *elm_naviframe_items_get(const Evas_Object *obj); * @ingroup Naviframe */ EAPI Eina_List *elm_naviframe_items_get(const Evas_Object *obj) EINA_MALLOC EINA_WARN_UNUSED_RESULT; ->>>>>>> remotes/origin/upstream /** * @brief Set the event enabled when pushing/popping items @@ -456,8 +386,6 @@ EAPI void elm_naviframe_event_enabled_set(Evas_Object *obj, Eina_Boo EAPI Eina_Bool elm_naviframe_event_enabled_get(const Evas_Object *obj); /** -<<<<<<< HEAD -======= * @brief Simple version of item_push. * * @see elm_naviframe_item_push @@ -479,6 +407,5 @@ elm_naviframe_item_simple_push(Evas_Object *obj, Evas_Object *content) EAPI void elm_naviframe_item_simple_promote(Evas_Object *obj, Evas_Object *content); /** ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c index 233269e..2f8c093 100644 --- a/src/lib/elm_frame.c +++ b/src/lib/elm_frame.c @@ -26,13 +26,9 @@ static void _del_hook(Evas_Object *obj); static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); static void _theme_hook(Evas_Object *obj); static void _sizing_eval(Evas_Object *obj); -<<<<<<< HEAD -static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); -======= static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); ->>>>>>> remotes/origin/upstream static void _sub_del(void *data, Evas_Object *obj, void *event_info); static void @@ -59,13 +55,6 @@ _theme_hook(Evas_Object *obj) if (!wd) return; _elm_widget_mirrored_reload(obj); _mirrored_set(obj, elm_widget_mirrored_get(obj)); -<<<<<<< HEAD - _elm_theme_object_set(obj, wd->frm, "frame", "base", elm_widget_style_get(obj)); - edje_object_part_text_set(wd->frm, "elm.text", wd->label); - if (wd->content) - edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content); - edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale); -======= _elm_theme_object_set(obj, wd->frm, "frame", "base", elm_widget_style_get(obj)); edje_object_part_text_set(wd->frm, "elm.text", wd->label); @@ -73,7 +62,6 @@ _theme_hook(Evas_Object *obj) edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content); edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale); ->>>>>>> remotes/origin/upstream _sizing_eval(obj); } @@ -81,23 +69,12 @@ static Eina_Bool _elm_frame_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next) { Widget_Data *wd = elm_widget_data_get(obj); -<<<<<<< HEAD - Evas_Object *cur; -======= ->>>>>>> remotes/origin/upstream if ((!wd) || (!wd->content)) return EINA_FALSE; -<<<<<<< HEAD - cur = wd->content; - - /* Try Focus cycle in subitem */ - return elm_widget_focus_next_get(cur, dir, next); -======= /* Try Focus cycle in subitem */ return elm_widget_focus_next_get(wd->content, dir, next); ->>>>>>> remotes/origin/upstream } static void @@ -118,17 +95,10 @@ static void _changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); -<<<<<<< HEAD - // FIXME: why is this needed? how does edje get this unswallowed or - // lose its callbacks to edje - if (!wd) return; - if (wd->anim) return; -======= if (!wd) return; if (wd->anim) return; // FIXME: why is this needed? how does edje get this unswallowed or // lose its callbacks to edje ->>>>>>> remotes/origin/upstream edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content); _sizing_eval(data); } @@ -141,12 +111,8 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) if (!wd) return; if (sub == wd->content) { -<<<<<<< HEAD - evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, -======= evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, ->>>>>>> remotes/origin/upstream _changed_size_hints, obj); wd->content = NULL; _sizing_eval(obj); @@ -170,13 +136,8 @@ _elm_frame_label_get(const Evas_Object *obj, const char *item) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); -<<<<<<< HEAD - if (item && strcmp(item, "default")) return NULL; - if (!wd) return NULL; -======= if (!wd) return NULL; if (item && strcmp(item, "default")) return NULL; ->>>>>>> remotes/origin/upstream return wd->label; } @@ -195,12 +156,8 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) if (content) { elm_widget_sub_object_add(obj, content); -<<<<<<< HEAD - evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, -======= evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, ->>>>>>> remotes/origin/upstream _changed_size_hints, obj); edje_object_part_swallow(wd->frm, "elm.swallow.content", content); } @@ -216,10 +173,7 @@ _content_get_hook(const Evas_Object *obj, const char *part) if (part && strcmp(part, "default")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; -<<<<<<< HEAD -======= ->>>>>>> remotes/origin/upstream return wd->content; } @@ -231,12 +185,7 @@ _content_unset_hook(Evas_Object *obj, const char *part) Evas_Object *content; if (part && strcmp(part, "default")) return NULL; wd = elm_widget_data_get(obj); -<<<<<<< HEAD - if (!wd) return NULL; - if (!wd->content) return NULL; -======= if (!wd || !wd->content) return NULL; ->>>>>>> remotes/origin/upstream content = wd->content; elm_widget_sub_object_del(obj, wd->content); evas_object_event_callback_del_full(wd->content, @@ -319,29 +268,17 @@ elm_frame_add(Evas_Object *parent) } EAPI void -<<<<<<< HEAD -elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool enable) -======= elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse) ->>>>>>> remotes/origin/upstream { Widget_Data *wd; ELM_CHECK_WIDTYPE(obj, widtype); wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->collapsible = !!enable; -} - -EAPI Eina_Bool -elm_frame_autocollapse_get(Evas_Object *obj) -======= wd->collapsible = !!autocollapse; } EAPI Eina_Bool elm_frame_autocollapse_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { Widget_Data *wd; ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; @@ -361,11 +298,7 @@ elm_frame_collapse_set(Evas_Object *obj, Eina_Bool collapse) if (wd->collapsed == collapse) return; edje_object_signal_emit(wd->frm, "elm,action,switch", "elm"); edje_object_message_signal_process(wd->frm); -<<<<<<< HEAD - wd->collapsed = collapse; -======= wd->collapsed = !!collapse; ->>>>>>> remotes/origin/upstream wd->anim = EINA_FALSE; _sizing_eval(obj); } @@ -380,21 +313,13 @@ elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse) collapse = !!collapse; if (wd->collapsed == collapse) return; edje_object_signal_emit(wd->frm, "elm,action,toggle", "elm"); -<<<<<<< HEAD - evas_object_smart_callback_add(wd->frm, "recalc", (Evas_Smart_Cb)_recalc, obj); -======= evas_object_smart_callback_add(wd->frm, "recalc", _recalc, obj); ->>>>>>> remotes/origin/upstream wd->collapsed = collapse; wd->anim = EINA_TRUE; } EAPI Eina_Bool -<<<<<<< HEAD -elm_frame_collapse_get(Evas_Object *obj) -======= elm_frame_collapse_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { Widget_Data *wd; ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; @@ -402,37 +327,3 @@ elm_frame_collapse_get(const Evas_Object *obj) if (!wd) return EINA_FALSE; return wd->collapsed; } -<<<<<<< HEAD - - -EAPI void -elm_frame_label_set(Evas_Object *obj, const char *label) -{ - _elm_frame_label_set(obj, NULL, label); -} - -EAPI const char * -elm_frame_label_get(const Evas_Object *obj) -{ - return _elm_frame_label_get(obj, NULL); -} - -EAPI void -elm_frame_content_set(Evas_Object *obj, Evas_Object *content) -{ - _content_set_hook(obj, NULL, content); -} - -EAPI Evas_Object * -elm_frame_content_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, NULL); -} - -EAPI Evas_Object * -elm_frame_content_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, NULL); -} -======= ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_frame.h b/src/lib/elm_frame.h index 8461902..285f767 100644 --- a/src/lib/elm_frame.h +++ b/src/lib/elm_frame.h @@ -6,11 +6,7 @@ * * @brief Frame is a widget that holds some content and has a title. * -<<<<<<< HEAD - * The default look is a frame with a title, but Frame supports multple -======= * The default look is a frame with a title, but Frame supports multiple ->>>>>>> remotes/origin/upstream * styles: * @li default * @li pad_small @@ -25,11 +21,7 @@ * Smart callbacks one can listen to: * - @c "clicked" - The user has clicked the frame's label * -<<<<<<< HEAD - * Default contents parts of the frame widget that you can use for are: -======= * Default content parts of the frame widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "default" - A content of the frame * * Default text parts of the frame widget that you can use for are: @@ -58,21 +50,13 @@ EAPI Evas_Object *elm_frame_add(Evas_Object *parent); /** * @brief Toggle autocollapsing of a frame * @param obj The frame -<<<<<<< HEAD - * @param enable Whether to enable autocollapse -======= * @param autocollapse Whether to enable autocollapse ->>>>>>> remotes/origin/upstream * * When @p enable is EINA_TRUE, clicking a frame's label will collapse the frame * vertically, shrinking it to the height of the label. * By default, this is DISABLED. */ -<<<<<<< HEAD -EAPI void elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool enable); -======= EAPI void elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse); ->>>>>>> remotes/origin/upstream /** * @brief Determine autocollapsing of a frame @@ -83,11 +67,7 @@ EAPI void elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse); * vertically, shrinking it to the height of the label. * By default, this is DISABLED. */ -<<<<<<< HEAD -EAPI Eina_Bool elm_frame_autocollapse_get(Evas_Object *obj); -======= EAPI Eina_Bool elm_frame_autocollapse_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * @brief Manually collapse a frame without animations @@ -99,25 +79,6 @@ EAPI Eina_Bool elm_frame_autocollapse_get(const Evas_Object *obj); EAPI void elm_frame_collapse_set(Evas_Object *obj, Eina_Bool collapse); /** -<<<<<<< HEAD - * @brief Manually collapse a frame with animations - * @param obj The frame - * @param collapse true to collapse, false to expand - * - * Use this to toggle the collapsed state of a frame, triggering animations. - */ -EAPI void elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse); - -/** - * @brief Determine the collapse state of a frame - * @param obj The frame - * @return true if collapsed, false otherwise - * - * Use this to determine the collapse state of a frame. - */ -EAPI Eina_Bool elm_frame_collapse_get(Evas_Object *obj); -/** -======= * @brief Determine the collapse state of a frame * @param obj The frame * @return true if collapsed, false otherwise @@ -136,6 +97,5 @@ EAPI Eina_Bool elm_frame_collapse_get(const Evas_Object *obj); EAPI void elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse); /* ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c index 95a1883..7e65175 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -75,11 +75,7 @@ struct _Gesture_Info Evas_Object *obj; void *data; /**< Holds gesture intemidiate processing data */ Func_Data fn[ELM_GESTURE_STATE_ABORT + 1]; /**< Callback info for states */ -<<<<<<< HEAD - Elm_Gesture_Types g_type; /**< gesture type */ -======= Elm_Gesture_Type g_type; /**< gesture type */ ->>>>>>> remotes/origin/upstream Elm_Gesture_State state; /**< gesture state */ void *info; /**< Data for the state callback */ Eina_Bool test; /**< if true this gesture should be tested on input */ @@ -274,11 +270,7 @@ static Eina_Bool _event_history_clear(Evas_Object *obj); static void _reset_states(Widget_Data *wd); static void _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -<<<<<<< HEAD -static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, Evas_Callback_Type event_type, Elm_Gesture_Types g_type); -======= static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, Evas_Callback_Type event_type, Elm_Gesture_Type g_type); ->>>>>>> remotes/origin/upstream static void _mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -594,21 +586,6 @@ _clear_if_finished(Evas_Object *obj) } static Eina_Bool -<<<<<<< HEAD -_inside(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2) -{ - int w = elm_finger_size_get() >> 1; /* Finger size devided by 2 */ - if (x1 < (x2 - w)) - return EINA_FALSE; - - if (x1 > (x2 + w)) - return EINA_FALSE; - - if (y1 < (y2 - w)) - return EINA_FALSE; - - if (y1 > (y2 + w)) -======= _inside(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) { int w = _elm_config->finger_size >> 1; /* Finger size devided by 2 */ @@ -622,7 +599,6 @@ _inside(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) return EINA_FALSE; if (yy1 > (yy2 + w)) ->>>>>>> remotes/origin/upstream return EINA_FALSE; return EINA_TRUE; @@ -670,12 +646,6 @@ _n_long_tap_test_reset(Gesture_Info *gesture) Eina_List *l; Pointer_Event *p; EINA_LIST_FOREACH(st->touched, l, p) -<<<<<<< HEAD - free(p); - - eina_list_free(st->touched); - if (st->timeout) ecore_timer_del(st->timeout); -======= free(p); eina_list_free(st->touched); @@ -684,7 +654,6 @@ _n_long_tap_test_reset(Gesture_Info *gesture) ecore_timer_del(st->timeout); st->timeout = NULL; } ->>>>>>> remotes/origin/upstream memset(gesture->data, 0, sizeof(Long_Tap_Type)); } @@ -891,15 +860,9 @@ _add_device_pending(Eina_List *list, void *event, Evas_Callback_Type event_type) } if (!eina_list_search_unsorted_list(list, device_in_pending_list, -<<<<<<< HEAD - (intptr_t*) device)) - { - return eina_list_append(list, (intptr_t*) device); -======= (void *)(intptr_t)device)) { return eina_list_append(list, (void *)(intptr_t)device); ->>>>>>> remotes/origin/upstream } return list; @@ -927,11 +890,7 @@ _device_is_pending(Eina_List *list, void *event, Evas_Callback_Type event_type) } return eina_list_search_unsorted_list(list, device_in_pending_list, -<<<<<<< HEAD - (intptr_t *) device); -======= (void *)(intptr_t)device); ->>>>>>> remotes/origin/upstream } /** @@ -958,11 +917,7 @@ _event_history_clear(Evas_Object *obj) Gesture_Info *p; Evas *e = evas_object_evas_get(obj); Eina_Bool gesture_found = EINA_FALSE; -<<<<<<< HEAD - for (i = ELM_GESTURE_FIRST ; i < ELM_GESTURE_LAST; i++) -======= for (i = ELM_GESTURE_FIRST; i < ELM_GESTURE_LAST; i++) ->>>>>>> remotes/origin/upstream { p = wd->gesture[i]; if (p) @@ -1119,11 +1074,7 @@ _del_hook(Evas_Object *obj) Pointer_Event *data; EINA_LIST_FREE(wd->touched, data) -<<<<<<< HEAD - free(data); -======= free(data); ->>>>>>> remotes/origin/upstream if (!elm_widget_disabled_get(obj)) _unregister_callbacks(obj); @@ -1172,10 +1123,6 @@ compare_pe_device(const void *data1, const void *data2) (pe1->event_type != EVAS_CALLBACK_MOUSE_DOWN)) return 1; -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream if (pe1->device == pe2->device) return 0; else if (pe1->device < pe2->device) @@ -1494,11 +1441,7 @@ _compute_taps_center(Long_Tap_Type *st, static void _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, Evas_Callback_Type event_type, -<<<<<<< HEAD - Elm_Gesture_Types g_type) -======= Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { /* Here we fill Recent_Taps struct and fire-up click/tap timers */ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -1627,15 +1570,6 @@ _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe, * @ingroup Elm_Gesture_Layer */ static void -<<<<<<< HEAD -_set_momentum(Elm_Gesture_Momentum_Info *momentum, Evas_Coord x1, Evas_Coord y1, - Evas_Coord x2, Evas_Coord y2, unsigned int t1x, unsigned int t1y, - unsigned int t2) -{ - Evas_Coord velx = 0, vely = 0, vel; - Evas_Coord dx = x2 - x1; - Evas_Coord dy = y2 - y1; -======= _set_momentum(Elm_Gesture_Momentum_Info *momentum, Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2, @@ -1644,7 +1578,6 @@ _set_momentum(Elm_Gesture_Momentum_Info *momentum, Evas_Coord velx = 0, vely = 0, vel; Evas_Coord dx = xx2 - xx1; Evas_Coord dy = yy2 - yy1; ->>>>>>> remotes/origin/upstream int dtx = t2 - t1x; int dty = t2 - t1y; if (dtx > 0) @@ -1685,38 +1618,6 @@ _set_momentum(Elm_Gesture_Momentum_Info *momentum, * @ingroup Elm_Gesture_Layer */ static double -<<<<<<< HEAD -get_angle(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2) -{ - double a, xx, yy, rt = (-1); - xx = fabs(x2 - x1); - yy = fabs(y2 - y1); - - if (((int) xx) && ((int) yy)) - { - rt = a = RAD2DEG(atan(yy / xx)); - if (x1 < x2) - { - if (y1 < y2) - { - rt = 360 - a; - } - else - { - rt = (a); - } - } - else - { - if (y1 < y2) - { - rt = 180 + a; - } - else - { - rt = 180 - a; - } -======= get_angle(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) { double a, xx, yy, rt = (-1); @@ -1735,35 +1636,11 @@ get_angle(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) { if (yy1 < yy2) rt = 180 + a; else rt = 180 - a; ->>>>>>> remotes/origin/upstream } } if (rt < 0) { /* Do this only if rt is not set */ -<<<<<<< HEAD - if (((int) xx)) - { /* Horizontal line */ - if (x2 < x1) - { - rt = 180; - } - else - { - rt = 0.0; - } - } - else - { /* Vertical line */ - if (y2 < y1) - { - rt = 90; - } - else - { - rt = 270; - } -======= if (((int)xx)) { /* Horizontal line */ if (xx2 < xx1) rt = 180; @@ -1773,7 +1650,6 @@ get_angle(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) { /* Vertical line */ if (yy2 < yy1) rt = 90; else rt = 270; ->>>>>>> remotes/origin/upstream } } @@ -1782,15 +1658,8 @@ get_angle(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) * original circle 180 0 We want: 270 90 * 270 180 */ -<<<<<<< HEAD - - rt = 450 - rt; - if (rt >= 360) - rt -= 360; -======= rt = 450 - rt; if (rt >= 360) rt -= 360; ->>>>>>> remotes/origin/upstream return rt; } @@ -1811,27 +1680,6 @@ get_angle(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2) * @ingroup Elm_Gesture_Layer */ static void -<<<<<<< HEAD -get_vector(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2, - Evas_Coord *l, double *a) -{ - Evas_Coord xx, yy; - xx = x2 - x1; - yy = y2 - y1; - *l = (Evas_Coord) sqrt(xx*xx + yy*yy); - *a = get_angle(x1, y1, x2, y2); -} - -static int -_get_direction(Evas_Coord x1, Evas_Coord x2) -{ - if (x2 < x1) - return -1; - - if (x2 > x1) - return 1; - -======= get_vector(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2, Evas_Coord *l, double *a) { @@ -1847,7 +1695,6 @@ _get_direction(Evas_Coord xx1, Evas_Coord xx2) { if (xx2 < xx1) return -1; if (xx2 > xx1) return 1; ->>>>>>> remotes/origin/upstream return 0; } /** @@ -1864,13 +1711,8 @@ _get_direction(Evas_Coord xx1, Evas_Coord xx2) */ static void _momentum_test(Evas_Object *obj, Pointer_Event *pe, -<<<<<<< HEAD - void *event_info, Evas_Callback_Type event_type, - Elm_Gesture_Types g_type) -======= void *event_info, Evas_Callback_Type event_type, Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -2142,11 +1984,7 @@ _single_line_process(Elm_Gesture_Line_Info *info, Line_Data *st, */ static void _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, -<<<<<<< HEAD - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) -======= Evas_Callback_Type event_type, Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { if (!pe) return; @@ -2331,11 +2169,7 @@ _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, /* We report ABORT if lines length are NOT matching when fingers are up */ -<<<<<<< HEAD - if ((longest_line_len - shortest_line_len) > (elm_finger_size_get()*2)) -======= if ((longest_line_len - shortest_line_len) > (_elm_config->finger_size * 2)) ->>>>>>> remotes/origin/upstream { ev_flag = _set_state(gesture, ELM_GESTURE_STATE_ABORT, &st->info, EINA_FALSE); @@ -2477,15 +2311,6 @@ rotation_broke_tolerance(Rotate_Type *st) * @ingroup Elm_Gesture_Layer */ static Evas_Coord -<<<<<<< HEAD -get_finger_gap_length(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, - Evas_Coord y2, Evas_Coord *x, Evas_Coord *y) -{ - double a, b, xx, yy, gap; - xx = fabs(x2 - x1); - yy = fabs(y2 - y1); - gap = sqrt(xx*xx + yy*yy); -======= get_finger_gap_length(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2, Evas_Coord *x, Evas_Coord *y) @@ -2494,7 +2319,6 @@ get_finger_gap_length(Evas_Coord xx1, Evas_Coord yy1, xx = fabs(xx2 - xx1); yy = fabs(yy2 - yy1); gap = sqrt((xx * xx) + (yy * yy)); ->>>>>>> remotes/origin/upstream /* START - Compute zoom center point */ /* The triangle defined as follows: @@ -2507,11 +2331,7 @@ get_finger_gap_length(Evas_Coord xx1, Evas_Coord yy1, * b * http://en.wikipedia.org/wiki/Trigonometric_functions *************************************/ -<<<<<<< HEAD - if (((int) xx) && ((int) yy)) -======= if (((int)xx) && ((int)yy)) ->>>>>>> remotes/origin/upstream { double A = atan((yy / xx)); #if defined(DEBUG_GESTURE_LAYER) @@ -2519,49 +2339,27 @@ get_finger_gap_length(Evas_Coord xx1, Evas_Coord yy1, #endif a = (Evas_Coord) ((gap / 2) * sin(A)); b = (Evas_Coord) ((gap / 2) * cos(A)); -<<<<<<< HEAD - *x = (Evas_Coord) ((x2 > x1) ? (x1 + b) : (x2 + b)); - *y = (Evas_Coord) ((y2 > y1) ? (y1 + a) : (y2 + a)); - } - else - { - if ((int) xx) -======= *x = (Evas_Coord) ((xx2 > xx1) ? (xx1 + b) : (xx2 + b)); *y = (Evas_Coord) ((yy2 > yy1) ? (yy1 + a) : (yy2 + a)); } else { if ((int)xx) ->>>>>>> remotes/origin/upstream { /* horiz line, take half width */ #if defined(DEBUG_GESTURE_LAYER) printf("==== HORIZ ====\n"); #endif -<<<<<<< HEAD - *x = (Evas_Coord) (xx / 2); - *y = (Evas_Coord) (y1); - } - - if ((int) yy) -======= *x = (Evas_Coord) ((xx1 + xx2) / 2); *y = (Evas_Coord) (yy1); } if ((int)yy) ->>>>>>> remotes/origin/upstream { /* vert line, take half width */ #if defined(DEBUG_GESTURE_LAYER) printf("==== VERT ====\n"); #endif -<<<<<<< HEAD - *x = (Evas_Coord) (x1); - *y = (Evas_Coord) (yy / 2); -======= *x = (Evas_Coord) (xx1); *y = (Evas_Coord) ((yy1 + yy2) / 2); ->>>>>>> remotes/origin/upstream } } /* END - Compute zoom center point */ @@ -2641,17 +2439,6 @@ _zoom_momentum_get(Zoom_Type *st, unsigned int tm_end, double zoom_val) * @ingroup Elm_Gesture_Layer */ static double -<<<<<<< HEAD -compute_zoom(Zoom_Type *st, Evas_Coord x1, Evas_Coord y1, - Evas_Coord x2, Evas_Coord y2, double zoom_finger_factor) -{ - double rt = 1.0; - unsigned int tm_end = (st->zoom_mv.timestamp > st->zoom_mv1.timestamp) ? - st->zoom_mv.timestamp : st->zoom_mv1.timestamp; - - Evas_Coord diam = get_finger_gap_length(x1, y1, x2, y2, - &st->info.x, &st->info.y); -======= compute_zoom(Zoom_Type *st, Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2, @@ -2663,7 +2450,6 @@ compute_zoom(Zoom_Type *st, Evas_Coord diam = get_finger_gap_length(xx1, yy1, xx2, yy2, &st->info.x, &st->info.y); ->>>>>>> remotes/origin/upstream st->info.radius = diam / 2; @@ -2693,11 +2479,7 @@ compute_zoom(Zoom_Type *st, /* We use factor only on the difference between gap-base */ /* if gap=120, base=100, we get ((120-100)/100)=0.2*factor */ rt = ((1.0) + ((((float) diam - (float) st->zoom_base) / -<<<<<<< HEAD - (float) st->zoom_base) * zoom_finger_factor)); -======= (float) st->zoom_base) * zoom_finger_factor)); ->>>>>>> remotes/origin/upstream /* Momentum: zoom per second: */ st->info.momentum = _zoom_momentum_get(st, tm_end, rt); @@ -2719,11 +2501,7 @@ compute_zoom(Zoom_Type *st, */ static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, -<<<<<<< HEAD - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) -======= Evas_Callback_Type event_type, Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -2849,11 +2627,7 @@ _zoom_with_wheel_test(Evas_Object *obj, void *event_info, */ static void _zoom_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, -<<<<<<< HEAD - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) -======= Evas_Callback_Type event_type, Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { if (!pe) return; @@ -3008,18 +2782,6 @@ _zoom_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, static void _get_rotate_properties(Rotate_Type *st, -<<<<<<< HEAD - Evas_Coord x1, Evas_Coord y1, - Evas_Coord x2, Evas_Coord y2, - double *angle) -{ /* FIXME: Fix momentum computation, it's wrong */ - double prev_angle = *angle; - st->info.radius = get_finger_gap_length(x1, y1, x2, y2, - &st->info.x, &st->info.y) / 2; - - *angle = get_angle(x1, y1, x2, y2); - -======= Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2, double *angle) @@ -3030,7 +2792,6 @@ _get_rotate_properties(Rotate_Type *st, *angle = get_angle(xx1, yy1, xx2, yy2); ->>>>>>> remotes/origin/upstream if (angle == &st->info.angle) { /* Fingers are moving, compute momentum */ unsigned int tm_start = @@ -3089,11 +2850,7 @@ _get_rotate_properties(Rotate_Type *st, */ static void _rotate_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, -<<<<<<< HEAD - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) -======= Evas_Callback_Type event_type, Elm_Gesture_Type g_type) ->>>>>>> remotes/origin/upstream { if (!pe) return; @@ -3193,11 +2950,7 @@ _rotate_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, if (rotation_broke_tolerance(st)) { /* Rotation broke tolerance, report move */ double d = st->info.angle - st->next_step; -<<<<<<< HEAD - if (d < 0.0) -======= if (d < 0) ->>>>>>> remotes/origin/upstream d = (-d); if (d >= wd->rotate_step) @@ -3333,12 +3086,8 @@ _make_pointer_event(void *data, void *event_info, * * @ingroup Elm_Gesture_Layer */ -<<<<<<< HEAD -void continues_gestures_restart(void *data, Eina_Bool states_reset) -======= static void continues_gestures_restart(void *data, Eina_Bool states_reset) ->>>>>>> remotes/origin/upstream { Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; @@ -3428,10 +3177,6 @@ _event_process(void *data, Evas_Object *obj __UNUSED__, Pointer_Event _pe; Pointer_Event *pe = NULL; Widget_Data *wd = elm_widget_data_get(data); -<<<<<<< HEAD - if (!wd) return; -======= ->>>>>>> remotes/origin/upstream #if defined(DEBUG_GESTURE_LAYER) int i; @@ -3615,15 +3360,10 @@ _multi_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } EAPI Eina_Bool -<<<<<<< HEAD -elm_gesture_layer_hold_events_get(Evas_Object *obj) -{ -======= elm_gesture_layer_hold_events_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; @@ -3631,48 +3371,6 @@ elm_gesture_layer_hold_events_get(const Evas_Object *obj) } EAPI void -<<<<<<< HEAD -elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool r) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - wd->repeat_events = !r; -} - -EAPI void -elm_gesture_layer_zoom_step_set(Evas_Object *obj, double s) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - if (s < 0.0) - return; - - wd->zoom_step = s; -} - -EAPI void -elm_gesture_layer_rotate_step_set(Evas_Object *obj, double s) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - if (s < 0.0) - return; - - wd->rotate_step = s; -} - -EAPI Eina_Bool -elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *t) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - - if (!t) - return EINA_FALSE; -======= elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool hold_events) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -3740,34 +3438,23 @@ elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *target) if (!wd) return EINA_FALSE; if (!target) return EINA_FALSE; ->>>>>>> remotes/origin/upstream /* if was attached before, unregister callbacks first */ if (wd->target) _unregister_callbacks(obj); -<<<<<<< HEAD - wd->target = t; -======= wd->target = target; ->>>>>>> remotes/origin/upstream _register_callbacks(obj); return EINA_TRUE; } EAPI void -<<<<<<< HEAD -elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, - Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) -{ -======= elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) { ELM_CHECK_WIDTYPE(obj, widtype); ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(obj); Gesture_Info *p; if (!wd) return; @@ -3811,15 +3498,9 @@ elm_gesture_layer_add(Evas_Object *parent) elm_widget_disable_hook_set(obj, _disable_hook); wd->target = NULL; -<<<<<<< HEAD - wd->line_min_length =_elm_config->glayer_line_min_length * elm_finger_size_get(); - wd->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance * elm_finger_size_get(); - wd->line_distance_tolerance = _elm_config->glayer_line_distance_tolerance * elm_finger_size_get(); -======= wd->line_min_length =_elm_config->glayer_line_min_length * _elm_config->finger_size; wd->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance * _elm_config->finger_size; wd->line_distance_tolerance = _elm_config->glayer_line_distance_tolerance * _elm_config->finger_size; ->>>>>>> remotes/origin/upstream wd->zoom_finger_factor = _elm_config->glayer_zoom_finger_factor; wd->zoom_wheel_factor = _elm_config->glayer_zoom_wheel_factor; /* mouse wheel zoom steps */ wd->rotate_angular_tolerance = _elm_config->glayer_rotate_angular_tolerance; diff --git a/src/lib/elm_gesture_layer.h b/src/lib/elm_gesture_layer.h index 323dfd5..eb14897 100644 --- a/src/lib/elm_gesture_layer.h +++ b/src/lib/elm_gesture_layer.h @@ -15,11 +15,7 @@ * Now you need to tell gesture layer what gestures you follow. * This is done with @ref elm_gesture_layer_cb_set call. * By setting the callback you actually saying to gesture layer: -<<<<<<< HEAD - * I would like to know when the gesture @ref Elm_Gesture_Types -======= * I would like to know when the gesture @ref Elm_Gesture_Type ->>>>>>> remotes/origin/upstream * switches to state @ref Elm_Gesture_State. * * Next, you need to implement the actual action that follows the input @@ -30,11 +26,7 @@ * (again with @ref elm_gesture_layer_cb_set) * * The information reported by gesture layer to your callback is depending -<<<<<<< HEAD - * on @ref Elm_Gesture_Types: -======= * on @ref Elm_Gesture_Type: ->>>>>>> remotes/origin/upstream * @ref Elm_Gesture_Taps_Info is the info reported for tap gestures: * @ref ELM_GESTURE_N_TAPS, @ref ELM_GESTURE_N_LONG_TAPS, * @ref ELM_GESTURE_N_DOUBLE_TAPS, @ref ELM_GESTURE_N_TRIPLE_TAPS. @@ -81,11 +73,7 @@ typedef enum ELM_GESTURE_N_DOUBLE_TAPS, /**< N fingers double-single taps */ ELM_GESTURE_N_TRIPLE_TAPS, /**< N fingers triple-single taps */ -<<<<<<< HEAD - ELM_GESTURE_MOMENTUM, /**< Reports momentum in the dircetion of move */ -======= ELM_GESTURE_MOMENTUM, /**< Reports momentum in the direction of move */ ->>>>>>> remotes/origin/upstream ELM_GESTURE_N_LINES, /**< N fingers line gesture */ ELM_GESTURE_N_FLICKS, /**< N fingers flick gesture */ @@ -94,11 +82,7 @@ typedef enum ELM_GESTURE_ROTATE, /**< Rotate */ ELM_GESTURE_LAST -<<<<<<< HEAD -} Elm_Gesture_Types; -======= } Elm_Gesture_Type; ->>>>>>> remotes/origin/upstream /** * @enum _Elm_Gesture_State @@ -111,11 +95,7 @@ typedef enum ELM_GESTURE_STATE_START, /**< Gesture STARTed */ ELM_GESTURE_STATE_MOVE, /**< Gesture is ongoing */ ELM_GESTURE_STATE_END, /**< Gesture completed */ -<<<<<<< HEAD - ELM_GESTURE_STATE_ABORT /**< Onging gesture was ABORTed */ -======= ELM_GESTURE_STATE_ABORT /**< Ongoing gesture was ABORTed */ ->>>>>>> remotes/origin/upstream } Elm_Gesture_State; /** @@ -249,11 +229,7 @@ typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb)(void *data, void *event_info); * it means user isn't interested in gesture-state * and it will not be tested. * -<<<<<<< HEAD - * @param obj Pointer to gesture-layer. -======= * @param obj gesture-layer. ->>>>>>> remotes/origin/upstream * @param idx The gesture you would like to track its state. * @param cb callback function pointer. * @param cb_type what event this callback tracks: START, MOVE, END, ABORT. @@ -261,40 +237,17 @@ typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb)(void *data, void *event_info); * * @ingroup Elm_Gesture_Layer */ -<<<<<<< HEAD -EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data); -======= EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data); ->>>>>>> remotes/origin/upstream /** * Call this function to get repeat-events settings. * -<<<<<<< HEAD - * @param obj Pointer to gesture-layer. -======= * @param obj gesture-layer. ->>>>>>> remotes/origin/upstream * * @return repeat events settings. * @see elm_gesture_layer_hold_events_set() * @ingroup Elm_Gesture_Layer */ -<<<<<<< HEAD -EAPI Eina_Bool elm_gesture_layer_hold_events_get(Evas_Object *obj); - -/** - * This function called in order to make gesture-layer repeat events. - * Set this of you like to get the raw events only if gestures were not detected. - * Clear this if you like gesture layer to fwd events as testing gestures. - * - * @param obj Pointer to gesture-layer. - * @param r Repeat: TRUE/FALSE - * - * @ingroup Elm_Gesture_Layer - */ -EAPI void elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool r); -======= EAPI Eina_Bool elm_gesture_layer_hold_events_get(const Evas_Object *obj); /** @@ -309,21 +262,10 @@ EAPI Eina_Bool elm_gesture_layer_hold_events_get(const Evas_Object *obj); * @ingroup Elm_Gesture_Layer */ EAPI void elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool hold_events); ->>>>>>> remotes/origin/upstream /** * This function sets step-value for zoom action. * Set step to any positive value. -<<<<<<< HEAD - * Cancel step setting by setting to 0.0 - * - * @param obj Pointer to gesture-layer. - * @param s new zoom step value. - * - * @ingroup Elm_Gesture_Layer - */ -EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double s); -======= * Cancel step setting by setting to 0 * * @param obj gesture-layer. @@ -344,26 +286,10 @@ EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double step) * @ingroup Elm_Gesture_Layer */ EAPI double elm_gesture_layer_zoom_step_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * This function sets step-value for rotate action. * Set step to any positive value. -<<<<<<< HEAD - * Cancel step setting by setting to 0.0 - * - * @param obj Pointer to gesture-layer. - * @param s new roatate step value. - * - * @ingroup Elm_Gesture_Layer - */ -EAPI void elm_gesture_layer_rotate_step_set(Evas_Object *obj, double s); - -/** - * This function called to attach gesture-layer to an Evas_Object. - * @param obj Pointer to gesture-layer. - * @param t Pointer to underlying object (AKA Target) -======= * Cancel step setting by setting to 0 * * @param obj gesture-layer. @@ -387,17 +313,12 @@ EAPI double elm_gesture_layer_rotate_step_get(const Evas_Object *obj); * This function called to attach gesture-layer to an Evas_Object. * @param obj gesture-layer. * @param target Pointer to underlying object (AKA Target) ->>>>>>> remotes/origin/upstream * * @return TRUE, FALSE on success, failure. * * @ingroup Elm_Gesture_Layer */ -<<<<<<< HEAD -EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *t); -======= EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *target); ->>>>>>> remotes/origin/upstream /** * Call this function to construct a new gesture-layer object. @@ -406,11 +327,7 @@ EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *target * * @param parent the parent object. * -<<<<<<< HEAD - * @return Pointer to new gesture-layer object. -======= * @return new gesture-layer object. ->>>>>>> remotes/origin/upstream * * @ingroup Elm_Gesture_Layer */ diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c index d0f1f96..339f23f 100644 --- a/src/lib/elm_glview.c +++ b/src/lib/elm_glview.c @@ -5,11 +5,7 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { -<<<<<<< HEAD - Evas_Object *glview_image; -======= Evas_Object *glview_image; ->>>>>>> remotes/origin/upstream Elm_GLView_Mode mode; Elm_GLView_Resize_Policy scale_policy; @@ -130,16 +126,6 @@ _glview_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void wd->w = w; wd->h = h; _glview_update_surface(data); -<<<<<<< HEAD - /* - if (wd->render_func) - { - evas_gl_make_current(wd->evasgl, wd->surface, wd->context); - wd->render_func(data); - } - */ -======= ->>>>>>> remotes/origin/upstream } } @@ -388,47 +374,28 @@ elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Render_Policy policy) } EAPI void -<<<<<<< HEAD -elm_glview_size_set(Evas_Object *obj, int width, int height) -======= elm_glview_size_set(Evas_Object *obj, int w, int h) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - if ((width == wd->w) && (height == wd->h)) return; - wd->w = width; - wd->h = height; -======= if ((w == wd->w) && (h == wd->h)) return; wd->w = w; wd->h = h; ->>>>>>> remotes/origin/upstream _glview_update_surface(obj); elm_glview_changed_set(obj); } EAPI void -<<<<<<< HEAD -elm_glview_size_get(const Evas_Object *obj, int *width, int *height) -======= elm_glview_size_get(const Evas_Object *obj, int *w, int *h) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - if (width) *width = wd->w; - if (height) *height = wd->h; -======= if (w) *w = wd->w; if (h) *h = wd->h; ->>>>>>> remotes/origin/upstream } EAPI void diff --git a/src/lib/elm_glview.h b/src/lib/elm_glview.h index 1af86d3..497257c 100644 --- a/src/lib/elm_glview.h +++ b/src/lib/elm_glview.h @@ -1,12 +1,6 @@ /** * @defgroup GLView GLView * -<<<<<<< HEAD - * A simple GLView widget that allows GL rendering. - * - * Signals that you can add callbacks for are: - * -======= * A GLView widget allows for simple GL rendering in elementary environment. * GLView hides all the complicated evas_gl details so that the user only * has to deal with registering a few callback functions for rendering @@ -345,7 +339,6 @@ ELM_MAIN() /** * @addtogroup GLView ->>>>>>> remotes/origin/upstream * @{ */ @@ -353,17 +346,6 @@ typedef void (*Elm_GLView_Func_Cb)(Evas_Object *obj); typedef enum _Elm_GLView_Mode { -<<<<<<< HEAD - ELM_GLVIEW_NONE = 0, - ELM_GLVIEW_ALPHA = (1<<1), - ELM_GLVIEW_DEPTH = (1<<2), - ELM_GLVIEW_STENCIL = (1<<3), - ELM_GLVIEW_DIRECT = (1<<4) -} Elm_GLView_Mode; - -/** - * Defines a policy for the glview resizing. -======= ELM_GLVIEW_NONE = 0, ELM_GLVIEW_ALPHA = (1<<1), /**< Alpha channel enabled rendering mode */ ELM_GLVIEW_DEPTH = (1<<2), /**< Depth buffer enabled rendering mode */ @@ -380,22 +362,12 @@ typedef enum _Elm_GLView_Mode * new size. ELM_GLVIEW_RESIZE_POLICY_SCALE will instead keep the * current surface but only display the result at the desired size * scaled. ->>>>>>> remotes/origin/upstream * * @note Default is ELM_GLVIEW_RESIZE_POLICY_RECREATE */ typedef enum { ELM_GLVIEW_RESIZE_POLICY_RECREATE = 1, /**< Resize the internal surface along with the image */ -<<<<<<< HEAD - ELM_GLVIEW_RESIZE_POLICY_SCALE = 2 /**< Only reize the internal image and not the surface */ -} Elm_GLView_Resize_Policy; - -typedef enum -{ - ELM_GLVIEW_RENDER_POLICY_ON_DEMAND = 1, /**< Render only when there is a need for redrawing */ - ELM_GLVIEW_RENDER_POLICY_ALWAYS = 2 /**< Render always even when it is not visible */ -======= ELM_GLVIEW_RESIZE_POLICY_SCALE = 2 /**< Only resize the internal image and not the surface */ } Elm_GLView_Resize_Policy; @@ -413,7 +385,6 @@ typedef enum { ELM_GLVIEW_RENDER_POLICY_ON_DEMAND = 1, /**< Render only when there is a need for redrawing */ ELM_GLVIEW_RENDER_POLICY_ALWAYS = 2 /**< Render always even when it is not visible */ ->>>>>>> remotes/origin/upstream } Elm_GLView_Render_Policy; /** @@ -430,33 +401,19 @@ EAPI Evas_Object *elm_glview_add(Evas_Object *parent); * Sets the size of the glview * * @param obj The glview object -<<<<<<< HEAD - * @param width width of the glview object - * @param height height of the glview object - * - * @ingroup GLView - */ -EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height); -======= * @param w width of the glview object * @param h height of the glview object * * @ingroup GLView */ EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); ->>>>>>> remotes/origin/upstream /** * Gets the size of the glview. * * @param obj The glview object -<<<<<<< HEAD - * @param width width of the glview object - * @param height height of the glview object -======= * @param w width of the glview object * @param h height of the glview object ->>>>>>> remotes/origin/upstream * * Note that this function returns the actual image size of the * glview. This means that when the scale policy is set to @@ -465,11 +422,7 @@ EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord * * @ingroup GLView */ -<<<<<<< HEAD -EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height); -======= EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); ->>>>>>> remotes/origin/upstream /** * Gets the gl api struct for gl rendering @@ -482,14 +435,6 @@ EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *w, Eva EAPI Evas_GL_API *elm_glview_gl_api_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Set the mode of the GLView. Supports Three simple modes. - * - * @param obj The glview object - * @param mode The mode Options OR'ed enabling Alpha, Depth, Stencil. - * @return True if set properly. - * -======= * Set the mode of the GLView. Supports alpha, depth, stencil. * * @param obj The glview object @@ -501,7 +446,6 @@ EAPI Evas_GL_API *elm_glview_gl_api_get(const Evas_Object *obj); * to rendering to an offscreen buffer before it gets composited to the * window. * ->>>>>>> remotes/origin/upstream * @ingroup GLView */ EAPI Eina_Bool elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode); @@ -512,20 +456,11 @@ EAPI Eina_Bool elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode); * @param obj The glview object. * @param policy The scaling policy. * -<<<<<<< HEAD - * By default, the resize policy is set to - * ELM_GLVIEW_RESIZE_POLICY_RECREATE. When resize is called it - * destroys the previous surface and recreates the newly specified - * size. If the policy is set to ELM_GLVIEW_RESIZE_POLICY_SCALE, - * however, glview only scales the image object and not the underlying - * GL Surface. -======= * By default, the resize policy is set to ELM_GLVIEW_RESIZE_POLICY_RECREATE. * When resize is called it destroys the previous surface and recreates the * newly specified size. If the policy is set to * ELM_GLVIEW_RESIZE_POLICY_SCALE, however, glview only scales the image * object and not the underlying GL Surface. ->>>>>>> remotes/origin/upstream * * @ingroup GLView */ @@ -537,20 +472,11 @@ EAPI Eina_Bool elm_glview_resize_policy_set(Evas_Object *obj, Elm_GLView_Resi * @param obj The glview object. * @param policy The render policy. * -<<<<<<< HEAD - * By default, the render policy is set to - * ELM_GLVIEW_RENDER_POLICY_ON_DEMAND. This policy is set such - * that during the render loop, glview is only redrawn if it needs - * to be redrawn. (i.e. When it is visible) If the policy is set to - * ELM_GLVIEWW_RENDER_POLICY_ALWAYS, it redraws regardless of - * whether it is visible/need redrawing or not. -======= * By default, the render policy is set to ELM_GLVIEW_RENDER_POLICY_ON_DEMAND. * This policy is set such that during the render loop, glview is only * redrawn if it needs to be redrawn. (i.e. when it is visible) If the policy * is set to ELM_GLVIEWW_RENDER_POLICY_ALWAYS, it redraws regardless of * whether it is visible or needs redrawing. ->>>>>>> remotes/origin/upstream * * @ingroup GLView */ @@ -562,14 +488,10 @@ EAPI Eina_Bool elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Rend * @param obj The glview object. * @param func The init function to be registered. * -<<<<<<< HEAD - * The registered init function gets called once during the render loop. -======= * The registered init function gets called once during the render loop. * This function allows glview to hide all the rendering context/surface * details and have the user just call GL calls that they desire * for initialization GL calls. ->>>>>>> remotes/origin/upstream * * @ingroup GLView */ @@ -582,12 +504,9 @@ EAPI void elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb * @param func The delete function to be registered. * * The registered del function gets called when GLView object is deleted. -<<<<<<< HEAD -======= * This function allows glview to hide all the rendering context/surface * details and have the user just call GL calls that they desire * when delete happens. ->>>>>>> remotes/origin/upstream * * @ingroup GLView */ @@ -599,14 +518,11 @@ EAPI void elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb f * @param obj The glview object. * @param func The resize function to be registered. * -<<<<<<< HEAD -======= * The resize function gets called during the render loop. * This function allows glview to hide all the rendering context/surface * details and have the user just call GL calls that they desire * when resize happens. * ->>>>>>> remotes/origin/upstream * @ingroup GLView */ EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func); @@ -614,13 +530,10 @@ EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_C /** * Set the render function that runs in the main loop. * -<<<<<<< HEAD -======= * The render function gets called in the main loop but whether it runs * depends on the rendering policy and whether elm_glview_changed_set() * gets called. * ->>>>>>> remotes/origin/upstream * @param obj The glview object. * @param func The render function to be registered. * diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c index 868e30c..753ea36 100644 --- a/src/lib/elm_layout.c +++ b/src/lib/elm_layout.c @@ -206,11 +206,7 @@ _part_cursor_part_apply(const Part_Cursor *pc) { elm_object_cursor_set(pc->obj, pc->cursor); elm_object_cursor_style_set(pc->obj, pc->style); -<<<<<<< HEAD - elm_object_cursor_engine_only_set(pc->obj, pc->engine_only); -======= elm_object_cursor_theme_search_enabled_set(pc->obj, pc->engine_only); ->>>>>>> remotes/origin/upstream } static Part_Cursor * @@ -517,18 +513,11 @@ elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, cons return ret; } -<<<<<<< HEAD -EAPI void -elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) -{ - _content_set_hook(obj, swallow, content); -======= EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) { _content_set_hook(obj, swallow, content); return EINA_TRUE; ->>>>>>> remotes/origin/upstream } @@ -544,18 +533,11 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow) return _content_unset_hook(obj, swallow); } -<<<<<<< HEAD -EAPI void -elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) -{ - _elm_layout_label_set(obj, part, text); -======= EAPI Eina_Bool elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) { _elm_layout_label_set(obj, part, text); return EINA_TRUE; ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -564,15 +546,6 @@ elm_layout_text_get(const Evas_Object *obj, const char *part) return _elm_layout_label_get(obj, part); } -<<<<<<< HEAD -EAPI void -elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si; - if (!wd) return; -======= EAPI Eina_Bool elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child) { @@ -580,7 +553,6 @@ elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child) Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; if (!wd) return EINA_FALSE; ->>>>>>> remotes/origin/upstream if (!edje_object_part_box_append(wd->lay, part, child)) WRN("child %p could not be appended to box part '%s'", child, part); @@ -594,17 +566,6 @@ elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child) si->obj = child; wd->subs = eina_list_append(wd->subs, si); _request_sizing_eval(wd); -<<<<<<< HEAD -} - -EAPI void -elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si; - if (!wd) return; -======= return EINA_TRUE; } @@ -616,7 +577,6 @@ elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child) Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; if (!wd) return EINA_FALSE; ->>>>>>> remotes/origin/upstream if (!edje_object_part_box_prepend(wd->lay, part, child)) WRN("child %p could not be prepended to box part '%s'", child, part); @@ -630,11 +590,8 @@ elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child) si->obj = child; wd->subs = eina_list_prepend(wd->subs, si); _request_sizing_eval(wd); -<<<<<<< HEAD -======= return EINA_TRUE; ->>>>>>> remotes/origin/upstream } static void @@ -644,15 +601,6 @@ _box_reference_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, si->p.box.reference = NULL; } -<<<<<<< HEAD -EAPI void -elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si; - if (!wd) return; -======= EAPI Eina_Bool elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference) { @@ -660,7 +608,6 @@ elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *ch Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; if (!wd) return EINA_FALSE; ->>>>>>> remotes/origin/upstream if (!edje_object_part_box_insert_before(wd->lay, part, child, reference)) WRN("child %p could not be inserted before %p inf box part '%s'", @@ -680,17 +627,6 @@ elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *ch wd->subs = eina_list_append(wd->subs, si); _request_sizing_eval(wd); -<<<<<<< HEAD -} - -EAPI void -elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si; - if (!wd) return; -======= return EINA_TRUE; } @@ -702,7 +638,6 @@ elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; if (!wd) return EINA_FALSE; ->>>>>>> remotes/origin/upstream if (!edje_object_part_box_insert_at(wd->lay, part, child, pos)) WRN("child %p could not be inserted at %u to box part '%s'", @@ -719,11 +654,8 @@ elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, si->p.box.pos = pos; wd->subs = eina_list_append(wd->subs, si); _request_sizing_eval(wd); -<<<<<<< HEAD -======= return EINA_TRUE; ->>>>>>> remotes/origin/upstream } static Evas_Object * @@ -789,28 +721,16 @@ elm_layout_box_remove(Evas_Object *obj, const char *part, Evas_Object *child) return NULL; } -<<<<<<< HEAD -EAPI void -elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear) -{ - ELM_CHECK_WIDTYPE(obj, widtype); -======= EAPI Eina_Bool elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear) { ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; Eina_List *lst; -<<<<<<< HEAD - if (!wd) return; - EINA_SAFETY_ON_NULL_RETURN(part); -======= if (!wd) return EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); ->>>>>>> remotes/origin/upstream lst = eina_list_clone(wd->subs); EINA_LIST_FREE(lst, si) @@ -824,17 +744,6 @@ elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear) } /* eventually something may not be added with layout, del them as well */ edje_object_part_box_remove_all(wd->lay, part, clear); -<<<<<<< HEAD -} - -EAPI void -elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - Subinfo *si; - if (!wd) return; -======= return EINA_TRUE; } @@ -846,7 +755,6 @@ elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child, un Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; if (!wd) return EINA_FALSE; ->>>>>>> remotes/origin/upstream if (!edje_object_part_table_pack (wd->lay, part, child, col, row, colspan, rowspan)) @@ -867,11 +775,8 @@ elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child, un si->p.table.rowspan = rowspan; wd->subs = eina_list_append(wd->subs, si); _request_sizing_eval(wd); -<<<<<<< HEAD -======= return EINA_TRUE; ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -895,28 +800,16 @@ elm_layout_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child) return NULL; } -<<<<<<< HEAD -EAPI void -elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear) -{ - ELM_CHECK_WIDTYPE(obj, widtype); -======= EAPI Eina_Bool elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear) { ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(obj); Subinfo *si; Eina_List *lst; -<<<<<<< HEAD - if (!wd) return; - EINA_SAFETY_ON_NULL_RETURN(part); -======= if (!wd) return EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); ->>>>>>> remotes/origin/upstream lst = eina_list_clone(wd->subs); EINA_LIST_FREE(lst, si) @@ -930,11 +823,8 @@ elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear) } /* eventually something may not be added with layout, del them as well */ edje_object_part_table_clear(wd->lay, part, clear); -<<<<<<< HEAD -======= return EINA_TRUE; ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -1021,15 +911,6 @@ elm_layout_part_cursor_get(const Evas_Object *obj, const char *part_name) return elm_object_cursor_get(pc->obj); } -<<<<<<< HEAD -EAPI void -elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - EINA_SAFETY_ON_NULL_RETURN(part_name); - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN(wd); -======= EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name) { @@ -1037,7 +918,6 @@ elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name) EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); Widget_Data *wd = elm_widget_data_get(obj); EINA_SAFETY_ON_NULL_RETURN_VAL(wd, EINA_FALSE); ->>>>>>> remotes/origin/upstream Eina_List *l; Part_Cursor *pc; @@ -1048,17 +928,11 @@ elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name) if (pc->obj) elm_object_cursor_unset(pc->obj); _part_cursor_free(pc); wd->parts_cursors = eina_list_remove_list(wd->parts_cursors, l); -<<<<<<< HEAD - return; - } - } -======= return EINA_TRUE; } } return EINA_FALSE; ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -1102,11 +976,7 @@ elm_layout_part_cursor_engine_only_set(Evas_Object *obj, const char *part_name, EINA_SAFETY_ON_NULL_RETURN_VAL(pc->obj, EINA_FALSE); pc->engine_only = !!engine_only; -<<<<<<< HEAD - elm_object_cursor_engine_only_set(pc->obj, pc->engine_only); -======= elm_object_cursor_theme_search_enabled_set(pc->obj, pc->engine_only); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } @@ -1120,9 +990,5 @@ elm_layout_part_cursor_engine_only_get(const Evas_Object *obj, const char *part_ Part_Cursor *pc = _parts_cursors_find(wd, part_name); EINA_SAFETY_ON_NULL_RETURN_VAL(pc, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(pc->obj, EINA_FALSE); -<<<<<<< HEAD - return elm_object_cursor_engine_only_get(pc->obj); -======= return elm_object_cursor_theme_search_enabled_get(pc->obj); ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elm_layout.h b/src/lib/elm_layout.h index c69b6fe..1f87fd4 100644 --- a/src/lib/elm_layout.h +++ b/src/lib/elm_layout.h @@ -72,11 +72,7 @@ * sent to the Layout theme (with elm_object_signal_emit()) and the theme * handled the signal by changing the box padding, or align, or both. Using * the Elementary @ref Box widget is not necessarily harder or easier, it -<<<<<<< HEAD - * just depends on the circunstances and requirements. -======= * just depends on the circumstances and requirements. ->>>>>>> remotes/origin/upstream * * The Layout Box can be used through the @c elm_layout_box_* set of * functions. @@ -185,11 +181,7 @@ EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const ch * Set the edje group from the elementary theme that will be used as layout * * @param obj The layout object -<<<<<<< HEAD - * @param clas the clas of the group -======= * @param clas the class of the group ->>>>>>> remotes/origin/upstream * @param group the group * @param style the style to used * @@ -205,10 +197,7 @@ EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const c * @param obj the layout object * @param part the box part to which the object will be appended. * @param child the child object to append to box. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the object is appended, it will become child of the layout. Its * lifetime will be bound to the layout, whenever the layout dies the child @@ -222,11 +211,7 @@ EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const c * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child); -======= EAPI Eina_Bool elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child); ->>>>>>> remotes/origin/upstream /** * Prepend child to layout box part. @@ -234,10 +219,7 @@ EAPI Eina_Bool elm_layout_box_append(Evas_Object *obj, const * @param obj the layout object * @param part the box part to prepend. * @param child the child object to prepend to box. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the object is prepended, it will become child of the layout. Its * lifetime will be bound to the layout, whenever the layout dies the child @@ -251,11 +233,7 @@ EAPI Eina_Bool elm_layout_box_append(Evas_Object *obj, const * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child); -======= EAPI Eina_Bool elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child); ->>>>>>> remotes/origin/upstream /** * Insert child to layout box part before a reference object. @@ -264,10 +242,7 @@ EAPI Eina_Bool elm_layout_box_prepend(Evas_Object *obj, const * @param part the box part to insert. * @param child the child object to insert into box. * @param reference another reference object to insert before in box. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the object is inserted, it will become child of the layout. Its * lifetime will be bound to the layout, whenever the layout dies the child @@ -281,11 +256,7 @@ EAPI Eina_Bool elm_layout_box_prepend(Evas_Object *obj, const * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference); -======= EAPI Eina_Bool elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference); ->>>>>>> remotes/origin/upstream /** * Insert child to layout box part at a given position. @@ -294,10 +265,7 @@ EAPI Eina_Bool elm_layout_box_insert_before(Evas_Object *obj, * @param part the box part to insert. * @param child the child object to insert into box. * @param pos the numeric position >=0 to insert the child. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the object is inserted, it will become child of the layout. Its * lifetime will be bound to the layout, whenever the layout dies the child @@ -311,11 +279,7 @@ EAPI Eina_Bool elm_layout_box_insert_before(Evas_Object *obj, * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos); -======= EAPI Eina_Bool elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos); ->>>>>>> remotes/origin/upstream /** * Remove a child of the given part box. @@ -344,10 +308,7 @@ EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const * @param clear If EINA_TRUE, then all objects will be deleted as * well, otherwise they will just be removed and will be * dangling on the canvas. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * The objects will be removed from the box part and their lifetime will * not be handled by the layout anymore. This is equivalent to @@ -358,11 +319,7 @@ EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear); -======= EAPI Eina_Bool elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear); ->>>>>>> remotes/origin/upstream /** * Insert child to layout table part. @@ -375,10 +332,7 @@ EAPI Eina_Bool elm_layout_box_remove_all(Evas_Object *obj, co * @param colspan how many columns should be used to store this object. (>= * 1) * @param rowspan how many rows should be used to store this object. (>= 1) -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * Once the object is inserted, it will become child of the table. Its * lifetime will be bound to the layout, and whenever the layout dies the @@ -401,11 +355,7 @@ EAPI Eina_Bool elm_layout_box_remove_all(Evas_Object *obj, co * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); -======= EAPI Eina_Bool elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); ->>>>>>> remotes/origin/upstream /** * Unpack (remove) a child of the given part table. @@ -434,10 +384,7 @@ EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, cons * @param clear If EINA_TRUE, then all objects will be deleted as * well, otherwise they will just be removed and will be * dangling on the canvas. -<<<<<<< HEAD -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise ->>>>>>> remotes/origin/upstream * * The objects will be removed from the table part and their lifetime will * not be handled by the layout anymore. This is equivalent to @@ -448,11 +395,7 @@ EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, cons * * @ingroup Layout */ -<<<<<<< HEAD -EAPI void elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear); -======= EAPI Eina_Bool elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear); ->>>>>>> remotes/origin/upstream /** * Get the edje layout @@ -568,18 +511,11 @@ EAPI const char *elm_layout_part_cursor_get(const Evas_Object * * @param obj The layout object. * @param part_name a part from loaded edje group, that had a cursor set * with elm_layout_part_cursor_set(). -<<<<<<< HEAD - * - * @ingroup Layout - */ -EAPI void elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise * * @ingroup Layout */ EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); ->>>>>>> remotes/origin/upstream /** * Sets a specific cursor style for an edje part. @@ -658,11 +594,7 @@ EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const E /** * @def elm_layout_icon_get -<<<<<<< HEAD - * Convienience macro to get the icon object from a layout that follows the -======= * Convenience macro to get the icon object from a layout that follows the ->>>>>>> remotes/origin/upstream * Elementary naming convention for its parts. * * @ingroup Layout @@ -672,11 +604,7 @@ EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const E /** * @def elm_layout_end_set -<<<<<<< HEAD - * Convienience macro to set the end object in a layout that follows the -======= * Convenience macro to set the end object in a layout that follows the ->>>>>>> remotes/origin/upstream * Elementary naming convention for its parts. * * @ingroup Layout @@ -692,11 +620,7 @@ EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const E /** * @def elm_layout_end_get -<<<<<<< HEAD - * Convienience macro to get the end object in a layout that follows the -======= * Convenience macro to get the end object in a layout that follows the ->>>>>>> remotes/origin/upstream * Elementary naming convention for its parts. * * @ingroup Layout diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c index b706a37..3116daa 100644 --- a/src/lib/elm_transit.c +++ b/src/lib/elm_transit.c @@ -92,10 +92,7 @@ static void _transit_obj_remove_cb(void *data, Evas *e __UNUSED__, Evas_Object * static void _transit_obj_remove(Elm_Transit *transit, Evas_Object *obj); static void _transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module); static void _transit_remove_dead_effects(Elm_Transit *transit); -<<<<<<< HEAD -======= static void _transit_chain_go(Elm_Transit *transit); ->>>>>>> remotes/origin/upstream static void _transit_del(Elm_Transit *transit); static Eina_Bool _transit_animate_op(Elm_Transit *transit, double progress); static Eina_Bool _transit_animate_cb(void *data); @@ -239,8 +236,6 @@ _transit_remove_dead_effects(Elm_Transit *transit) } static void -<<<<<<< HEAD -======= _transit_chain_go(Elm_Transit *transit) { ELM_TRANSIT_CHECK_OR_RETURN(transit); @@ -249,7 +244,6 @@ _transit_chain_go(Elm_Transit *transit) } static void ->>>>>>> remotes/origin/upstream _transit_del(Elm_Transit *transit) { Elm_Transit_Effect_Module *effect_module; @@ -288,12 +282,8 @@ _transit_del(Elm_Transit *transit) if (transit->finished && transit->next_chain_transits) { EINA_LIST_FOREACH_SAFE(transit->next_chain_transits, elist, elist_next, chain_transit) -<<<<<<< HEAD - elm_transit_go(chain_transit); -======= _transit_chain_go(chain_transit); ->>>>>>> remotes/origin/upstream } eina_list_free(transit->next_chain_transits); @@ -346,16 +336,6 @@ _transit_animate_cb(void *data) transit->progress = elapsed_time / duration; switch (transit->tween_mode) { -<<<<<<< HEAD - case ELM_TRANSIT_TWEEN_MODE_ACCELERATE: - transit->progress = 1.0 - sin((ELM_PI / 2.0) + (transit->progress * ELM_PI / 2.0)); - break; - case ELM_TRANSIT_TWEEN_MODE_DECELERATE: - transit->progress = sin(transit->progress * ELM_PI / 2.0); - break; - case ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL: - transit->progress = (1.0 - cos(transit->progress * ELM_PI)) / 2.0; -======= case ELM_TRANSIT_TWEEN_MODE_LINEAR: transit->progress = ecore_animator_pos_map(transit->progress, ECORE_POS_MAP_LINEAR, @@ -374,7 +354,6 @@ _transit_animate_cb(void *data) transit->progress = ecore_animator_pos_map(transit->progress, ECORE_POS_MAP_SINUSOIDAL, 0, 0); ->>>>>>> remotes/origin/upstream break; default: break; diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h index 58985e1..f522205 100644 --- a/src/lib/elm_transit.h +++ b/src/lib/elm_transit.h @@ -8,13 +8,8 @@ * effects, create an @ref Elm_Transit and add the desired transition effects. * * Once the effects are added into transit, they will be automatically -<<<<<<< HEAD - * managed (their callback will be called until the duration is ended, and - * they will be deleted on completion). -======= * managed (their callback will be called for the set duration and * they will be deleted upon completion). ->>>>>>> remotes/origin/upstream * * Example: * @code @@ -37,11 +32,7 @@ * @li @ref elm_transit_effect_resizing_add * * Other transition effects are used to make one object disappear and another -<<<<<<< HEAD - * object appear on its old place. These effects are: -======= * object appear on its place. These effects are: ->>>>>>> remotes/origin/upstream * * @li @ref elm_transit_effect_flip_add * @li @ref elm_transit_effect_resizable_flip_add @@ -52,13 +43,8 @@ * elm_transit_chain_transit_add. * * @warning We strongly recommend to use elm_transit just when edje can not do -<<<<<<< HEAD - * the trick. Edje has more advantage than Elm_Transit, it has more flexibility and - * animations can be manipulated inside the theme. -======= * the trick. Edje is better at handling transitions than Elm_Transit. * Edje has more flexibility and animations can be manipulated inside the theme. ->>>>>>> remotes/origin/upstream * * List of examples: * @li @ref transit_example_01_explained @@ -89,11 +75,7 @@ typedef enum /** * @enum Elm_Transit_Effect_Flip_Axis * -<<<<<<< HEAD - * The axis where flip effect should be applied. -======= * The axis along which flip effect should be applied. ->>>>>>> remotes/origin/upstream */ typedef enum { @@ -104,11 +86,7 @@ typedef enum /** * @enum Elm_Transit_Effect_Wipe_Dir * -<<<<<<< HEAD - * The direction where the wipe effect should occur. -======= * The direction in which the wipe effect should occur. ->>>>>>> remotes/origin/upstream */ typedef enum { @@ -163,20 +141,11 @@ typedef void (*Elm_Transit_Effect_End_Cb)(Elm_Transit_Effect *effect, Elm_Transi typedef void (*Elm_Transit_Del_Cb)(void *data, Elm_Transit *transit); /** -<<<<<<< HEAD - * Add new transit. - * - * @note Is not necessary to delete the transit object, it will be deleted at - * the end of its operation. - * @note The transit will start playing when the program enter in the main loop, is not - * necessary to give a start to the transit. -======= * Create new transit. * * @note It is not necessary to delete the transit object, it will be deleted at * the end of its operation. * @note The transit will start playing when the program enters the main loop. ->>>>>>> remotes/origin/upstream * * @return The transit object. * @@ -187,44 +156,23 @@ EAPI Elm_Transit *elm_transit_add(void); /** * Stops the animation and delete the @p transit object. * -<<<<<<< HEAD - * Call this function if you wants to stop the animation before the duration - * time. Make sure the @p transit object is still alive with - * elm_transit_del_cb_set() function. - * All added effects will be deleted, calling its repective data_free_cb - * functions. The function setted by elm_transit_del_cb_set() will be called. -======= * Call this function if you want to stop the animation before the * transit time. Make sure the @p transit object is still alive with * elm_transit_del_cb_set() function. * All added effects will be deleted, calling its respective data_free_cb * functions. The function set by elm_transit_del_cb_set() will be called. ->>>>>>> remotes/origin/upstream * * @see elm_transit_del_cb_set() * * @param transit The transit object to be deleted. * * @ingroup Transit -<<<<<<< HEAD - * @warning Just call this function if you are sure the transit is alive. -======= ->>>>>>> remotes/origin/upstream */ EAPI void elm_transit_del(Elm_Transit *transit); /** * Add a new effect to the transit. * -<<<<<<< HEAD - * @note The cb function and the data are the key to the effect. If you try to - * add an already added effect, nothing is done. - * @note After the first addition of an effect in @p transit, if its - * effect list become empty again, the @p transit will be killed by - * elm_transit_del(transit) function. - * - * Exemple: -======= * @note The cb function and the data are the key to the effect. * If you try to add an existing effect, nothing is done. * @note After the first addition of an effect to @p transit, if its @@ -232,7 +180,6 @@ EAPI void elm_transit_del(Elm_Transit *transit); * elm_transit_del(transit) function. * * Example: ->>>>>>> remotes/origin/upstream * @code * Elm_Transit *transit = elm_transit_add(); * elm_transit_effect_add(transit, @@ -252,14 +199,9 @@ EAPI void elm_transit_del(Elm_Transit *transit); * @p data. * * @ingroup Transit -<<<<<<< HEAD - * @warning The transit free the context data at the and of the transition with - * the data_free_cb function, do not use the context data in another transit. -======= * @warning The transit will free the context data at the and of the * transition with the data_free_cb function. * Do not share the context data in between different transit objects. ->>>>>>> remotes/origin/upstream */ EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb); @@ -273,11 +215,7 @@ EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Tra * * @note If the effect is not found, nothing is done. * @note If the effect list become empty, this function will call -<<<<<<< HEAD - * elm_transit_del(transit), that is, it will kill the @p transit. -======= * elm_transit_del(transit), i.e., it will kill the @p transit. ->>>>>>> remotes/origin/upstream * * @param transit The transit object. * @param transition_cb The operation function. @@ -290,19 +228,6 @@ EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Tra /** * Add new object to apply the effects. * -<<<<<<< HEAD - * @note After the first addition of an object in @p transit, if its - * object list become empty again, the @p transit will be killed by - * elm_transit_del(transit) function. - * @note If the @p obj belongs to another transit, the @p obj will be - * removed from it and it will only belong to the @p transit. If the old - * transit stays without objects, it will die. - * @note When you add an object into the @p transit, its state from - * evas_object_pass_events_get(obj) is saved, and it is applied when the - * transit ends, if you change this state whith evas_object_pass_events_set() - * after add the object, this state will change again when @p transit stops to - * run. -======= * @note After the first addition of an object to @p transit, if its * object list become empty again, the @p transit will be killed by * elm_transit_del(transit) function. @@ -313,17 +238,12 @@ EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Tra * evas_object_pass_events_get(obj) is saved, and it is applied when the * transit ends, if you change this state with evas_object_pass_events_set() * after add the object, this state will change again when @p transit stops. ->>>>>>> remotes/origin/upstream * * @param transit The transit object. * @param obj Object to be animated. * * @ingroup Transit -<<<<<<< HEAD - * @warning It is not allowed to add a new object after transit begins to go. -======= * @warning It is not allowed to add a new object after transit begins. ->>>>>>> remotes/origin/upstream */ EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj); @@ -332,21 +252,13 @@ EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Ob * * @note If the @p obj is not in the @p transit, nothing is done. * @note If the list become empty, this function will call -<<<<<<< HEAD - * elm_transit_del(transit), that is, it will kill the @p transit. -======= * elm_transit_del(transit), i.e., it will kill the @p transit. ->>>>>>> remotes/origin/upstream * * @param transit The transit object. * @param obj Object to be removed from @p transit. * * @ingroup Transit -<<<<<<< HEAD - * @warning It is not allowed to remove objects after transit begins to go. -======= * @warning It is not allowed to remove objects after transit begins. ->>>>>>> remotes/origin/upstream */ EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj); @@ -368,11 +280,7 @@ EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit); * @note One state includes geometry, color, map data. * * @param transit The transit object. -<<<<<<< HEAD - * @param state_keep Keeping or Non Keeping. -======= * @param state_keep retain the state or not. ->>>>>>> remotes/origin/upstream * * @ingroup Transit */ @@ -396,19 +304,11 @@ EAPI Eina_Bool elm_transit_objects_final_state_keep_get(const Elm_T /** * Set the event enabled when transit is operating. * -<<<<<<< HEAD - * If @p enabled is EINA_TRUE, the objects of the transit will receives - * events from mouse and keyboard during the animation. - * @note When you add an object with elm_transit_object_add(), its state from - * evas_object_pass_events_get(obj) is saved, and it is applied when the - * transit ends, if you change this state with evas_object_pass_events_set() -======= * If @p enabled is EINA_TRUE, the objects of the transit will receive * events from mouse and keyboard during the animation. * @note When you add an object with elm_transit_object_add(), its state from * evas_object_freeze_events_get(obj) is saved, and it is applied when the * transit ends. If you change this state with evas_object_freeze_events_set() ->>>>>>> remotes/origin/upstream * after adding the object, this state will change again when @p transit stops * to run. * @@ -436,21 +336,13 @@ EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *tra /** * Set the user-callback function when the transit is deleted. * -<<<<<<< HEAD - * @note Using this function twice will overwrite the first function setted. -======= * @note Using this function twice will overwrite the first function set. ->>>>>>> remotes/origin/upstream * @note the @p transit object will be deleted after call @p cb function. * * @param transit The transit object. * @param cb Callback function pointer. This function will be called before * the deletion of the transit. -<<<<<<< HEAD - * @param data Callback funtion user data. It is the @p op parameter. -======= * @param data Callback function user data. It is the @p op parameter. ->>>>>>> remotes/origin/upstream * * @ingroup Transit */ @@ -459,17 +351,10 @@ EAPI void elm_transit_del_cb_set(Elm_Transit *transit, Elm_Tra /** * Set reverse effect automatically. * -<<<<<<< HEAD - * If auto reverse is setted, after running the effects with the progress - * parameter from 0 to 1, it will call the effecs again with the progress - * from 1 to 0. The transit will last for a time iqual to (2 * duration * repeat), - * where the duration was setted with the function elm_transit_add and -======= * If auto reverse is set, after running the effects with the progress * parameter from 0 to 1, it will call the effects again with the progress * from 1 to 0. The transit will last for a time equal to (2 * duration * repeat), * where the duration was set with the function elm_transit_add and ->>>>>>> remotes/origin/upstream * the repeat with the function elm_transit_repeat_times_set(). * * @param transit The transit object. @@ -496,11 +381,7 @@ EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *tran * Set the transit repeat count. Effect will be repeated by repeat count. * * This function sets the number of repetition the transit will run after -<<<<<<< HEAD - * the first one, that is, if @p repeat is 1, the transit will run 2 times. -======= * the first one, i.e., if @p repeat is 1, the transit will run 2 times. ->>>>>>> remotes/origin/upstream * If the @p repeat is a negative number, it will repeat infinite times. * * @note If this function is called during the transit execution, the transit @@ -596,11 +477,7 @@ EAPI void elm_transit_go(Elm_Transit *transit); * Pause/Resume the transition. * * If you call elm_transit_go again, the transit will be started from the -<<<<<<< HEAD - * beginning, and will be unpaused. -======= * beginning, and will be played. ->>>>>>> remotes/origin/upstream * * @note @p transit can not be NULL * @@ -776,11 +653,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_zoom_add(Elm_Transit *transit, fl EAPI Elm_Transit_Effect *elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Transit_Effect_Flip_Axis axis, Eina_Bool cw); /** -<<<<<<< HEAD - * Add the Resizable Flip Effect to Elm_Transit. -======= * Add the Resizeable Flip Effect to Elm_Transit. ->>>>>>> remotes/origin/upstream * * @note This API is one of the facades. It creates resizable flip effect context * and add it's required APIs to elm_transit_effect_add. @@ -793,11 +666,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_flip_add(Elm_Transit *transit, El * @param transit Transit object. * @param axis Flipping Axis(X or Y). * @param cw Flipping Direction. EINA_TRUE is clock-wise. -<<<<<<< HEAD - * @return Resizable flip effect context data. -======= * @return Resizeable flip effect context data. ->>>>>>> remotes/origin/upstream * * @ingroup Transit * @warning It is highly recommended just create a transit with this effect when -- 2.7.4