From 5a653411b41c7600fe48b90f646259f0b7774387 Mon Sep 17 00:00:00 2001 From: raster Date: Wed, 8 Jun 2011 06:54:02 +0000 Subject: [PATCH] aaargh. thumbscroll border friction not quite right.. 0 is valid. :) also... 0 are valid values of these config vars when getting props git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60072 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_config.c | 26 ++++++++++---------------- src/lib/els_scroller.c | 1 - 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 13f722c..3dad016 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -437,9 +437,8 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->thumbscroll_momentum_threshold = - (double)val / 1000.0; + _elm_config->thumbscroll_momentum_threshold = + (double)val / 1000.0; } } else if (event->atom == _atom[ATOM_E_THUMBSCROLL_FRICTION]) @@ -450,8 +449,7 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->thumbscroll_friction = (double)val / 1000.0; + _elm_config->thumbscroll_friction = (double)val / 1000.0; } } else if (event->atom == _atom[ATOM_E_THUMBSCROLL_BORDER_FRICTION]) @@ -462,9 +460,8 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->thumbscroll_border_friction = - (double)val / 1000.0; + _elm_config->thumbscroll_border_friction = + (double)val / 1000.0; } } else if (event->atom == _atom[ATOM_E_THUMBSCROLL_PAGE_SCROLL_FRICTION]) @@ -475,9 +472,8 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->page_scroll_friction = - (double)val / 1000.0; + _elm_config->page_scroll_friction = + (double)val / 1000.0; } } else if (event->atom == @@ -489,9 +485,8 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->bring_in_scroll_friction = - (double)val / 1000.0; + _elm_config->bring_in_scroll_friction = + (double)val / 1000.0; } } else if (event->atom == @@ -503,8 +498,7 @@ _prop_change(void *data __UNUSED__, event->atom, &val, 1) > 0) { - if (val > 0) - _elm_config->zoom_friction = (double)val / 1000.0; + _elm_config->zoom_friction = (double)val / 1000.0; } } else if (((_atom_config > 0) && (event->atom == _atom_config)) || diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index 5b4441d..3c3ee29 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -2099,7 +2099,6 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void * else x = sd->down.locked_x; } } - if (_elm_config->thumbscroll_border_friction > 0.0) { Evas_Coord minx, miny; sd->pan_func.min_get(sd->pan_obj, &minx, &miny); -- 2.7.4