bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a59956680d9b71a7ab40efdaa5d5082141c26dba
commit a59956680d9b71a7ab40efdaa5d5082141c26dba
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Wed Feb 5 12:22:20 2020 -0500
elm/config: fix thumbscroll config
this was broken a while ago by failing to correctly update all the configs
ref 6409cfa41b19f04ef7b4247d078d626e9ec77a8f
Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11294
---
data/elementary/config/default/base.src.in | 2 +-
data/elementary/config/mobile/base.src.in | 5 ++++-
data/elementary/config/standard/base.src.in | 5 ++++-
src/lib/elementary/elm_config.c | 7 +++++++
src/lib/elementary/elm_priv.h | 2 +-
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/data/elementary/config/default/base.src.in
b/data/elementary/config/default/base.src.in
index d45a704b5a..9a12e52bcb 100644
--- a/data/elementary/config/default/base.src.in
+++ b/data/elementary/config/default/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131095;
+ value "config_version" int: 131096;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
diff --git a/data/elementary/config/mobile/base.src.in
b/data/elementary/config/mobile/base.src.in
index 0883545e21..5c9ba5a333 100644
--- a/data/elementary/config/mobile/base.src.in
+++ b/data/elementary/config/mobile/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131095;
+ value "config_version" int: 131096;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
@@ -9,6 +9,9 @@ group "Elm_Config" struct {
value "thumbscroll_momentum_threshold" double: 100.0;
value "thumbscroll_flick_distance_tolerance" int: 3000;
value "thumbscroll_friction" double: 0.95;
+ value "thumbscroll_momentum_distance_max" int: 3000;
+ value "thumbscroll_momentum_friction" double: 0.95;
+
value "thumbscroll_momentum_animation_duration_min_limit" double: 0.3;
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
// will not be used
diff --git a/data/elementary/config/standard/base.src.in
b/data/elementary/config/standard/base.src.in
index 391eb5baf3..2e868cd9e1 100644
--- a/data/elementary/config/standard/base.src.in
+++ b/data/elementary/config/standard/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131095;
+ value "config_version" int: 131096;
value "entry_select_allow" uchar: 1;
value "engine" string: "";
value "vsync" uchar: 0;
@@ -9,6 +9,9 @@ group "Elm_Config" struct {
value "thumbscroll_momentum_threshold" double: 100.0;
value "thumbscroll_flick_distance_tolerance" int: 1000;
value "thumbscroll_friction" double: 1.0;
+ value "thumbscroll_momentum_distance_max" int: 3000;
+ value "thumbscroll_momentum_friction" double: 0.95;
+
value "thumbscroll_momentum_animation_duration_min_limit" double: 0.3;
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
// will not be used
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index ae047cfb0d..9903538253 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -2481,6 +2481,13 @@ _config_update(void)
_config_free(tcfg);
tcfg = _config_system_load();
IFCFGEND
+
+ IFCFG(0x0018)
+ if (!_elm_config->priv.thumbscroll_momentum_distance_max)
+ COPYVAL(thumbscroll_momentum_distance_max);
+ if (!_elm_config->priv.thumbscroll_momentum_friction)
+ COPYVAL(thumbscroll_momentum_friction);
+ IFCFGEND
/**
* Fix user config for current ELM_CONFIG_EPOCH here.
**/
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 89878716f3..90b90fc40d 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -271,7 +271,7 @@ struct _Efl_Ui_Theme_Data
* the users config doesn't need to be wiped - simply new values need
* to be put in
*/
-# define ELM_CONFIG_FILE_GENERATION 0x0017
+# define ELM_CONFIG_FILE_GENERATION 0x0018
# define ELM_CONFIG_VERSION_EPOCH_OFFSET 16
# define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH <<
ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
ELM_CONFIG_FILE_GENERATION)
--
