and another config value

SVN revision: 42668

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 2da1879..0281a0d 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -505,6 +505,7 @@ elm_quicklaunch_init(int argc, char **argv)
    _elm_config->thumbscroll_bounce_friction = 0.5;
    _elm_config->thumbscroll_bounce_enable = 1;
    _elm_config->page_scroll_friction = 0.5;
+   _elm_config->bring_in_scroll_friction = 0.5;
    _elm_config->zoom_friction = 0.5;
    _elm_config->scale = 1.0;
    _elm_config->font_hinting = 2;
@@ -564,6 +565,8 @@ elm_quicklaunch_init(int argc, char **argv)
    if (s) _elm_config->thumbscroll_friction = atof(s);
    s = getenv("ELM_PAGE_SCROLL_FRICTION");
    if (s) _elm_config->page_scroll_friction = atof(s);
+   s = getenv("ELM_BRING_IN_SCROLL_FRICTION");
+   if (s) _elm_config->bring_in_scroll_friction = atof(s);
    s = getenv("ELM_ZOOM_FRICTION");
    if (s) _elm_config->zoom_friction = atof(s);
 

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 3f9b73e..d9fffcb 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -44,6 +44,7 @@ struct _Elm_Config
    double thumbscroll_friction;
    double thumbscroll_bounce_friction;
    double page_scroll_friction;
+   double bring_in_scroll_friction;
    double zoom_friction;
    int thumbscroll_bounce_enable;
    double scale;

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index f910fee..4ae3f60 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1034,11 +1034,11 @@ elm_smart_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
    x = nx;
    if (x < 0) x = 0;
    else if ((x + w) > cw) x = cw - w;
-   _smart_scrollto_x(sd, _elm_config->page_scroll_friction, x);
+   _smart_scrollto_x(sd, _elm_config->bring_in_scroll_friction, x);
    y = ny;
    if (y < 0) y = 0;
    else if ((y + h) > ch) y = ch - h;
-   _smart_scrollto_y(sd, _elm_config->page_scroll_friction, y);
+   _smart_scrollto_y(sd, _elm_config->bring_in_scroll_friction, y);
 }
 
 /* local subsystem functions */