From 1b7241944d0919c0f46efb368ebc286bf1ad92b6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 22 Nov 2009 06:25:10 +0000 Subject: [PATCH] fix some freeze issues with scroller. SVN revision: 43887 --- legacy/elementary/src/bin/test_genlist.c | 1 - legacy/elementary/src/lib/elm_entry.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index 32d256f64c..6e52246d1b 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -894,7 +894,6 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info) NULL/* func data */); elm_box_pack_end(bx, gl); - elm_object_scroll_freeze_push(gl); evas_object_show(bx2); evas_object_smart_callback_add(gl, "drag,start,up", item_drag_up, NULL); diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 7ced86f9ec..ca0c5e0f9e 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -345,6 +345,7 @@ _long_press(void *data) const Elm_Entry_Context_Menu_Item *it; if (wd->hoversel) evas_object_del(wd->hoversel); + else elm_widget_scroll_freeze_push(data); wd->hoversel = elm_hoversel_add(data); elm_object_style_set(wd->hoversel, "entry"); elm_widget_sub_object_add(data, wd->hoversel); @@ -397,7 +398,6 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) if (ev->button != 1) return; // if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer); - elm_widget_scroll_freeze_push(data); wd->longpress_timer = ecore_timer_add(1.0, _long_press, data); wd->downx = ev->canvas.x; wd->downy = ev->canvas.y; @@ -412,7 +412,6 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info) if (ev->button != 1) return; if (wd->longpress_timer) { - elm_widget_scroll_freeze_pop(data); ecore_timer_del(wd->longpress_timer); wd->longpress_timer = NULL; } @@ -430,7 +429,6 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info) { if (wd->longpress_timer) { - elm_widget_scroll_freeze_pop(data); ecore_timer_del(wd->longpress_timer); wd->longpress_timer = NULL; } @@ -447,7 +445,6 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info) ((_elm_config->finger_size / 2) * (_elm_config->finger_size / 2))) { - elm_widget_scroll_freeze_pop(data); ecore_timer_del(wd->longpress_timer); wd->longpress_timer = NULL; } @@ -465,7 +462,6 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info) ((_elm_config->finger_size / 2) * (_elm_config->finger_size / 2))) { - elm_widget_scroll_freeze_pop(data); ecore_timer_del(wd->longpress_timer); wd->longpress_timer = NULL; }