From 7d29bb4cb2fe4bc59756e0fa61d99aeff257f251 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 5 May 2009 04:58:25 +0000 Subject: [PATCH] fix horizontal scroll in auto-scroll select mode SVN revision: 40506 --- legacy/elementary/src/bin/test.c | 4 ++-- legacy/elementary/src/lib/els_scroller.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 6c94677cac..e92946fc5e 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -2095,6 +2095,7 @@ my_bt_29(void *data, Evas_Object *obj, void *event_info) evas_object_show(bg); gl = elm_genlist_add(win); + elm_genlist_horizontal_mode_set(gl, ELM_LIST_LIMIT); elm_win_resize_object_add(win, gl); evas_object_size_hint_weight_set(gl, 1.0, 1.0); evas_object_show(gl); @@ -3150,7 +3151,7 @@ my_bt_37(void *data, Evas_Object *obj, void *event_info) Evas_Object *win, *bg, *gl, *bx, *bx2, *bt; static Testitem tit[3]; int i; - + win = elm_win_add(NULL, "genlist-5", ELM_WIN_BASIC); elm_win_title_set(win, "Genlist 5"); elm_win_autodel_set(win, 1); @@ -3170,7 +3171,6 @@ my_bt_37(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_align_set(gl, -1.0, -1.0); evas_object_size_hint_weight_set(gl, 1.0, 1.0); evas_object_show(gl); - itc5.item_style = "double_label"; itc5.func.label_get = gl5_label_get; itc5.func.icon_get = gl5_icon_get; diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index fd4ff5503f..8a00f9a99f 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -648,8 +648,8 @@ _smart_onhold_animator(void *data) if (sd->down.onhold_tlast > 0.0) { td = t - sd->down.onhold_tlast; - vx = sd->down.onhold_vx * td * _elm_config->thumbscroll_threshhold * 2.0; - vy = sd->down.onhold_vy * td * _elm_config->thumbscroll_threshhold * 2.0; + vx = sd->down.onhold_vx * td * (double)_elm_config->thumbscroll_threshhold * 2.0; + vy = sd->down.onhold_vy * td * (double)_elm_config->thumbscroll_threshhold * 2.0; elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy); sd->down.onhold_vxe += vx; sd->down.onhold_vye += vy; @@ -744,7 +744,7 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) double vx = 0.0, vy = 0.0; evas_object_geometry_get(sd->event_obj, &ex, &ey, &ew, &eh); - x = ev->cur.canvas.y - ex; + x = ev->cur.canvas.x - ex; y = ev->cur.canvas.y - ey; if (x < _elm_config->thumbscroll_threshhold) {