enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

aaargh. thumbscroll border friction not quite right.. 0 is valid. :) 

also... 0 are valid values of these config vars when getting props



SVN revision: 60072
This commit is contained in:
Carsten Haitzler 2011-06-08 06:54:02 +00:00
parent 1108d0a1bb
commit 59c203323a
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/elementary/src/lib/elm_config.c
View File

@ -437,9 +437,8 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &val, 1) > 0)
{ {
if (val > 0) _elm_config->thumbscroll_momentum_threshold =
_elm_config->thumbscroll_momentum_threshold = (double)val / 1000.0;
(double)val / 1000.0;
} }
} }
else if (event->atom == _atom[ATOM_E_THUMBSCROLL_FRICTION]) else if (event->atom == _atom[ATOM_E_THUMBSCROLL_FRICTION])
@ -450,8 +449,7 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &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]) else if (event->atom == _atom[ATOM_E_THUMBSCROLL_BORDER_FRICTION])
@ -462,9 +460,8 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &val, 1) > 0)
{ {
if (val > 0) _elm_config->thumbscroll_border_friction =
_elm_config->thumbscroll_border_friction = (double)val / 1000.0;
(double)val / 1000.0;
} }
} }
else if (event->atom == _atom[ATOM_E_THUMBSCROLL_PAGE_SCROLL_FRICTION]) else if (event->atom == _atom[ATOM_E_THUMBSCROLL_PAGE_SCROLL_FRICTION])
@ -475,9 +472,8 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &val, 1) > 0)
{ {
if (val > 0) _elm_config->page_scroll_friction =
_elm_config->page_scroll_friction = (double)val / 1000.0;
(double)val / 1000.0;
} }
} }
else if (event->atom == else if (event->atom ==
@ -489,9 +485,8 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &val, 1) > 0)
{ {
if (val > 0) _elm_config->bring_in_scroll_friction =
_elm_config->bring_in_scroll_friction = (double)val / 1000.0;
(double)val / 1000.0;
} }
} }
else if (event->atom == else if (event->atom ==
@ -503,8 +498,7 @@ _prop_change(void *data __UNUSED__,
event->atom, event->atom,
&val, 1) > 0) &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)) || else if (((_atom_config > 0) && (event->atom == _atom_config)) ||

1
legacy/elementary/src/lib/els_scroller.c
View File

@ -2099,7 +2099,6 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
else x = sd->down.locked_x; else x = sd->down.locked_x;
} }
} }
if (_elm_config->thumbscroll_border_friction > 0.0)
{ {
Evas_Coord minx, miny; Evas_Coord minx, miny;
sd->pan_func.min_get(sd->pan_obj, &minx, &miny); sd->pan_func.min_get(sd->pan_obj, &minx, &miny);