From 514f640bc84f5f81a904ec4c41b454a4306de8af Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Thu, 8 Mar 2012 14:51:34 +0900 Subject: [PATCH] fix conflicted files - toolbar, scroller --- data/themes/widgets/toolbar.edc | 46 ------- src/bin/test_scroller.c | 8 -- src/bin/test_toolbar.c | 47 -------- src/edje_externals/elm_toolbar.c | 23 ---- src/lib/elm_scroll.h | 4 - src/lib/elm_scroller.c | 17 --- src/lib/elm_scroller.h | 19 --- src/lib/elm_toolbar.c | 252 --------------------------------------- src/lib/elm_toolbar.h | 127 -------------------- src/lib/els_scroller.c | 138 --------------------- 10 files changed, 681 deletions(-) diff --git a/data/themes/widgets/toolbar.edc b/data/themes/widgets/toolbar.edc index 9f88d6a..4d1d2f0 100644 --- a/data/themes/widgets/toolbar.edc +++ b/data/themes/widgets/toolbar.edc @@ -239,10 +239,6 @@ group { name: "elm/toolbar/item/default"; clip_to: "elm.icon.clipper"; description { state: "default" 0.0; align: 0.5 0.5; -<<<<<<< HEAD - fixed: 0 0; -======= ->>>>>>> remotes/origin/upstream rel1 { relative: 0.0 0.0; offset: 2 2; @@ -260,10 +256,6 @@ group { name: "elm/toolbar/item/default"; clip_to: "elm.icon_new.clipper"; description { state: "default" 0.0; align: 0.5 0.5; -<<<<<<< HEAD - fixed: 0 0; -======= ->>>>>>> remotes/origin/upstream rel1 { relative: 0.0 0.0; offset: 2 2; @@ -445,11 +437,7 @@ group { name: "elm/toolbar/item/default"; transition: LINEAR 0.1; } program { name: "go"; -<<<<<<< HEAD - signal: "mouse,up,1"; -======= signal: "mouse,clicked,1"; ->>>>>>> remotes/origin/upstream source: "event"; action: SIGNAL_EMIT "elm,action,click" "elm"; } @@ -577,29 +565,6 @@ group { name: "elm/toolbar/item/default"; } group { name: "elm/toolbar/item/item_horizontal"; -<<<<<<< HEAD - inherit: "elm/toolbar/item/default"; - parts.part { name: "elm.swallow.icon"; - description { state: "default" 0.0; - align: 0.0 0.5; - rel1.offset: 3 3; - rel1.relative: 0 0; - rel2.offset: -4 -4; - rel2.relative: 1 1; - color: 0 0 0 0; - } - } - parts.part { name: "elm.text"; - description { state: "default" 0.0; - align: 1 0.5; - min: 0 1; - rel1.offset: 1 0; - rel1.relative: 1 0.5; - rel1.to_x: "elm.swallow.icon"; - text.align: 0 0.5; - } - } -======= inherit: "elm/toolbar/item/default"; parts { part { name: "elm.swallow.icon"; @@ -685,7 +650,6 @@ group { name: "elm/toolbar/item/item_horizontal"; } } } ->>>>>>> remotes/origin/upstream } group { name: "elm/toolbar/separator/default"; @@ -713,19 +677,9 @@ group { name: "elm/toolbar/separator/default"; group { name: "elm/toolbar/object/default"; parts { part { name: "elm.swallow.object"; // object group -<<<<<<< HEAD - type: SWALLOW; - description { - state: "default" 0.0; -======= type: SWALLOW; description { state: "default" 0.0; ->>>>>>> remotes/origin/upstream } } } } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c index 55f5c70..a2d9980 100644 --- a/src/bin/test_scroller.c +++ b/src/bin/test_scroller.c @@ -171,11 +171,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5); -<<<<<<< HEAD - elm_scroller_bounce_set(sc, 1, 0); -======= elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_scroller_content_min_limit(sc, 0, 1); elm_box_pack_end(bx, sc); evas_object_show(sc); @@ -257,11 +253,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -<<<<<<< HEAD - elm_scroller_bounce_set(sc, 0, 1); -======= elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_win_resize_object_add(win, sc); elm_object_content_set(sc, bx); evas_object_show(bx); diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index 01de88a..3075501 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -85,17 +85,10 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf evas_object_show(bx); tb = elm_toolbar_add(win); -<<<<<<< HEAD - elm_toolbar_homogeneous_set(tb, 0); - elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU); - evas_object_size_hint_weight_set(tb, 0.0, 0.0); - evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); -======= elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); elm_object_scale_set(tb, 0.9); ->>>>>>> remotes/origin/upstream ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); @@ -119,11 +112,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_toolbar_item_priority_set(tb_it, -200); tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(tb_it, 1); -======= elm_toolbar_item_menu_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(tb_it, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(tb_it); @@ -233,11 +222,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(item, 0); item = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(item, 1); -======= elm_toolbar_item_menu_set(item, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(item, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(item); @@ -320,11 +305,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(bx); tb = elm_toolbar_add(win); -<<<<<<< HEAD - elm_toolbar_homogeneous_set(tb, 0); -======= elm_toolbar_homogeneous_set(tb, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_NONE); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); @@ -336,21 +317,13 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in tb_it = elm_toolbar_item_append(tb, "document-print", "Hello", tb_1, ph1); elm_object_item_disabled_set(tb_it, EINA_TRUE); -<<<<<<< HEAD - elm_toolbar_item_priority_set(tb_it, 0); -======= elm_toolbar_item_priority_set(tb_it, EINA_FALSE); ->>>>>>> remotes/origin/upstream tb_it = elm_toolbar_item_append(tb, "folder-new", "World", tb_2, ph1); elm_toolbar_item_priority_set(tb_it, -200); tb_it = elm_toolbar_item_append(tb, "object-rotate-right", "H", tb_3, ph4); -<<<<<<< HEAD - elm_toolbar_item_priority_set(tb_it, 1); -======= elm_toolbar_item_priority_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream tb_it = elm_toolbar_item_append(tb, "mail-send", "Comes", tb_4, ph4); elm_toolbar_item_priority_set(tb_it, -10); @@ -359,11 +332,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(tb_it, 50); tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(tb_it, 1); -======= elm_toolbar_item_menu_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(tb_it, 999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(tb_it); @@ -473,11 +442,7 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(tb_it, -200); tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(tb_it, 1); -======= elm_toolbar_item_menu_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(tb_it, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(tb_it); @@ -564,11 +529,7 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); -<<<<<<< HEAD - elm_toolbar_no_select_mode_set(tb, EINA_TRUE); -======= elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_NONE); ->>>>>>> remotes/origin/upstream ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); @@ -596,11 +557,7 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(tb_it, -200); tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(tb_it, 1); -======= elm_toolbar_item_menu_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(tb_it, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(tb_it); @@ -711,11 +668,7 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(tb_it, -200); tb_it = elm_toolbar_item_append(tb, "refresh", "Menu", NULL, NULL); -<<<<<<< HEAD - elm_toolbar_item_menu_set(tb_it, 1); -======= elm_toolbar_item_menu_set(tb_it, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_toolbar_item_priority_set(tb_it, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(tb_it); diff --git a/src/edje_externals/elm_toolbar.c b/src/edje_externals/elm_toolbar.c index 085425d..a3fe781 100644 --- a/src/edje_externals/elm_toolbar.c +++ b/src/edje_externals/elm_toolbar.c @@ -52,12 +52,6 @@ external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void * elm_toolbar_icon_size_set(obj, p->icon_size); if (p->align_exists) elm_toolbar_align_set(obj, p->align); -<<<<<<< HEAD - if (p->always_select_exists) - elm_toolbar_always_select_mode_set(obj, p->always_select); - if (p->no_select_exists) - elm_toolbar_no_select_mode_set(obj, p->no_select); -======= if (p->no_select_exists) { if (p->no_select) @@ -72,7 +66,6 @@ external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void * else elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT); } ->>>>>>> remotes/origin/upstream if (p->horizontal_exists) elm_toolbar_horizontal_set(obj, p->horizontal); if (p->homogeneous_exists) @@ -109,14 +102,10 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - elm_toolbar_always_select_mode_set(obj, param->i); -======= if (param->i) elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS); else elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } @@ -124,14 +113,10 @@ external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_E { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - elm_toolbar_no_select_mode_set(obj, param->i); -======= if (param->i) elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE); else elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT); ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } @@ -190,15 +175,11 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - param->d = elm_toolbar_always_select_mode_get(obj); -======= if (elm_toolbar_select_mode_get (obj) == ELM_OBJECT_SELECT_MODE_ALWAYS) param->d = EINA_TRUE; else param->d = EINA_FALSE; ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } @@ -206,15 +187,11 @@ external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_E { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { -<<<<<<< HEAD - param->i = elm_toolbar_no_select_mode_get(obj); -======= if (elm_toolbar_select_mode_get (obj) == ELM_OBJECT_SELECT_MODE_NONE) param->i = EINA_TRUE; else param->i = EINA_FALSE; ->>>>>>> remotes/origin/upstream return EINA_TRUE; } } diff --git a/src/lib/elm_scroll.h b/src/lib/elm_scroll.h index 3a4eb2e..ca9aaed 100644 --- a/src/lib/elm_scroll.h +++ b/src/lib/elm_scroll.h @@ -101,11 +101,7 @@ EAPI Eina_Bool elm_object_scroll_lock_x_get(const Evas_Object *obj); /** * Get the scrolling lock of the given widget * -<<<<<<< HEAD - * This gets the lock for X axis scrolling. -======= * This gets the lock for Y axis scrolling. ->>>>>>> remotes/origin/upstream * * @param obj The object * @ingroup Scrollhints diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index b99cc9e..4f7a598 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -741,11 +741,7 @@ elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - elm_smart_scroller_propagate_events_set(wd->scr, propagation); -======= evas_object_propagate_events_set(wd->scr, propagation); ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -755,11 +751,7 @@ elm_scroller_propagate_events_get(const Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; -<<<<<<< HEAD - return elm_smart_scroller_propagate_events_get(wd->scr); -======= return evas_object_propagate_events_get(wd->scr); ->>>>>>> remotes/origin/upstream } EAPI void @@ -781,12 +773,3 @@ elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y) elm_smart_scroller_gravity_get(wd->scr, x, y); } -<<<<<<< HEAD - -EAPI void -elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set) -{ - return ; -} -======= ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h index abd7674..bab068c 100644 --- a/src/lib/elm_scroller.h +++ b/src/lib/elm_scroller.h @@ -18,16 +18,6 @@ * @li "scroll,drag,start" - dragging the contents around has started * @li "scroll,drag,stop" - dragging the contents around has stopped * @note The "scroll,anim,*" and "scroll,drag,*" signals are only emitted by -<<<<<<< HEAD - * user intervetion. - * - * @note When Elemementary is in embedded mode the scrollbars will not be - * dragable, they appear merely as indicators of how much has been scrolled. - * @note When Elementary is in desktop mode the thumbscroll(a.k.a. - * fingerscroll) won't work. - * - * Default contents parts of the scroller widget that you can use for are: -======= * user intervention. * * @note When Elementary is in embedded mode the scrollbars will not be @@ -36,7 +26,6 @@ * fingerscroll) won't work. * * Default content parts of the scroller widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "default" - A content of the scroller * * Supported elm_object common APIs. @@ -240,11 +229,7 @@ EAPI void elm_scroller_page_size_set(Evas_Object *obj, E * * @see elm_scroller_last_page_get() * @see elm_scroller_page_show() -<<<<<<< HEAD - * @see elm_scroller_page_brint_in() -======= * @see elm_scroller_page_bring_in() ->>>>>>> remotes/origin/upstream */ EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); @@ -260,11 +245,7 @@ EAPI void elm_scroller_current_page_get(const Evas_Objec * * @see elm_scroller_current_page_get() * @see elm_scroller_page_show() -<<<<<<< HEAD - * @see elm_scroller_page_brint_in() -======= * @see elm_scroller_page_bring_in() ->>>>>>> remotes/origin/upstream */ EAPI void elm_scroller_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber); diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 6af1a91..50ec7f1 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -18,14 +18,8 @@ struct _Widget_Data int icon_size; unsigned int item_count; double align; -<<<<<<< HEAD - Eina_Bool homogeneous : 1; - Eina_Bool no_select : 1; - Eina_Bool always_select : 1; -======= Elm_Object_Select_Mode select_mode; Eina_Bool homogeneous : 1; ->>>>>>> remotes/origin/upstream Eina_Bool vertical : 1; Eina_Bool long_press : 1; Ecore_Timer *long_timer; @@ -79,13 +73,8 @@ static void _resize(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _menu_move_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _menu_hide(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data); -<<<<<<< HEAD -static void _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *signal); -static void _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *signal); -======= static void _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *sig); static void _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig); ->>>>>>> remotes/origin/upstream static const char SIG_CLICKED[] = "clicked"; static const char SIG_LONGPRESSED[] = "longpressed"; @@ -101,15 +90,8 @@ static const Evas_Smart_Cb_Description _signals[] = { static void _item_disable_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - - Widget_Data *wd; - Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *) it; -======= Widget_Data *wd; Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(WIDGET(toolbar_it)); if (!wd) return; @@ -191,19 +173,11 @@ _item_select(Elm_Toolbar_Item *it) if (elm_widget_item_disabled_get(it) || (it->separator) || (it->object)) return; sel = it->selected; -<<<<<<< HEAD - if (!wd->no_select) - { - if (sel) - { - if (wd->always_select) return; -======= if (wd->select_mode != ELM_OBJECT_SELECT_MODE_NONE) { if (sel) { if (wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) return; ->>>>>>> remotes/origin/upstream _item_unselect(it); } else @@ -432,51 +406,29 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - if (part && strcmp(part, "default")) return; - _item_label_set(((Elm_Toolbar_Item *) it), label, "elm,state,label_set"); -======= if (part && strcmp(part, "default")) return; _item_label_set(((Elm_Toolbar_Item *)it), label, "elm,state,label_set"); ->>>>>>> remotes/origin/upstream } static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - if (part && strcmp(part, "default")) return NULL; - return ((Elm_Toolbar_Item *) it)->label; -======= if (part && strcmp(part, "default")) return NULL; return ((Elm_Toolbar_Item *)it)->label; ->>>>>>> remotes/origin/upstream } static void _item_content_set_hook(Elm_Object_Item *it, -<<<<<<< HEAD - const char *part, - Evas_Object *content) -{ -======= const char *part, Evas_Object *content) { double scale; ->>>>>>> remotes/origin/upstream if (part && strcmp(part, "object")) return; Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; Evas_Object *obj = WIDGET(item); Widget_Data *wd = elm_widget_data_get(obj); -<<<<<<< HEAD - double scale; -======= ->>>>>>> remotes/origin/upstream if (item->object == content) return; item->object = content; elm_widget_sub_object_add(obj, item->object); @@ -494,18 +446,6 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part) static Evas_Object * _item_content_unset_hook(Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - if (part && strcmp(part, "object")) return; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; - Evas_Object *obj = WIDGET(item); - Widget_Data *wd = elm_widget_data_get(obj); - double scale; - edje_object_part_unswallow(VIEW(it), item->object); - elm_widget_sub_object_del(obj, item->object); - item->object = NULL; - scale = (elm_widget_scale_get(obj) * _elm_config->scale); - _theme_hook_item(obj, item, scale, wd->icon_size); -======= Evas_Object *o; double scale; @@ -521,7 +461,6 @@ _item_content_unset_hook(Elm_Object_Item *it, const char *part) scale = (elm_widget_scale_get(obj) * _elm_config->scale); _theme_hook_item(obj, item, scale, wd->icon_size); return o; ->>>>>>> remotes/origin/upstream } static void @@ -705,11 +644,7 @@ _resize_job(void *data) /* All items are removed from the box object, since removing individual * items won't trigger a resize. Items are be readded below. */ evas_object_box_remove_all(wd->bx, EINA_FALSE); -<<<<<<< HEAD - if (((wd->vertical) && (ih > vh)) || -======= if (((wd->vertical) && (ih > vh)) || ->>>>>>> remotes/origin/upstream ((!wd->vertical) && (iw > vw))) { Evas_Object *menu; @@ -772,11 +707,7 @@ _resize_job(void *data) _fix_items_visibility(wd, &iw, vw); } evas_object_box_remove_all(wd->bx, EINA_FALSE); -<<<<<<< HEAD - if (((wd->vertical) && (ih > vh)) || -======= if (((wd->vertical) && (ih > vh)) || ->>>>>>> remotes/origin/upstream ((!wd->vertical) && (iw > vw))) { EINA_INLIST_FOREACH(wd->items, it) @@ -931,11 +862,7 @@ _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data) Evas_Object *obj = (Evas_Object *) data; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - _els_box_layout(o, priv, !wd->vertical, wd->homogeneous, -======= _els_box_layout(o, priv, !wd->vertical, wd->homogeneous, ->>>>>>> remotes/origin/upstream elm_widget_mirrored_get(obj)); } @@ -967,19 +894,10 @@ _access_state_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Widget_ static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - - Widget_Data *wd; - Evas_Object *obj2; - Elm_Toolbar_Item *item, *next; - item = (Elm_Toolbar_Item *) it; -======= Widget_Data *wd; Evas_Object *obj2; Elm_Toolbar_Item *item, *next; item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; @@ -989,12 +907,8 @@ _item_del_pre_hook(Elm_Object_Item *it) wd->items = eina_inlist_remove(wd->items, EINA_INLIST_GET(item)); wd->item_count--; if (!next) next = ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items); -<<<<<<< HEAD - if (wd->always_select && item->selected && next) _item_select(next); -======= if ((wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS) && item->selected && next) _item_select(next); ->>>>>>> remotes/origin/upstream _item_del(item); _theme_hook(obj2); @@ -1108,12 +1022,8 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f evas_object_size_hint_max_set(VIEW(it), -1, -1); evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_RESIZE, _resize_item, obj); -<<<<<<< HEAD - if ((!wd->items) && wd->always_select) _item_select(it); -======= if ((!wd->items) && (wd->select_mode == ELM_OBJECT_SELECT_MODE_ALWAYS)) _item_select(it); ->>>>>>> remotes/origin/upstream wd->item_count++; return it; } @@ -1160,11 +1070,7 @@ _elm_toolbar_item_label_set_cb (void *data, Evas_Object *obj, const char *emissi } static void -<<<<<<< HEAD -_item_label_set(Elm_Toolbar_Item *item, const char *label, const char *signal) -======= _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig) ->>>>>>> remotes/origin/upstream { const char *s; @@ -1175,11 +1081,7 @@ _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig) if ((s) && (atoi(s))) { edje_object_part_text_set(VIEW(item), "elm.text_new", item->label); -<<<<<<< HEAD - edje_object_signal_emit (VIEW(item), signal, "elm"); -======= edje_object_signal_emit (VIEW(item), sig, "elm"); ->>>>>>> remotes/origin/upstream edje_object_signal_callback_add(VIEW(item), "elm,state,label_set,done", "elm", _elm_toolbar_item_label_set_cb, item); @@ -1243,11 +1145,7 @@ _elm_toolbar_item_icon_set_cb (void *data, Evas_Object *obj, const char *emissio } static void -<<<<<<< HEAD -_elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *signal) -======= _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Object *icon_obj, const char *icon_str, double icon_size, const char *sig) ->>>>>>> remotes/origin/upstream { Evas_Object *old_icon; int ms = 0; @@ -1281,11 +1179,7 @@ _elm_toolbar_item_icon_obj_set(Evas_Object *obj, Elm_Toolbar_Item *item, Evas_Ob } edje_object_part_swallow(VIEW(item), "elm.swallow.icon_new", item->icon); -<<<<<<< HEAD - edje_object_signal_emit (VIEW(item), signal, "elm"); -======= edje_object_signal_emit (VIEW(item), sig, "elm"); ->>>>>>> remotes/origin/upstream edje_object_signal_callback_add(VIEW(item), "elm,state,icon_set,done", "elm", _elm_toolbar_item_icon_set_cb, item); @@ -1414,11 +1308,7 @@ elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, E _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1438,11 +1328,7 @@ elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1467,11 +1353,7 @@ elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1496,11 +1378,7 @@ elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const ch _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1526,11 +1404,7 @@ elm_toolbar_item_next_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST( -<<<<<<< HEAD - EINA_INLIST_GET(((Elm_Toolbar_Item *) it))->next); -======= EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->next); ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1538,11 +1412,7 @@ elm_toolbar_item_prev_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST( -<<<<<<< HEAD - EINA_INLIST_GET(((Elm_Toolbar_Item *) it))->prev); -======= EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->prev); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -1556,11 +1426,7 @@ EAPI void elm_toolbar_item_priority_set(Elm_Object_Item *it, int priority) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream if (item->prio.priority == priority) return; item->prio.priority = priority; _resize(WIDGET(item), NULL, NULL, NULL); @@ -1570,11 +1436,7 @@ EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0); -<<<<<<< HEAD - return ((Elm_Toolbar_Item *) it)->prio.priority; -======= return ((Elm_Toolbar_Item *)it)->prio.priority; ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -1612,11 +1474,7 @@ elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label) EINA_INLIST_FOREACH(wd->items, it) { if (!strcmp(it->label, label)) -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } return NULL; } @@ -1625,11 +1483,7 @@ EAPI void elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1642,11 +1496,7 @@ EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -<<<<<<< HEAD - return ((Elm_Toolbar_Item *) it)->selected; -======= return ((Elm_Toolbar_Item *)it)->selected; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -1666,11 +1516,7 @@ elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon) Evas_Object *icon_obj; Widget_Data *wd; Evas_Object *obj; -<<<<<<< HEAD - Elm_Toolbar_Item * item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item * item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1694,11 +1540,7 @@ EAPI const char * elm_toolbar_item_icon_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - return ((Elm_Toolbar_Item *) it)->icon_str; -======= return ((Elm_Toolbar_Item *)it)->icon_str; ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -1708,11 +1550,7 @@ elm_toolbar_item_object_get(const Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1725,11 +1563,7 @@ EAPI Evas_Object * elm_toolbar_item_icon_object_get(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - return ((Elm_Toolbar_Item *) it)->icon; -======= return ((Elm_Toolbar_Item *)it)->icon; ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -1741,11 +1575,7 @@ elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t s Widget_Data *wd; Evas_Object *obj; Eina_Bool ret; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1778,11 +1608,7 @@ elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char Widget_Data *wd; Evas_Object *obj; Eina_Bool ret; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1834,11 +1660,7 @@ EAPI void elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream Evas_Object *obj = WIDGET(item); Widget_Data *wd = elm_widget_data_get(obj); double scale; @@ -1852,11 +1674,7 @@ EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); -<<<<<<< HEAD - return ((Elm_Toolbar_Item *) it)->separator; -======= return ((Elm_Toolbar_Item *)it)->separator; ->>>>>>> remotes/origin/upstream } EAPI void @@ -1881,11 +1699,7 @@ elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mod if (shrink_mode == ELM_TOOLBAR_SHRINK_MENU) { -<<<<<<< HEAD - elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, -======= elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, ->>>>>>> remotes/origin/upstream ELM_SMART_SCROLLER_POLICY_OFF); wd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL); } @@ -1992,11 +1806,7 @@ EAPI void elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -2009,11 +1819,7 @@ EAPI Evas_Object * elm_toolbar_item_menu_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream if (!item->menu) return NULL; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return NULL; @@ -2029,11 +1835,7 @@ elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *la Evas_Object *icon_obj; Evas_Object *obj; Widget_Data *wd; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(WIDGET(item)); if (!wd) return NULL; @@ -2087,11 +1889,7 @@ elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state) if (!state) return EINA_FALSE; -<<<<<<< HEAD - item = (Elm_Toolbar_Item *) it; -======= item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream if (!item->states) return EINA_FALSE; del_state = eina_list_data_find_list(item->states, state); @@ -2127,11 +1925,7 @@ elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state) Eina_List *next_state; Elm_Toolbar_Item_State *it_state; Evas_Object *obj; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -2184,11 +1978,7 @@ EAPI Elm_Toolbar_Item_State * elm_toolbar_item_state_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream if ((!item->states) || (!item->current_state)) return NULL; if (item->current_state == item->states) return NULL; @@ -2204,11 +1994,7 @@ elm_toolbar_item_state_next(Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; Eina_List *next_state; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -2229,11 +2015,7 @@ elm_toolbar_item_state_prev(Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; Eina_List *prev_state; -<<<<<<< HEAD - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; -======= Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; ->>>>>>> remotes/origin/upstream obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -2318,24 +2100,12 @@ elm_toolbar_item_cursor_engine_only_get(const Elm_Object_Item *it) return elm_object_item_cursor_engine_only_get(it); } -<<<<<<< HEAD -EAPI void -======= EINA_DEPRECATED EAPI void ->>>>>>> remotes/origin/upstream elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - if (always_select && (!wd->always_select) && wd->items) - _item_select(ELM_TOOLBAR_ITEM_FROM_INLIST(wd->items)); - wd->always_select = always_select; -} - -EAPI Eina_Bool -======= if (always_select) elm_toolbar_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_ALWAYS); else @@ -2347,18 +2117,11 @@ EAPI Eina_Bool } EINA_DEPRECATED EAPI Eina_Bool ->>>>>>> remotes/origin/upstream elm_toolbar_always_select_mode_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 wd->always_select; -} - -EAPI void -======= Elm_Object_Select_Mode oldmode = elm_toolbar_select_mode_get(obj); if (oldmode == ELM_OBJECT_SELECT_MODE_ALWAYS) return EINA_TRUE; @@ -2367,18 +2130,11 @@ EAPI void } EINA_DEPRECATED EAPI void ->>>>>>> remotes/origin/upstream elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->no_select = no_select; -} - -EAPI Eina_Bool -======= if (no_select) elm_toolbar_select_mode_set(obj, ELM_OBJECT_SELECT_MODE_NONE); else @@ -2390,21 +2146,16 @@ EAPI Eina_Bool } EINA_DEPRECATED EAPI Eina_Bool ->>>>>>> remotes/origin/upstream elm_toolbar_no_select_mode_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 wd->no_select; -======= Elm_Object_Select_Mode oldmode = elm_toolbar_select_mode_get(obj); if (oldmode == ELM_OBJECT_SELECT_MODE_NONE) return EINA_TRUE; else return EINA_FALSE; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2486,8 +2237,6 @@ elm_toolbar_mode_shrink_get(const Evas_Object *obj) { return elm_toolbar_shrink_mode_get(obj); } -<<<<<<< HEAD -======= EAPI void elm_toolbar_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode) @@ -2514,4 +2263,3 @@ elm_toolbar_select_mode_get(const Evas_Object *obj) return wd->select_mode; } ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_toolbar.h b/src/lib/elm_toolbar.h index 1637a78..bfeb795 100644 --- a/src/lib/elm_toolbar.h +++ b/src/lib/elm_toolbar.h @@ -48,21 +48,13 @@ * @enum _Elm_Toolbar_Shrink_Mode * @typedef Elm_Toolbar_Shrink_Mode * -<<<<<<< HEAD - * Set toolbar's items display behavior, it can be scrollabel, -======= * Set toolbar's items display behavior, it can be scrollable, ->>>>>>> remotes/origin/upstream * show a menu with exceeding items, or simply hide them. * * @note Default value is #ELM_TOOLBAR_SHRINK_MENU. It reads value * from elm config. * -<<<<<<< HEAD - * Values don't work as bitmask, only one can be choosen. -======= * Values don't work as bitmask, only one can be chosen. ->>>>>>> remotes/origin/upstream * * @see elm_toolbar_shrink_mode_set() * @see elm_toolbar_shrink_mode_get() @@ -71,11 +63,7 @@ */ typedef enum { -<<<<<<< HEAD - ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimun size to fit all the items. */ -======= ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimum size to fit all the items. */ ->>>>>>> remotes/origin/upstream ELM_TOOLBAR_SHRINK_HIDE, /**< Hide exceeding items. */ ELM_TOOLBAR_SHRINK_SCROLL, /**< Allow accessing exceeding items through a scroller. */ ELM_TOOLBAR_SHRINK_MENU, /**< Inserts a button to pop up a menu with exceeding items. */ @@ -152,73 +140,6 @@ EAPI void elm_toolbar_icon_order_lookup_set(Evas_Object EAPI Elm_Icon_Lookup_Order elm_toolbar_icon_order_lookup_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Set whether the toolbar should always have an item selected. - * - * @param obj The toolbar object. - * @param wrap @c EINA_TRUE to enable always-select mode or @c EINA_FALSE to - * disable it. - * - * This will cause the toolbar to always have an item selected, and clicking - * the selected item will not cause a selected event to be emitted. Enabling this mode - * will immediately select the first toolbar item. - * - * Always-selected is disabled by default. - * - * @see elm_toolbar_always_select_mode_get(). - * - * @ingroup Toolbar - */ -EAPI void elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); - -/** - * Get whether the toolbar should always have an item selected. - * - * @param obj The toolbar object. - * @return @c EINA_TRUE means an item will always be selected, @c EINA_FALSE indicates - * that it is possible to have no items selected. If @p obj is @c NULL, @c EINA_FALSE is returned. - * - * @see elm_toolbar_always_select_mode_set() for details. - * - * @ingroup Toolbar - */ -EAPI Eina_Bool elm_toolbar_always_select_mode_get(const Evas_Object *obj); - -/** - * Set whether the toolbar items' should be selected by the user or not. - * - * @param obj The toolbar object. - * @param wrap @c EINA_TRUE to disable selection or @c EINA_FALSE to - * enable it. - * - * This will turn off the ability to select items entirely and they will - * neither appear selected nor emit selected signals. The clicked - * callback function will still be called. - * - * Selection is enabled by default. - * - * @see elm_toolbar_no_select_mode_get(). - * - * @ingroup Toolbar - */ -EAPI void elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); - -/** - * Set whether the toolbar items' should be selected by the user or not. - * - * @param obj The toolbar object. - * @return @c EINA_TRUE means items can be selected. @c EINA_FALSE indicates - * they can't. If @p obj is @c NULL, @c EINA_FALSE is returned. - * - * @see elm_toolbar_no_select_mode_set() for details. - * - * @ingroup Toolbar - */ -EAPI Eina_Bool elm_toolbar_no_select_mode_get(const Evas_Object *obj); - -/** -======= ->>>>>>> remotes/origin/upstream * Append item to the toolbar. * * @param obj The toolbar object. @@ -237,11 +158,7 @@ EAPI Eina_Bool elm_toolbar_no_select_mode_get(const Evas_Obje * Associated @p data can be properly freed when item is deleted if a * callback function is set with elm_object_item_del_cb_set(). * -<<<<<<< HEAD - * If a function is passed as argument, it will be called everytime this item -======= * If a function is passed as argument, it will be called every time this item ->>>>>>> remotes/origin/upstream * is selected, i.e., the user clicks over an unselected item. * If such function isn't needed, just passing * @c NULL as @p func is enough. The same should be done for @p data. @@ -276,11 +193,7 @@ EAPI Elm_Object_Item *elm_toolbar_item_append(Evas_Object *obj, cons * Associated @p data can be properly freed when item is deleted if a * callback function is set with elm_object_item_del_cb_set(). * -<<<<<<< HEAD - * If a function is passed as argument, it will be called everytime this item -======= * If a function is passed as argument, it will be called every time this item ->>>>>>> remotes/origin/upstream * is selected, i.e., the user clicks over an unselected item. * If such function isn't needed, just passing * @c NULL as @p func is enough. The same should be done for @p data. @@ -316,11 +229,7 @@ EAPI Elm_Object_Item *elm_toolbar_item_prepend(Evas_Object *obj, con * Associated @p data can be properly freed when item is deleted if a * callback function is set with elm_object_item_del_cb_set(). * -<<<<<<< HEAD - * If a function is passed as argument, it will be called everytime this item -======= * If a function is passed as argument, it will be called every time this item ->>>>>>> remotes/origin/upstream * is selected, i.e., the user clicks over an unselected item. * If such function isn't needed, just passing * @c NULL as @p func is enough. The same should be done for @p data. @@ -356,11 +265,7 @@ EAPI Elm_Object_Item *elm_toolbar_item_insert_before(Evas_Object *ob * Associated @p data can be properly freed when item is deleted if a * callback function is set with elm_object_item_del_cb_set(). * -<<<<<<< HEAD - * If a function is passed as argument, it will be called everytime this item -======= * If a function is passed as argument, it will be called every time this item ->>>>>>> remotes/origin/upstream * is selected, i.e., the user clicks over an unselected item. * If such function isn't needed, just passing * @c NULL as @p func is enough. The same should be done for @p data. @@ -423,11 +328,7 @@ EAPI Elm_Object_Item *elm_toolbar_item_next_get(const Elm_Object_Ite /** * Get the item before @p item in toolbar. * -<<<<<<< HEAD - * @param item The toolbar item. -======= * @param it The toolbar item. ->>>>>>> remotes/origin/upstream * @return The item before @p item, or @c NULL if none or on failure. * * @note If it is the first item, @c NULL will be returned. @@ -505,13 +406,8 @@ EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object * This sets the selected state of the given item @p it. * @c EINA_TRUE for selected, @c EINA_FALSE for not selected. * -<<<<<<< HEAD - * If a new item is selected the previosly selected will be unselected. - * Previoulsy selected item can be get with function -======= * If a new item is selected the previously selected will be unselected. * Previously selected item can be get with function ->>>>>>> remotes/origin/upstream * elm_toolbar_selected_item_get(). * * Selected items will be highlighted. @@ -543,10 +439,6 @@ EAPI Elm_Object_Item *elm_toolbar_selected_item_get(const Evas_Objec /** * Set the icon associated with @p item. * -<<<<<<< HEAD - * @param obj The parent of this item. -======= ->>>>>>> remotes/origin/upstream * @param it The toolbar item. * @param icon A string with icon name or the absolute path of an image file. * @@ -634,11 +526,7 @@ EAPI Eina_Bool elm_toolbar_item_icon_file_set(Elm_Object_Item * Set or unset item as a separator. * * @param it The toolbar item. -<<<<<<< HEAD - * @param setting @c EINA_TRUE to set item @p item as separator or -======= * @param separator @c EINA_TRUE to set item @p item as separator or ->>>>>>> remotes/origin/upstream * @c EINA_FALSE to unset, i.e., item will be used as a regular item. * * Items aren't set as separator by default. @@ -672,11 +560,7 @@ EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Objec * @param shrink_mode Toolbar's items display behavior. * * The toolbar won't scroll if #ELM_TOOLBAR_SHRINK_NONE, -<<<<<<< HEAD - * but will enforce a minimun size so all the items will fit, won't scroll -======= * but will enforce a minimum size so all the items will fit, won't scroll ->>>>>>> remotes/origin/upstream * and won't show the items that don't fit if #ELM_TOOLBAR_SHRINK_HIDE, * will scroll if #ELM_TOOLBAR_SHRINK_SCROLL, and will create a button to * pop up excess elements with #ELM_TOOLBAR_SHRINK_MENU. @@ -862,11 +746,7 @@ EAPI Evas_Object *elm_toolbar_item_menu_get(const Elm_Object_Ite EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *label, Evas_Smart_Cb func, const void *data); /** -<<<<<<< HEAD - * Delete a previoulsy added state to @p item. -======= * Delete a previously added state to @p item. ->>>>>>> remotes/origin/upstream * * @param it The toolbar item. * @param state The state to be deleted. @@ -885,11 +765,7 @@ EAPI Eina_Bool elm_toolbar_item_state_del(Elm_Object_Item *it * * If @p state is @c NULL, it won't select any state and the default item's * icon and label will be used. It's the same behaviour than -<<<<<<< HEAD - * elm_toolbar_item_state_unser(). -======= * elm_toolbar_item_state_unset(). ->>>>>>> remotes/origin/upstream * * @see elm_toolbar_item_state_unset() * @@ -980,8 +856,6 @@ EAPI Eina_Bool elm_toolbar_horizontal_get(const Evas_Object * * @ingroup Toolbar */ EAPI unsigned int elm_toolbar_items_count(const Evas_Object *obj); -<<<<<<< HEAD -======= /** * Set the toolbar select mode. @@ -1020,7 +894,6 @@ elm_toolbar_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode); EAPI Elm_Object_Select_Mode elm_toolbar_select_mode_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * @} */ diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index e11e31d..e5bab97 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -70,10 +70,6 @@ struct _Smart_Data Eina_Bool bounce_x_hold : 1; Eina_Bool bounce_y_hold : 1; Eina_Bool scroll : 1; -<<<<<<< HEAD - Eina_Bool want_reset : 1; -======= ->>>>>>> remotes/origin/upstream } down; struct { @@ -119,10 +115,6 @@ struct _Smart_Data Eina_Bool bounce_animator_disabled :1; Eina_Bool is_mirrored : 1; Eina_Bool wheel_disabled : 1; -<<<<<<< HEAD - Eina_Bool event_propagation :1; -======= ->>>>>>> remotes/origin/upstream }; /* local subsystem functions */ @@ -1303,25 +1295,6 @@ elm_smart_scroller_single_dir_get(Evas_Object *obj) } void -<<<<<<< HEAD -elm_smart_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation) -{ - API_ENTRY return; - sd->event_propagation = propagation; - - evas_object_propagate_events_set(sd->edje_obj, propagation); -} - -Eina_Bool -elm_smart_scroller_propagate_events_get(Evas_Object *obj) -{ - API_ENTRY return EINA_FALSE; - return sd->event_propagation; -} - -void -======= ->>>>>>> remotes/origin/upstream elm_smart_scroller_object_theme_set(Evas_Object *parent, Evas_Object *obj, const char *clas, const char *group, const char *style) { API_ENTRY return; @@ -1801,13 +1774,6 @@ _smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE sd->down.dragged_began = EINA_FALSE; sd->down.hold_parent = EINA_FALSE; sd->down.cancelled = EINA_FALSE; -<<<<<<< HEAD - if(sd->hold || sd->freeze) - sd->down.want_reset = EINA_TRUE; - else - sd->down.want_reset = EINA_FALSE; -======= ->>>>>>> remotes/origin/upstream } } @@ -1857,7 +1823,6 @@ _smart_hold_animator(void *data) fx = sd->down.hold_x; fy = sd->down.hold_y; -<<<<<<< HEAD if ((!sd->hold) && (!sd->freeze) && (_elm_config->scroll_smooth_time_interval > 0.0)) { @@ -1924,84 +1889,6 @@ _smart_hold_animator(void *data) } fx = xsum / dst_index; fy = ysum / dst_index; -======= - if (_elm_config->scroll_smooth_amount > 0.0) - { - int i, count = 0; - Evas_Coord basex = 0, basey = 0, x, y; - double dt, t, tdiff, tnow, twin; - struct { - Evas_Coord x, y, dx, dy; - double t, dt; - } pos[60]; - - tdiff = sd->down.hist.est_timestamp_diff; - tnow = ecore_time_get() - tdiff; - t = tnow; - twin = _elm_config->scroll_smooth_time_window; - for (i = 0; i < 60; i++) - { - // oldest point is sd->down.history[i] - // newset is sd->down.history[0] - dt = t - sd->down.history[i].timestamp; - if (dt > twin) - { - i--; - break; - } - x = sd->down.history[i].x; - y = sd->down.history[i].y; - _down_coord_eval(sd, &x, &y); - if (i == 0) - { - basex = x; - basey = y; - } - pos[i].x = x - basex; - pos[i].y = y - basey; - pos[i].t = - sd->down.history[i].timestamp - sd->down.history[0].timestamp; - count++; - } - count = i; - if (count >= 2) - { - double dtsum = 0.0, tadd, maxdt; - double dxsum = 0.0, dysum = 0.0, xsum = 0.0, ysum = 0.0; - - for (i = 0; i < (count - 1); i++) - { - pos[i].dx = pos[i].x - pos[i + 1].x; - pos[i].dy = pos[i].y - pos[i + 1].y; - pos[i].dt = pos[i].t - pos[i + 1].t; - dxsum += pos[i].dx; - dysum += pos[i].dy; - dtsum += pos[i].dt; - xsum += pos[i].x; - ysum += pos[i].y; - } - maxdt = pos[i].t; - dxsum /= (double)i; - dysum /= (double)i; - dtsum /= (double)i; - xsum /= (double)i; - ysum /= (double)i; - tadd = tnow - sd->down.history[0].timestamp + _elm_config->scroll_smooth_future_time; - tadd = tadd - (maxdt / 2); -#define WEIGHT(n, o, v) n = (((double)o * (1.0 - v)) + ((double)n * v)) - WEIGHT(tadd, sd->down.hist.tadd, _elm_config->scroll_smooth_history_weight); - WEIGHT(dxsum, sd->down.hist.dxsum, _elm_config->scroll_smooth_history_weight); - WEIGHT(dysum, sd->down.hist.dysum, _elm_config->scroll_smooth_history_weight); - fx = basex + xsum + ((dxsum * tadd) / dtsum); - fy = basey + ysum + ((dysum * tadd) / dtsum); - sd->down.hist.tadd = tadd; - sd->down.hist.dxsum = dxsum; - sd->down.hist.dysum = dysum; - WEIGHT(fx, sd->down.hold_x, _elm_config->scroll_smooth_amount); - WEIGHT(fy, sd->down.hold_y, _elm_config->scroll_smooth_amount); - } - // printf("%3.5f %i %i\n", ecore_time_get(), sd->down.hold_y, fy); ->>>>>>> remotes/origin/upstream } elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy); @@ -2043,10 +1930,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev Evas_Event_Mouse_Down *ev; Smart_Data *sd; Evas_Coord x = 0, y = 0, ox = 0, oy = 0; -<<<<<<< HEAD Evas_Coord vw, vh, aw, ah; -======= ->>>>>>> remotes/origin/upstream sd = data; ev = event_info; @@ -2134,7 +2018,6 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev ((sd->down.dy > 0) && (sd->down.pdy > 0)) || ((sd->down.dy < 0) && (sd->down.pdy < 0))) { -<<<<<<< HEAD double t = ecore_loop_time_get(); double dt = t - sd->down.anim_start; @@ -2158,18 +2041,6 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev if (sd->down.dy > 0) sd->down.dy = vh*3; else sd->down.dy = -(vh*3); } -======= - double tt = ecore_loop_time_get(); - double dtt = tt - sd->down.anim_start; - - if (dtt < 0.0) dtt = 0.0; - else if (dtt > _elm_config->thumbscroll_friction) - dtt = _elm_config->thumbscroll_friction; - sd->down.extra_time = _elm_config->thumbscroll_friction - dtt; - } - else - sd->down.extra_time = 0.0; ->>>>>>> remotes/origin/upstream sd->down.pdx = sd->down.dx; sd->down.pdy = sd->down.dy; ox = -sd->down.dx; @@ -2525,15 +2396,6 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void * y = sd->down.sy - (ev->cur.canvas.y - sd->down.y); else y = sd->down.sy; -<<<<<<< HEAD - if(sd->down.want_reset) - { - sd->down.x = ev->cur.canvas.x; - sd->down.y = ev->cur.canvas.y; - sd->down.want_reset = EINA_FALSE; - } -======= ->>>>>>> remotes/origin/upstream if ((sd->down.dir_x) || (sd->down.dir_y)) { if (!sd->down.locked) -- 2.7.4