From bba3921562746c7ebb72b5629dee9a99612ea426 Mon Sep 17 00:00:00 2001 From: Prince Kumar Dubey Date: Mon, 19 Jul 2010 11:41:53 +0530 Subject: [PATCH] [ScrollBar] APIs removed. --- src/lib/Elementary.h.in | 5 +-- src/lib/elm_genlist.c | 114 +++++++++++++++++++----------------------------- src/lib/elm_list.c | 21 --------- src/lib/elm_scroller.c | 42 +++++------------- src/lib/els_scroller.c | 9 ---- src/lib/els_scroller.h | 1 - 6 files changed, 60 insertions(+), 132 deletions(-) mode change 100644 => 100755 src/lib/Elementary.h.in mode change 100644 => 100755 src/lib/elm_genlist.c mode change 100644 => 100755 src/lib/elm_list.c mode change 100644 => 100755 src/lib/elm_scroller.c mode change 100644 => 100755 src/lib/els_scroller.c mode change 100644 => 100755 src/lib/els_scroller.h diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in old mode 100644 new mode 100755 index 40df8dc..4012912 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -517,7 +517,7 @@ extern "C" { EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize); EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); EAPI void elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set); - EAPI void elm_scroller_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set); + /* smart callbacks called: * "edge,left" * "edge,right" @@ -1065,7 +1065,7 @@ extern "C" { EAPI void elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); EAPI void elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v); EAPI void elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v); - EAPI void elm_list_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set); + /* smart callbacks called: * "clicked" - when the user double-clicked an item * "selected" - when the user selected an item @@ -1217,7 +1217,6 @@ extern "C" { EAPI void elm_genlist_block_count_set(Evas_Object *obj, int n); EAPI void elm_genlist_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v); EAPI void elm_genlist_set_edit_mode(Evas_Object *obj, int emode, Elm_Genlist_Edit_Class *ec); - EAPI void elm_genlist_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set); EAPI Evas_Object *elm_check_add(Evas_Object *parent); EAPI void elm_check_label_set(Evas_Object *obj, const char *label); diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c old mode 100644 new mode 100755 index 5d6d661..9af4880 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -322,7 +322,7 @@ struct _Elm_Genlist_Item Elm_Genlist_Item *parent; Elm_Genlist_Item_Flags flags; Elm_Genlist_GroupItem *group_item; - struct + struct { Evas_Smart_Cb func; const void *data; @@ -442,7 +442,7 @@ _theme_hook(Evas_Object *obj) { Eina_List *l; Elm_Genlist_Item *it; - + if (itb->realized) _item_block_unrealize(itb); EINA_LIST_FOREACH(itb->items, l, it) it->mincalcd = EINA_FALSE; @@ -479,7 +479,7 @@ _sizing_eval(Evas_Object *obj) else { Evas_Coord vmw, vmh, vw, vh; - + minw = wd->minw; maxw = -1; elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); @@ -568,7 +568,7 @@ _item_block_del(Elm_Genlist_Item *it) itbn->count++; itbn->changed = EINA_TRUE; } - it->wd->blocks = + it->wd->blocks = eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb)); free(itb); } @@ -584,7 +584,7 @@ _item_del(Elm_Genlist_Item *it) if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it); if (it->realized) _item_unrealize(it); if (it->block) _item_block_del(it); - if ((!it->delete_me) && (it->itc->func.del)) + if ((!it->delete_me) && (it->itc->func.del)) it->itc->func.del(it->data, it->wd->obj); it->delete_me = EINA_TRUE; if (it->queued) @@ -670,7 +670,7 @@ _slide_item(Elm_Genlist_Item *it, bool slide_to_left) EINA_LIST_FOREACH(it->wd->menuopened, l, it2) { - if (it2 != it) + if (it2 != it) { it2->menuopened = 0; edje_object_signal_emit(it2->base, "elm,state,slide,right", "elm"); @@ -684,7 +684,7 @@ _slide_item(Elm_Genlist_Item *it, bool slide_to_left) edje_object_signal_emit(it->base, "elm,state,slide,right", "elm"); it->wd->menuopened = eina_list_remove(it->wd->menuopened, it); } - + it->menuopened = slide_to_left; } @@ -727,13 +727,13 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf if (it->wd->multi_down) { - acc_x = ev->prev.canvas.x - ev->cur.canvas.x; + acc_x = ev->prev.canvas.x - ev->cur.canvas.x; if (acc_x < 0) it->wd->acc_x1 = it->wd->acc_x1 - acc_x; else it->wd->acc_x1 = it->wd->acc_x1 + acc_x; - acc_y = ev->prev.canvas.y - ev->cur.canvas.y; + acc_y = ev->prev.canvas.y - ev->cur.canvas.y; if (acc_y < 0) it->wd->acc_y1 = it->wd->acc_y1 - acc_y; else @@ -741,7 +741,7 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf return; } - + if (!it->display_only) elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_geometry_get(obj, &x, &y, NULL, NULL); @@ -789,7 +789,7 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf else { if (ady > adx) - evas_object_smart_callback_call(it->wd->obj, + evas_object_smart_callback_call(it->wd->obj, "drag,start,down", it); else { @@ -844,7 +844,7 @@ _multi_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf if (adx < 60 && ady < 60) return; - + it->wd->multi_down = 1; it->wd->td2_x = ev->canvas.x; it->wd->td2_y = ev->canvas.y; @@ -923,7 +923,7 @@ _multi_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info) } } } - + it->wd->acc_x1 = 0; it->wd->acc_y1 = 0; it->wd->acc_x2 = 0; @@ -946,14 +946,14 @@ _multi_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf it->wd->prev_multi_y = ev->cur.canvas.y; return; } - - acc_x = it->wd->prev_multi_x - ev->cur.canvas.x; + + acc_x = it->wd->prev_multi_x - ev->cur.canvas.x; if (acc_x < 0) it->wd->acc_x2 = it->wd->acc_x2 - acc_x; else it->wd->acc_x2 = it->wd->acc_x2 + acc_x; - acc_y = it->wd->prev_multi_y - ev->cur.canvas.y; + acc_y = it->wd->prev_multi_y - ev->cur.canvas.y; if (acc_y < 0) it->wd->acc_y2 = it->wd->acc_y2 - acc_y; else @@ -979,7 +979,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf it->dx = ev->canvas.x - x; it->dy = ev->canvas.y - y; it->wd->td1_x = ev->canvas.x; - it->wd->td1_y = ev->canvas.y; + it->wd->td1_y = ev->canvas.y; it->wd->longpressed = EINA_FALSE; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE; else it->wd->on_hold = EINA_FALSE; @@ -1006,7 +1006,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void * it->down = 0; it->wd->acc_x1 = 0; it->wd->acc_y1 = 0; - + it->wd->tu1_x = ev->canvas.x; it->wd->tu1_y = ev->canvas.y; it->wd->d1_x = ev->canvas.x - it->wd->td1_x; @@ -1352,7 +1352,7 @@ _item_realize(Elm_Genlist_Item *it, int in, int calc) if (in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf)); strncat(buf, "/", sizeof(buf) - strlen(buf)); strncat(buf, it->itc->item_style, sizeof(buf) - strlen(buf)); - + _elm_theme_object_set(it->wd->obj, it->base, "genlist", buf, elm_widget_style_get(it->wd->obj)); it->spacer = evas_object_rectangle_add(evas_object_evas_get(it->wd->obj)); evas_object_color_set(it->spacer, 0, 0, 0, 0); @@ -1465,7 +1465,7 @@ _item_realize(Elm_Genlist_Item *it, int in, int calc) if (!it->mincalcd) { Evas_Coord mw = -1, mh = -1; - + if (!it->display_only) elm_coords_finger_size_adjust(1, &mw, 1, &mh); edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh); @@ -1515,7 +1515,7 @@ _item_unrealize(Elm_Genlist_Item *it) it->icons = NULL; _elm_stringlist_free(it->states); - EINA_LIST_FREE(it->icon_objs, icon) + EINA_LIST_FREE(it->icon_objs, icon) evas_object_del(icon); it->states = NULL; @@ -1669,7 +1669,7 @@ _remove_item_cb(void *data, Evas_Object *obj, const char *emission, const char * Elm_Genlist_Item *it = data; if(_edit_mode_reset( it->wd )) return; - + if( it->wd->ed->del_confirm_state ) { it->wd->ed->del_confirm_state = 0; @@ -1706,7 +1706,7 @@ _insert_new_item_cb(void *data, Evas_Object *obj, const char *emission, const ch static Eina_Bool _edit_mode_reset(Widget_Data *wd) -{ +{ /* if(wd->ed->del_confirm_state) { @@ -2018,7 +2018,7 @@ _item_block_position(Item_Block *itb, int in) _item_realize(it, in, 0); if (!was_realized) - evas_object_smart_callback_call(it->wd->obj, + evas_object_smart_callback_call(it->wd->obj, "realized", it); } } @@ -2226,7 +2226,7 @@ _update_job(void *data) { _item_unrealize(it); _item_realize(it, num, 0); - evas_object_smart_callback_call(it->wd->obj, + evas_object_smart_callback_call(it->wd->obj, "realized", it); } else @@ -2553,7 +2553,7 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb->wd = wd; if (!it->rel->block) { - wd->blocks = + wd->blocks = eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb)); itb->items = eina_list_append(itb->items, it); } @@ -2561,20 +2561,20 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) { if (it->before) { - wd->blocks = - eina_inlist_prepend_relative(wd->blocks, - EINA_INLIST_GET(itb), + wd->blocks = + eina_inlist_prepend_relative(wd->blocks, + EINA_INLIST_GET(itb), EINA_INLIST_GET(it->rel->block)); - itb->items = + itb->items = eina_list_prepend_relative(itb->items, it, it->rel); } else { - wd->blocks = - eina_inlist_append_relative(wd->blocks, - EINA_INLIST_GET(itb), + wd->blocks = + eina_inlist_append_relative(wd->blocks, + EINA_INLIST_GET(itb), EINA_INLIST_GET(it->rel->block)); - itb->items = + itb->items = eina_list_append_relative(itb->items, it, it->rel); } } @@ -2591,8 +2591,8 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb = calloc(1, sizeof(Item_Block)); if (!itb) return; itb->wd = wd; - wd->blocks = - eina_inlist_prepend(wd->blocks, + wd->blocks = + eina_inlist_prepend(wd->blocks, EINA_INLIST_GET(itb)); } } @@ -2601,7 +2601,7 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb = calloc(1, sizeof(Item_Block)); if (!itb) return; itb->wd = wd; - wd->blocks = + wd->blocks = eina_inlist_prepend(wd->blocks, EINA_INLIST_GET(itb)); } itb->items = eina_list_prepend(itb->items, it); @@ -2616,8 +2616,8 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb = calloc(1, sizeof(Item_Block)); if (!itb) return; itb->wd = wd; - wd->blocks = - eina_inlist_append(wd->blocks, + wd->blocks = + eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb)); } } @@ -2626,7 +2626,7 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb = calloc(1, sizeof(Item_Block)); if (!itb) return; itb->wd = wd; - wd->blocks = + wd->blocks = eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb)); } itb->items = eina_list_append(itb->items, it); @@ -2664,8 +2664,8 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it) itb2 = calloc(1, sizeof(Item_Block)); if (!itb2) return; itb2->wd = wd; - wd->blocks = - eina_inlist_append_relative(wd->blocks, EINA_INLIST_GET(itb2), + wd->blocks = + eina_inlist_append_relative(wd->blocks, EINA_INLIST_GET(itb2), EINA_INLIST_GET(itb)); itb2->changed = EINA_TRUE; while ((itb->count > newc) && (itb->items)) @@ -3037,7 +3037,7 @@ elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *i if (!wd) return NULL; if (!it) return NULL; if (!it->parent) - wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it), + wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(before)); else { @@ -3079,7 +3079,7 @@ elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *it if (!wd) return NULL; if (!it) return NULL; if (!it->parent) - wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it), + wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(after)); else { @@ -3301,7 +3301,7 @@ elm_genlist_realized_items_get(const Evas_Object *obj) { Eina_List *l; Elm_Genlist_Item *it; - + done = 1; EINA_LIST_FOREACH(itb->items, l, it) { @@ -4215,7 +4215,7 @@ elm_genlist_compress_mode_get(const Evas_Object *obj) /** * Set bounce mode * - * This will enable or disable the scroller bounce mode for the genlist. See + * This will enable or disable the scroller bounce mode for the genlist. See * elm_scroller_bounce_set() for details * * @param obj The genlist object @@ -4410,25 +4410,3 @@ elm_genlist_set_edit_mode(Evas_Object *obj, int emode, Elm_Genlist_Edit_Class *e if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); } - -/** - * Set Scrollbar Handler mode - * - * This will activate the scrollbar handler mode for the genlist. - * - * @param obj The genlist object - * @param set if EINA_TRUE, activate handler. - * - * @ingroup Genlist - */ - -EAPI void -elm_genlist_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if(!set) return; - - elm_smart_scroller_handler_set(wd->scr); -} diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c old mode 100644 new mode 100755 index bfa2803..dde8f4f --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -1497,24 +1497,3 @@ elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy if (wd->scr) elm_scroller_policy_get(wd->scr, policy_h, policy_v); } - -/** - * Set Scrollbar Handler mode - * - * This will activate the scrollbar handler mode for the list. - * - * @param obj The list object - * @param set if EINA_TRUE, activate handler. - * - * @ingroup Genlist - */ -EAPI void -elm_list_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if(!set) return; - - elm_scroller_scrollbar_handler_set(wd->scr, set); -} diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c old mode 100644 new mode 100755 index e63599b..fb03f72 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -76,7 +76,7 @@ static const Evas_Smart_Cb_Description _signals[] = { static void _del_hook(Evas_Object *obj) { - + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; free(wd); @@ -89,7 +89,7 @@ _theme_hook(Evas_Object *obj) if (!wd) return; if (wd->scr) { - elm_smart_scroller_object_theme_set(obj, wd->scr, + elm_smart_scroller_object_theme_set(obj, wd->scr, wd->widget_name, wd->widget_base, elm_widget_style_get(obj)); // edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale); @@ -100,7 +100,7 @@ _theme_hook(Evas_Object *obj) static void _show_region_hook(void *data, Evas_Object *obj) { - + Widget_Data *wd = elm_widget_data_get(data); Evas_Coord x, y, w, h; if (!wd) return; @@ -112,7 +112,7 @@ _show_region_hook(void *data, Evas_Object *obj) static void _sizing_eval(Evas_Object *obj) { - + Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord vw, vh, minw, minh, maxw, maxh, w, h, vmw, vmh; double xw, yw; @@ -155,7 +155,7 @@ _changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, static void _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) { - + Widget_Data *wd = elm_widget_data_get(obj); Evas_Object *sub = event_info; @@ -175,7 +175,7 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) static void _hold_on(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -186,7 +186,7 @@ _hold_on(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) static void _hold_off(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -197,7 +197,7 @@ _hold_off(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) static void _freeze_on(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -208,7 +208,7 @@ _freeze_on(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) static void _freeze_off(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - + Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -304,10 +304,10 @@ elm_scroller_add(Evas_Object *parent) wd->widget_name = eina_stringshare_add("scroller"); wd->widget_base = eina_stringshare_add("base"); - + wd->scr = elm_smart_scroller_add(e); elm_smart_scroller_widget_set(wd->scr, obj); - elm_smart_scroller_object_theme_set(obj, wd->scr, + elm_smart_scroller_object_theme_set(obj, wd->scr, wd->widget_name, wd->widget_base, elm_widget_style_get(obj)); elm_widget_resize_object_set(obj, wd->scr); @@ -376,7 +376,7 @@ elm_scroller_content_set(Evas_Object *obj, Evas_Object *content) /** * Set custom theme elements for the scroller - * + * * @param obj The scroller object * @param widget The widget name to use (default is "scroller") * @param base The base name to use (default is "base") @@ -669,21 +669,3 @@ elm_scroller_page_move_set(Evas_Object *obj, Eina_Bool set) elm_smart_scroller_page_move_set(wd->scr, set); } - -/** - * Set scrollbar handler - * - * @param obj The scroller object - * @param set Flag - * - * @ingroup Scroller - */ -EAPI void -elm_scroller_scrollbar_handler_set(Evas_Object *obj, Eina_Bool set) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - if(!set) return; - elm_smart_scroller_handler_set(wd->scr); -} diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c old mode 100644 new mode 100755 index 1ba998e..df6d06b --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -1161,15 +1161,6 @@ elm_smart_scroller_widget_set(Evas_Object *obj, Evas_Object *wid) sd->widget = wid; } -EAPI void -elm_smart_scroller_handler_set(Evas_Object *obj) -{ - API_ENTRY return; - - elm_smart_scroller_policy_set(obj, ELM_SMART_SCROLLER_POLICY_OFF, ELM_SMART_SCROLLER_POLICY_AUTO); - edje_object_signal_emit(sd->edje_obj, "elm,activate,handler", "elm"); -} - /* local subsystem functions */ static void _smart_edje_drag_v_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) diff --git a/src/lib/els_scroller.h b/src/lib/els_scroller.h old mode 100644 new mode 100755 index 714a208..4a750b3 --- a/src/lib/els_scroller.h +++ b/src/lib/els_scroller.h @@ -32,4 +32,3 @@ void elm_smart_scroller_paging_set (Evas_Object *obj, double pagere void elm_smart_scroller_region_bring_in (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); void elm_smart_scroller_widget_set (Evas_Object *obj, Evas_Object *wid); void elm_smart_scroller_page_move_set (Evas_Object *obj, Eina_Bool set); -void elm_smart_scroller_handler_set (Evas_Object *obj); -- 2.7.4