devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5853fca2d433e300fa134637f134bcef52b384f6
commit 5853fca2d433e300fa134637f134bcef52b384f6 Author: Simon Tischer <[email protected]> Date: Mon Apr 13 11:00:45 2020 +0200 netstatus/batman/pager - slider stepping fixes with mousewheel detail work on pager(gadget) settings - changed indicator format to slider format - changed steps to make more sence Reviewed-by: Christopher Michael <[email protected]> Differential Revision: https://phab.enlightenment.org/D11693 --- src/modules/pager/gadget/config.c | 12 ++++++++---- src/modules/sysinfo/batman/batman_config.c | 6 +++--- src/modules/sysinfo/netstatus/netstatus_config.c | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/modules/pager/gadget/config.c b/src/modules/pager/gadget/config.c index b7ac10adf..c6c653582 100644 --- a/src/modules/pager/gadget/config.c +++ b/src/modules/pager/gadget/config.c @@ -445,9 +445,10 @@ _config_create_pages(Evas_Object *parent) ow = elm_slider_add(tb); elm_object_disabled_set(ow, !pager_config->popup); elm_slider_min_max_set(ow, 20, 200); - elm_slider_step_set(ow, 1); + elm_slider_step_set(ow, 0.0555); elm_slider_value_set(ow, pager_config->popup_height); elm_slider_unit_format_set(ow, _("%.0f pixels")); + elm_slider_indicator_format_set(ow, _("%.0f")); elm_table_pack(tb, ow, 0, 2, 1, 1); E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL); E_WEIGHT(ow, EVAS_HINT_EXPAND, 0); @@ -467,9 +468,10 @@ _config_create_pages(Evas_Object *parent) ow = elm_slider_add(tb); elm_object_disabled_set(ow, !pager_config->popup); elm_slider_min_max_set(ow, 0.1, 10); - elm_slider_step_set(ow, 0.1); + elm_slider_step_set(ow, 0.01); elm_slider_value_set(ow, pager_config->popup_speed); elm_slider_unit_format_set(ow, _("%1.1f seconds")); + elm_slider_indicator_format_set(ow, _("%.1f")); elm_table_pack(tb, ow, 0, 4, 1, 1); E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL); E_WEIGHT(ow, EVAS_HINT_EXPAND, 0); @@ -489,9 +491,10 @@ _config_create_pages(Evas_Object *parent) ow = elm_slider_add(tb); elm_object_disabled_set(ow, !pager_config->popup); elm_slider_min_max_set(ow, 20, 200); - elm_slider_step_set(ow, 1); + elm_slider_step_set(ow, 0.0555); elm_slider_value_set(ow, pager_config->popup_act_height); elm_slider_unit_format_set(ow, _("%.0f pixels")); + elm_slider_indicator_format_set(ow, _("%.0f")); elm_table_pack(tb, ow, 0, 6, 1, 1); E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL); E_WEIGHT(ow, EVAS_HINT_EXPAND, 0); @@ -564,9 +567,10 @@ _config_create_pages(Evas_Object *parent) ow = elm_slider_add(tb); elm_object_disabled_set(ow, !pager_config->popup_urgent); elm_slider_min_max_set(ow, 0.1, 10); - elm_slider_step_set(ow, 0.1); + elm_slider_step_set(ow, 0.01); elm_slider_value_set(ow, pager_config->popup_urgent_speed); elm_slider_unit_format_set(ow, _("%1.1f seconds")); + elm_slider_indicator_format_set(ow, _("%.1f")); elm_table_pack(tb, ow, 0, 4, 1, 1); E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL); E_WEIGHT(ow, EVAS_HINT_EXPAND, 0); diff --git a/src/modules/sysinfo/batman/batman_config.c b/src/modules/sysinfo/batman/batman_config.c index 85455215a..25462d133 100644 --- a/src/modules/sysinfo/batman/batman_config.c +++ b/src/modules/sysinfo/batman/batman_config.c @@ -449,7 +449,7 @@ batman_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f min"); elm_slider_min_max_set(slider, 0, 60); elm_slider_value_set(slider, inst->cfg->batman.alert); - elm_slider_step_set(slider, 1); + elm_slider_step_set(slider, 0.01); elm_slider_span_size_set(slider, 100); E_ALIGN(slider, 0.0, 0.0); E_WEIGHT(slider, EVAS_HINT_EXPAND, 0); @@ -471,7 +471,7 @@ batman_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f %%"); elm_slider_min_max_set(slider, 0, 100); elm_slider_value_set(slider, inst->cfg->batman.alert_p); - elm_slider_step_set(slider, 1); + elm_slider_step_set(slider, 0.01); elm_slider_span_size_set(slider, 100); E_ALIGN(slider, 0.0, 0.0); E_WEIGHT(slider, EVAS_HINT_EXPAND, 0); @@ -493,7 +493,7 @@ batman_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f s"); elm_slider_min_max_set(slider, 1, 300); elm_slider_value_set(slider, inst->cfg->batman.alert_timeout); - elm_slider_step_set(slider, 1); + elm_slider_step_set(slider, 0.01); elm_slider_span_size_set(slider, 100); E_ALIGN(slider, 0.0, 0.0); E_WEIGHT(slider, EVAS_HINT_EXPAND, 0); diff --git a/src/modules/sysinfo/netstatus/netstatus_config.c b/src/modules/sysinfo/netstatus/netstatus_config.c index 73776cbde..36aac0ceb 100644 --- a/src/modules/sysinfo/netstatus/netstatus_config.c +++ b/src/modules/sysinfo/netstatus/netstatus_config.c @@ -305,7 +305,7 @@ netstatus_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f"); elm_slider_min_max_set(slider, 0, 1000); elm_slider_value_set(slider, inst->cfg->netstatus.inmax); - elm_slider_step_set(slider, 10); + elm_slider_step_set(slider, 0.05); elm_slider_span_size_set(slider, 100); evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); @@ -358,7 +358,7 @@ netstatus_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f"); elm_slider_min_max_set(slider, 0, 1000); elm_slider_value_set(slider, inst->cfg->netstatus.outmax); - elm_slider_step_set(slider, 10); + elm_slider_step_set(slider, 0.05); elm_slider_span_size_set(slider, 100); evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); --
