elm/config: fix thumbscroll config
this was broken a while ago by failing to correctly update all the configs
ref 6409cfa41b
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11294
This commit is contained in:
parent
6a3f10d719
commit
a59956680d
|
@ -1,5 +1,5 @@
|
||||||
group "Elm_Config" struct {
|
group "Elm_Config" struct {
|
||||||
value "config_version" int: 131095;
|
value "config_version" int: 131096;
|
||||||
value "entry_select_allow" uchar: 1;
|
value "entry_select_allow" uchar: 1;
|
||||||
value "engine" string: "";
|
value "engine" string: "";
|
||||||
value "vsync" uchar: 0;
|
value "vsync" uchar: 0;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
group "Elm_Config" struct {
|
group "Elm_Config" struct {
|
||||||
value "config_version" int: 131095;
|
value "config_version" int: 131096;
|
||||||
value "entry_select_allow" uchar: 1;
|
value "entry_select_allow" uchar: 1;
|
||||||
value "engine" string: "";
|
value "engine" string: "";
|
||||||
value "vsync" uchar: 0;
|
value "vsync" uchar: 0;
|
||||||
|
@ -9,6 +9,9 @@ group "Elm_Config" struct {
|
||||||
value "thumbscroll_momentum_threshold" double: 100.0;
|
value "thumbscroll_momentum_threshold" double: 100.0;
|
||||||
value "thumbscroll_flick_distance_tolerance" int: 3000;
|
value "thumbscroll_flick_distance_tolerance" int: 3000;
|
||||||
value "thumbscroll_friction" double: 0.95;
|
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_min_limit" double: 0.3;
|
||||||
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
|
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
|
||||||
// will not be used
|
// will not be used
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
group "Elm_Config" struct {
|
group "Elm_Config" struct {
|
||||||
value "config_version" int: 131095;
|
value "config_version" int: 131096;
|
||||||
value "entry_select_allow" uchar: 1;
|
value "entry_select_allow" uchar: 1;
|
||||||
value "engine" string: "";
|
value "engine" string: "";
|
||||||
value "vsync" uchar: 0;
|
value "vsync" uchar: 0;
|
||||||
|
@ -9,6 +9,9 @@ group "Elm_Config" struct {
|
||||||
value "thumbscroll_momentum_threshold" double: 100.0;
|
value "thumbscroll_momentum_threshold" double: 100.0;
|
||||||
value "thumbscroll_flick_distance_tolerance" int: 1000;
|
value "thumbscroll_flick_distance_tolerance" int: 1000;
|
||||||
value "thumbscroll_friction" double: 1.0;
|
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_min_limit" double: 0.3;
|
||||||
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
|
value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
|
||||||
// will not be used
|
// will not be used
|
||||||
|
|
|
@ -2481,6 +2481,13 @@ _config_update(void)
|
||||||
_config_free(tcfg);
|
_config_free(tcfg);
|
||||||
tcfg = _config_system_load();
|
tcfg = _config_system_load();
|
||||||
IFCFGEND
|
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.
|
* Fix user config for current ELM_CONFIG_EPOCH here.
|
||||||
**/
|
**/
|
||||||
|
|
|
@ -271,7 +271,7 @@ struct _Efl_Ui_Theme_Data
|
||||||
* the users config doesn't need to be wiped - simply new values need
|
* the users config doesn't need to be wiped - simply new values need
|
||||||
* to be put in
|
* 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_EPOCH_OFFSET 16
|
||||||
# define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
|
# define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << ELM_CONFIG_VERSION_EPOCH_OFFSET) | \
|
||||||
ELM_CONFIG_FILE_GENERATION)
|
ELM_CONFIG_FILE_GENERATION)
|
||||||
|
|
Loading…
Reference in New Issue