summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-18 18:33:11 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-19 17:32:47 +0900
commita04d8a929a119cc46a0fa1553cf3e6d9148eca9b (patch)
tree22abcd5d75741bb00d91f14b5b917871ab2a7ce3 /src/lib/elementary
parent56e9f582b6850644851be8222711250abce5991c (diff)
elm config - track which vars you set locally and keep them as-is
this now flags about 1/4 of the config vars in elm config if you set them locally so they wont change on conifg reload. i have just started and this is the first batch. needs more work.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_config.c104
-rw-r--r--src/lib/elementary/elm_priv.h39
2 files changed, 128 insertions, 15 deletions
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 9f6df2b6f8..89e365312e 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1821,6 +1821,60 @@ _config_load(void)
1821} 1821}
1822 1822
1823static void 1823static void
1824_elm_config_reload_do(void)
1825{
1826 Elm_Config *prev_config;
1827
1828 prev_config = _elm_config;
1829 _elm_config = NULL;
1830 _config_load();
1831 if (prev_config)
1832 {
1833#define KEEP_VAL(xxx) \
1834 if (prev_config->priv.xxx) { \
1835 _elm_config->xxx = prev_config->xxx; \
1836 }
1837#define KEEP_STR(xxx) \
1838 if (prev_config->priv.xxx) { \
1839 eina_stringshare_replace(&(_elm_config->xxx), prev_config->xxx); \
1840 }
1841 KEEP_STR(engine);
1842 KEEP_STR(accel);
1843 KEEP_STR(web_backend);
1844 KEEP_VAL(accel_override);
1845 KEEP_VAL(vsync);
1846 KEEP_VAL(thumbscroll_enable);
1847 KEEP_VAL(thumbscroll_threshold);
1848 KEEP_VAL(thumbscroll_hold_threshold);
1849 KEEP_VAL(thumbscroll_momentum_threshold);
1850 KEEP_VAL(thumbscroll_flick_distance_tolerance);
1851 KEEP_VAL(thumbscroll_friction);
1852 KEEP_VAL(thumbscroll_min_friction);
1853 KEEP_VAL(thumbscroll_friction_standard);
1854 KEEP_VAL(thumbscroll_bounce_friction);
1855 KEEP_VAL(thumbscroll_acceleration_threshold);
1856 KEEP_VAL(thumbscroll_acceleration_time_limit);
1857 KEEP_VAL(thumbscroll_acceleration_weight);
1858 KEEP_VAL(page_scroll_friction);
1859 KEEP_VAL(bring_in_scroll_friction);
1860 KEEP_VAL(zoom_friction);
1861 KEEP_VAL(scroll_animation_disable);
1862 KEEP_VAL(scroll_accel_factor);
1863 KEEP_VAL(thumbscroll_bounce_enable);
1864 KEEP_VAL(thumbscroll_border_friction);
1865 KEEP_VAL(thumbscroll_sensitivity_friction);
1866 KEEP_VAL(scroll_smooth_start_enable);
1867 KEEP_VAL(scroll_smooth_amount);
1868 KEEP_VAL(scroll_smooth_time_window);
1869 KEEP_VAL(scale);
1870
1871 _elm_config->priv = prev_config->priv;
1872 _config_free(prev_config);
1873 }
1874 _env_get();
1875}
1876
1877static void
1824_config_flush_get(void) 1878_config_flush_get(void)
1825{ 1879{
1826 Eina_Bool is_mirrored; 1880 Eina_Bool is_mirrored;
@@ -1833,10 +1887,8 @@ _config_flush_get(void)
1833 1887
1834 _elm_config_font_overlays_cancel(); 1888 _elm_config_font_overlays_cancel();
1835 _color_overlays_cancel(); 1889 _color_overlays_cancel();
1836 _config_free(_elm_config); 1890
1837 _elm_config = NULL; 1891 _elm_config_reload_do();
1838 _config_load();
1839 _env_get();
1840 1892
1841 /* restore prev value which is not part of the EET file */ 1893 /* restore prev value which is not part of the EET file */
1842 _elm_config->is_mirrored = is_mirrored; 1894 _elm_config->is_mirrored = is_mirrored;
@@ -2711,6 +2763,7 @@ elm_config_scale_get(void)
2711EAPI void 2763EAPI void
2712elm_config_scale_set(double scale) 2764elm_config_scale_set(double scale)
2713{ 2765{
2766 _elm_config->priv.scale = EINA_TRUE;
2714 if (scale < 0.0) return; 2767 if (scale < 0.0) return;
2715 if (_elm_config->scale == scale) return; 2768 if (_elm_config->scale == scale) return;
2716 _elm_config->scale = scale; 2769 _elm_config->scale = scale;
@@ -3128,6 +3181,7 @@ elm_config_vsync_get(void)
3128EAPI void 3181EAPI void
3129elm_config_vsync_set(Eina_Bool enabled) 3182elm_config_vsync_set(Eina_Bool enabled)
3130{ 3183{
3184 _elm_config->priv.vsync = EINA_TRUE;
3131 _elm_config->vsync = enabled; 3185 _elm_config->vsync = enabled;
3132} 3186}
3133 3187
@@ -3140,6 +3194,7 @@ elm_config_accel_preference_override_get(void)
3140EAPI void 3194EAPI void
3141elm_config_accel_preference_override_set(Eina_Bool enabled) 3195elm_config_accel_preference_override_set(Eina_Bool enabled)
3142{ 3196{
3197 _elm_config->priv.accel_override = EINA_TRUE;
3143 _elm_config->accel_override = enabled; 3198 _elm_config->accel_override = enabled;
3144} 3199}
3145 3200
@@ -3225,6 +3280,7 @@ elm_config_scroll_bounce_enabled_get(void)
3225EAPI void 3280EAPI void
3226elm_config_scroll_bounce_enabled_set(Eina_Bool enabled) 3281elm_config_scroll_bounce_enabled_set(Eina_Bool enabled)
3227{ 3282{
3283 _elm_config->priv.thumbscroll_bounce_enable = EINA_TRUE;
3228 _elm_config->thumbscroll_bounce_enable = enabled; 3284 _elm_config->thumbscroll_bounce_enable = enabled;
3229} 3285}
3230 3286
@@ -3237,6 +3293,7 @@ elm_config_scroll_bounce_friction_get(void)
3237EAPI void 3293EAPI void
3238elm_config_scroll_bounce_friction_set(double friction) 3294elm_config_scroll_bounce_friction_set(double friction)
3239{ 3295{
3296 _elm_config->priv.thumbscroll_bounce_friction = EINA_TRUE;
3240 _elm_config->thumbscroll_bounce_friction = friction; 3297 _elm_config->thumbscroll_bounce_friction = friction;
3241} 3298}
3242 3299
@@ -3249,6 +3306,7 @@ elm_config_scroll_page_scroll_friction_get(void)
3249EAPI void 3306EAPI void
3250elm_config_scroll_page_scroll_friction_set(double friction) 3307elm_config_scroll_page_scroll_friction_set(double friction)
3251{ 3308{
3309 _elm_config->priv.page_scroll_friction = EINA_TRUE;
3252 _elm_config->page_scroll_friction = friction; 3310 _elm_config->page_scroll_friction = friction;
3253} 3311}
3254 3312
@@ -3261,6 +3319,7 @@ elm_config_scroll_bring_in_scroll_friction_get(void)
3261EAPI void 3319EAPI void
3262elm_config_scroll_bring_in_scroll_friction_set(double friction) 3320elm_config_scroll_bring_in_scroll_friction_set(double friction)
3263{ 3321{
3322 _elm_config->priv.bring_in_scroll_friction = EINA_TRUE;
3264 _elm_config->bring_in_scroll_friction = friction; 3323 _elm_config->bring_in_scroll_friction = friction;
3265} 3324}
3266 3325
@@ -3285,6 +3344,7 @@ elm_config_scroll_thumbscroll_enabled_get(void)
3285EAPI void 3344EAPI void
3286elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled) 3345elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled)
3287{ 3346{
3347 _elm_config->priv.thumbscroll_enable = EINA_TRUE;
3288 _elm_config->thumbscroll_enable = enabled; 3348 _elm_config->thumbscroll_enable = enabled;
3289} 3349}
3290 3350
@@ -3297,6 +3357,7 @@ elm_config_scroll_thumbscroll_threshold_get(void)
3297EAPI void 3357EAPI void
3298elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold) 3358elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold)
3299{ 3359{
3360 _elm_config->priv.thumbscroll_threshold = EINA_TRUE;
3300 _elm_config->thumbscroll_threshold = threshold; 3361 _elm_config->thumbscroll_threshold = threshold;
3301} 3362}
3302 3363
@@ -3309,6 +3370,7 @@ elm_config_scroll_thumbscroll_hold_threshold_get(void)
3309EAPI void 3370EAPI void
3310elm_config_scroll_thumbscroll_hold_threshold_set(unsigned int threshold) 3371elm_config_scroll_thumbscroll_hold_threshold_set(unsigned int threshold)
3311{ 3372{
3373 _elm_config->priv.thumbscroll_hold_threshold = EINA_TRUE;
3312 _elm_config->thumbscroll_hold_threshold = threshold; 3374 _elm_config->thumbscroll_hold_threshold = threshold;
3313} 3375}
3314 3376
@@ -3321,6 +3383,7 @@ elm_config_scroll_thumbscroll_momentum_threshold_get(void)
3321EAPI void 3383EAPI void
3322elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold) 3384elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold)
3323{ 3385{
3386 _elm_config->priv.thumbscroll_momentum_threshold = EINA_TRUE;
3324 _elm_config->thumbscroll_momentum_threshold = threshold; 3387 _elm_config->thumbscroll_momentum_threshold = threshold;
3325} 3388}
3326 3389
@@ -3333,6 +3396,7 @@ elm_config_scroll_thumbscroll_flick_distance_tolerance_get(void)
3333EAPI void 3396EAPI void
3334elm_config_scroll_thumbscroll_flick_distance_tolerance_set(unsigned int distance) 3397elm_config_scroll_thumbscroll_flick_distance_tolerance_set(unsigned int distance)
3335{ 3398{
3399 _elm_config->priv.thumbscroll_flick_distance_tolerance = EINA_TRUE;
3336 _elm_config->thumbscroll_flick_distance_tolerance = distance; 3400 _elm_config->thumbscroll_flick_distance_tolerance = distance;
3337} 3401}
3338 3402
@@ -3345,6 +3409,7 @@ elm_config_scroll_thumbscroll_friction_get(void)
3345EAPI void 3409EAPI void
3346elm_config_scroll_thumbscroll_friction_set(double friction) 3410elm_config_scroll_thumbscroll_friction_set(double friction)
3347{ 3411{
3412 _elm_config->priv.thumbscroll_friction = EINA_TRUE;
3348 _elm_config->thumbscroll_friction = friction; 3413 _elm_config->thumbscroll_friction = friction;
3349} 3414}
3350 3415
@@ -3357,6 +3422,7 @@ elm_config_scroll_thumbscroll_min_friction_get(void)
3357EAPI void 3422EAPI void
3358elm_config_scroll_thumbscroll_min_friction_set(double friction) 3423elm_config_scroll_thumbscroll_min_friction_set(double friction)
3359{ 3424{
3425 _elm_config->priv.thumbscroll_min_friction = EINA_TRUE;
3360 _elm_config->thumbscroll_min_friction = friction; 3426 _elm_config->thumbscroll_min_friction = friction;
3361} 3427}
3362 3428
@@ -3369,6 +3435,7 @@ elm_config_scroll_thumbscroll_friction_standard_get(void)
3369EAPI void 3435EAPI void
3370elm_config_scroll_thumbscroll_friction_standard_set(double standard) 3436elm_config_scroll_thumbscroll_friction_standard_set(double standard)
3371{ 3437{
3438 _elm_config->priv.thumbscroll_friction_standard = EINA_TRUE;
3372 _elm_config->thumbscroll_friction_standard = standard; 3439 _elm_config->thumbscroll_friction_standard = standard;
3373} 3440}
3374 3441
@@ -3381,6 +3448,7 @@ elm_config_scroll_thumbscroll_border_friction_get(void)
3381EAPI void 3448EAPI void
3382elm_config_scroll_thumbscroll_border_friction_set(double friction) 3449elm_config_scroll_thumbscroll_border_friction_set(double friction)
3383{ 3450{
3451 _elm_config->priv.thumbscroll_border_friction = EINA_TRUE;
3384 if (friction < 0.0) friction = 0.0; 3452 if (friction < 0.0) friction = 0.0;
3385 if (friction > 1.0) friction = 1.0; 3453 if (friction > 1.0) friction = 1.0;
3386 _elm_config->thumbscroll_border_friction = friction; 3454 _elm_config->thumbscroll_border_friction = friction;
@@ -3395,18 +3463,19 @@ elm_config_scroll_thumbscroll_sensitivity_friction_get(void)
3395EAPI Eina_Bool 3463EAPI Eina_Bool
3396elm_config_context_menu_disabled_get(void) 3464elm_config_context_menu_disabled_get(void)
3397{ 3465{
3398 return _elm_config->context_menu_disabled; 3466 return _elm_config->context_menu_disabled;
3399} 3467}
3400 3468
3401EAPI void 3469EAPI void
3402elm_config_context_menu_disabled_set(Eina_Bool disabled) 3470elm_config_context_menu_disabled_set(Eina_Bool disabled)
3403{ 3471{
3404 _elm_config->context_menu_disabled = !!disabled; 3472 _elm_config->context_menu_disabled = !!disabled;
3405} 3473}
3406 3474
3407EAPI void 3475EAPI void
3408elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction) 3476elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction)
3409{ 3477{
3478 _elm_config->priv.thumbscroll_sensitivity_friction = EINA_TRUE;
3410 if (friction < 0.1) friction = 0.1; 3479 if (friction < 0.1) friction = 0.1;
3411 if (friction > 1.0) friction = 1.0; 3480 if (friction > 1.0) friction = 1.0;
3412 _elm_config->thumbscroll_sensitivity_friction = friction; 3481 _elm_config->thumbscroll_sensitivity_friction = friction;
@@ -3421,6 +3490,7 @@ elm_config_scroll_thumbscroll_smooth_start_get(void)
3421EAPI void 3490EAPI void
3422elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enable) 3491elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enable)
3423{ 3492{
3493 _elm_config->priv.scroll_smooth_start_enable = EINA_TRUE;
3424 _elm_config->scroll_smooth_start_enable = enable; 3494 _elm_config->scroll_smooth_start_enable = enable;
3425} 3495}
3426 3496
@@ -3433,12 +3503,14 @@ elm_config_scroll_animation_disabled_get(void)
3433EAPI void 3503EAPI void
3434elm_config_scroll_animation_disabled_set(Eina_Bool disable) 3504elm_config_scroll_animation_disabled_set(Eina_Bool disable)
3435{ 3505{
3506 _elm_config->priv.scroll_animation_disable = EINA_TRUE;
3436 _elm_config->scroll_animation_disable = !!disable; 3507 _elm_config->scroll_animation_disable = !!disable;
3437} 3508}
3438 3509
3439EAPI void 3510EAPI void
3440elm_config_scroll_accel_factor_set(double factor) 3511elm_config_scroll_accel_factor_set(double factor)
3441{ 3512{
3513 _elm_config->priv.scroll_accel_factor = EINA_TRUE;
3442 if (factor < 0.0) factor = 0.0; 3514 if (factor < 0.0) factor = 0.0;
3443 if (factor > 10.0) factor = 10.0; 3515 if (factor > 10.0) factor = 10.0;
3444 _elm_config->scroll_accel_factor = factor; 3516 _elm_config->scroll_accel_factor = factor;
@@ -3453,6 +3525,7 @@ elm_config_scroll_accel_factor_get(void)
3453EAPI void 3525EAPI void
3454elm_config_scroll_thumbscroll_smooth_amount_set(double amount) 3526elm_config_scroll_thumbscroll_smooth_amount_set(double amount)
3455{ 3527{
3528 _elm_config->priv.scroll_smooth_amount = EINA_TRUE;
3456 if (amount < 0.0) amount = 0.0; 3529 if (amount < 0.0) amount = 0.0;
3457 if (amount > 1.0) amount = 1.0; 3530 if (amount > 1.0) amount = 1.0;
3458 _elm_config->scroll_smooth_amount = amount; 3531 _elm_config->scroll_smooth_amount = amount;
@@ -3467,6 +3540,7 @@ elm_config_scroll_thumbscroll_smooth_amount_get(void)
3467EAPI void 3540EAPI void
3468elm_config_scroll_thumbscroll_smooth_time_window_set(double amount) 3541elm_config_scroll_thumbscroll_smooth_time_window_set(double amount)
3469{ 3542{
3543 _elm_config->priv.scroll_smooth_time_window = EINA_TRUE;
3470 if (amount < 0.0) amount = 0.0; 3544 if (amount < 0.0) amount = 0.0;
3471 if (amount > 1.0) amount = 1.0; 3545 if (amount > 1.0) amount = 1.0;
3472 _elm_config->scroll_smooth_time_window = amount; 3546 _elm_config->scroll_smooth_time_window = amount;
@@ -3487,6 +3561,7 @@ elm_config_scroll_thumbscroll_acceleration_threshold_get(void)
3487EAPI void 3561EAPI void
3488elm_config_scroll_thumbscroll_acceleration_threshold_set(double threshold) 3562elm_config_scroll_thumbscroll_acceleration_threshold_set(double threshold)
3489{ 3563{
3564 _elm_config->priv.thumbscroll_acceleration_threshold = EINA_TRUE;
3490 _elm_config->thumbscroll_acceleration_threshold = threshold; 3565 _elm_config->thumbscroll_acceleration_threshold = threshold;
3491} 3566}
3492 3567
@@ -3499,6 +3574,7 @@ elm_config_scroll_thumbscroll_acceleration_time_limit_get(void)
3499EAPI void 3574EAPI void
3500elm_config_scroll_thumbscroll_acceleration_time_limit_set(double time_limit) 3575elm_config_scroll_thumbscroll_acceleration_time_limit_set(double time_limit)
3501{ 3576{
3577 _elm_config->priv.thumbscroll_acceleration_time_limit = EINA_TRUE;
3502 _elm_config->thumbscroll_acceleration_time_limit = time_limit; 3578 _elm_config->thumbscroll_acceleration_time_limit = time_limit;
3503} 3579}
3504 3580
@@ -3511,6 +3587,7 @@ elm_config_scroll_thumbscroll_acceleration_weight_get(void)
3511EAPI void 3587EAPI void
3512elm_config_scroll_thumbscroll_acceleration_weight_set(double weight) 3588elm_config_scroll_thumbscroll_acceleration_weight_set(double weight)
3513{ 3589{
3590 _elm_config->priv.thumbscroll_acceleration_weight = EINA_TRUE;
3514 _elm_config->thumbscroll_acceleration_weight = weight; 3591 _elm_config->thumbscroll_acceleration_weight = weight;
3515} 3592}
3516 3593
@@ -4077,11 +4154,8 @@ _elm_config_reload(void)
4077 is_mirrored = _elm_config->is_mirrored; 4154 is_mirrored = _elm_config->is_mirrored;
4078 translate = _elm_config->translate; 4155 translate = _elm_config->translate;
4079 4156
4080 _config_free(_elm_config); 4157 _elm_config_reload_do();
4081 _elm_config = NULL; 4158
4082
4083 _config_load();
4084
4085 /* restore prev value which is not part of the EET file */ 4159 /* restore prev value which is not part of the EET file */
4086 _elm_config->is_mirrored = is_mirrored; 4160 _elm_config->is_mirrored = is_mirrored;
4087 _elm_config->translate = translate; 4161 _elm_config->translate = translate;
@@ -4122,6 +4196,7 @@ _elm_config_reload(void)
4122void 4196void
4123_elm_config_engine_set(const char *engine) 4197_elm_config_engine_set(const char *engine)
4124{ 4198{
4199 _elm_config->priv.engine = EINA_TRUE;
4125 eina_stringshare_replace(&(_elm_config->engine), engine); 4200 eina_stringshare_replace(&(_elm_config->engine), engine);
4126} 4201}
4127 4202
@@ -4232,6 +4307,7 @@ _elm_config_accel_preference_parse(const char *pref, Eina_Stringshare **accel,
4232EAPI void 4307EAPI void
4233elm_config_accel_preference_set(const char *pref) 4308elm_config_accel_preference_set(const char *pref)
4234{ 4309{
4310 _elm_config->priv.accel = EINA_TRUE;
4235 if (pref) 4311 if (pref)
4236 { 4312 {
4237 Eina_Bool hw; 4313 Eina_Bool hw;
@@ -4299,6 +4375,7 @@ elm_config_transition_duration_factor_get(void)
4299EAPI void 4375EAPI void
4300elm_config_web_backend_set(const char *backend) 4376elm_config_web_backend_set(const char *backend)
4301{ 4377{
4378 _elm_config->priv.web_backend = EINA_TRUE;
4302 if (_elm_web_init(backend)) 4379 if (_elm_web_init(backend))
4303 _elm_config->web_backend = backend; 4380 _elm_config->web_backend = backend;
4304} 4381}
@@ -4331,9 +4408,8 @@ _elm_config_profile_set(const char *profile)
4331 _elm_profile = strdup(profile); 4408 _elm_profile = strdup(profile);
4332 4409
4333 _color_overlays_cancel(); 4410 _color_overlays_cancel();
4334 _config_free(_elm_config); 4411
4335 _elm_config = NULL; 4412 _elm_config_reload_do();
4336 _config_load();
4337 4413
4338 /* restore prev value which is not part of the EET file */ 4414 /* restore prev value which is not part of the EET file */
4339 _elm_config->is_mirrored = is_mirrored; 4415 _elm_config->is_mirrored = is_mirrored;
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index f3168bbea3..7d2d02aa40 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -88,6 +88,7 @@
88 88
89typedef struct _Elm_Theme_Files Elm_Theme_Files; 89typedef struct _Elm_Theme_Files Elm_Theme_Files;
90typedef struct _Edje_Signal_Data Edje_Signal_Data; 90typedef struct _Edje_Signal_Data Edje_Signal_Data;
91typedef struct _Elm_Config_Flags Elm_Config_Flags;
91typedef struct _Elm_Config Elm_Config; 92typedef struct _Elm_Config Elm_Config;
92typedef struct _Elm_Config_Bindings_Widget Elm_Config_Bindings_Widget; 93typedef struct _Elm_Config_Bindings_Widget Elm_Config_Bindings_Widget;
93typedef struct _Elm_Config_Binding_Key Elm_Config_Binding_Key; 94typedef struct _Elm_Config_Binding_Key Elm_Config_Binding_Key;
@@ -187,6 +188,40 @@ extern const char *_elm_engines[];
187#define ELM_PRIV_SMART_CALLBACKS_DESC(name, signal, type) \ 188#define ELM_PRIV_SMART_CALLBACKS_DESC(name, signal, type) \
188 {name, type}, 189 {name, type},
189 190
191struct _Elm_Config_Flags
192{
193 Eina_Bool engine : 1;
194 Eina_Bool accel : 1;
195 Eina_Bool web_backend : 1;
196 Eina_Bool accel_override : 1;
197 Eina_Bool vsync : 1;
198 Eina_Bool thumbscroll_enable : 1;
199 Eina_Bool thumbscroll_threshold : 1;
200 Eina_Bool thumbscroll_hold_threshold : 1;
201 Eina_Bool thumbscroll_momentum_threshold : 1;
202 Eina_Bool thumbscroll_flick_distance_tolerance : 1;
203 Eina_Bool thumbscroll_friction : 1;
204 Eina_Bool thumbscroll_min_friction : 1;
205 Eina_Bool thumbscroll_friction_standard : 1;
206 Eina_Bool thumbscroll_bounce_friction : 1;
207 Eina_Bool thumbscroll_acceleration_threshold : 1;
208 Eina_Bool thumbscroll_acceleration_time_limit : 1;
209 Eina_Bool thumbscroll_acceleration_weight : 1;
210 Eina_Bool page_scroll_friction : 1;
211 Eina_Bool bring_in_scroll_friction : 1;
212 Eina_Bool zoom_friction : 1;
213 Eina_Bool scroll_animation_disable : 1;
214 Eina_Bool scroll_accel_factor : 1;
215 Eina_Bool thumbscroll_bounce_enable : 1;
216 Eina_Bool thumbscroll_border_friction : 1;
217 Eina_Bool thumbscroll_sensitivity_friction : 1;
218 Eina_Bool scroll_smooth_start_enable : 1;
219 Eina_Bool scroll_smooth_amount : 1;
220 Eina_Bool scroll_smooth_time_window : 1;
221 Eina_Bool scale : 1;
222 // ...
223};
224
190struct _Elm_Config 225struct _Elm_Config
191{ 226{
192 int config_version; 227 int config_version;
@@ -224,7 +259,7 @@ struct _Elm_Config
224 double scale; 259 double scale;
225 int bgpixmap; 260 int bgpixmap;
226 int compositing; 261 int compositing;
227 Eina_List *font_dirs; 262 Eina_List *font_dirs; // priv flags for Elm_Config_Flags -> up to here...
228 Eina_List *font_overlays; 263 Eina_List *font_overlays;
229 int font_hinting; 264 int font_hinting;
230 int cache_flush_poll_interval; 265 int cache_flush_poll_interval;
@@ -322,6 +357,8 @@ struct _Elm_Config
322 /* Not part of the EET file */ 357 /* Not part of the EET file */
323 Eina_Bool is_mirrored : 1; 358 Eina_Bool is_mirrored : 1;
324 Eina_Bool translate : 1; 359 Eina_Bool translate : 1;
360
361 Elm_Config_Flags priv;
325}; 362};
326 363
327struct _Elm_Config_Bindings_Widget 364struct _Elm_Config_Bindings_Widget