okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0fd5552c3be34bfc89d63238a7d5725bc6053d47
commit 0fd5552c3be34bfc89d63238a7d5725bc6053d47 Author: Stephen Houston <[email protected]> Date: Wed Aug 8 10:25:30 2018 -0500 Sysinfo: Use appropriate format strings and make sure to set format before value. --- src/modules/sysinfo/cpuclock/cpuclock.c | 6 +++--- src/modules/sysinfo/memusage/memusage.c | 20 ++++++++++---------- src/modules/sysinfo/netstatus/netstatus.c | 15 ++++++++------- src/modules/sysinfo/thermal/thermal.c | 11 ++++++----- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index 787a86e9f..75a429be6 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -310,15 +310,15 @@ _cpuclock_popup_create(Instance *inst) elm_table_pack(table, label, 0, 0, 2, 1); evas_object_show(label); - snprintf(buf, sizeof(buf), "%1.1f %s (%d %%)", f, u, + snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u, inst->cfg->cpuclock.percent); pbar = elm_progressbar_add(table); E_EXPAND(pbar); E_FILL(pbar); elm_progressbar_span_size_set(pbar, 200 * e_scale); - elm_progressbar_value_set(pbar, (float)inst->cfg->cpuclock.percent / 100); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)inst->cfg->cpuclock.percent / 100); elm_table_pack(table, pbar, 0, 1, 2, 1); evas_object_show(pbar); inst->cfg->cpuclock.popup_pbar = pbar; @@ -472,7 +472,7 @@ _cpuclock_face_update_current(Instance *inst) f /= 1000000; u = _("GHz"); } - snprintf(buf, sizeof(buf), "%1.1f %s (%d %%)", f, u, + snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u, inst->cfg->cpuclock.percent); elm_progressbar_unit_format_set(inst->cfg->cpuclock.popup_pbar, buf); elm_progressbar_value_set(inst->cfg->cpuclock.popup_pbar, diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index 0b6e72638..ed06b15b2 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -34,33 +34,33 @@ _memusage_popup_update(Instance *inst) val_mb = inst->cfg->memusage.mem_used / 1024; val_perc = 100 * ((float)inst->cfg->memusage.mem_used / (float)inst->cfg->memusage.mem_total); - snprintf(buf, sizeof(buf), "%d MB (%d %%)", val_mb, val_perc); - elm_progressbar_value_set(pbar, (float)val_perc / 100); + snprintf(buf, sizeof(buf), "%d MB (%d %%%%)", val_mb, val_perc); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)val_perc / 100); pbar = evas_object_data_get(inst->cfg->memusage.popup, "mem_buffers_pbar"); val_mb = inst->cfg->memusage.mem_buffers / 1024; val_perc = 100 * ((float)inst->cfg->memusage.mem_buffers / (float)inst->cfg->memusage.mem_total); - snprintf(buf, sizeof(buf), "%d MB (%d %%)", val_mb, val_perc); - elm_progressbar_value_set(pbar, (float)val_perc / 100); + snprintf(buf, sizeof(buf), "%d MB (%d %%%%)", val_mb, val_perc); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)val_perc / 100); pbar = evas_object_data_get(inst->cfg->memusage.popup, "mem_cached_pbar"); val_mb = inst->cfg->memusage.mem_cached / 1024; val_perc = 100 * ((float)inst->cfg->memusage.mem_cached / (float)inst->cfg->memusage.mem_total); - snprintf(buf, sizeof(buf), "%d MB (%d %%)", val_mb, val_perc); - elm_progressbar_value_set(pbar, (float)val_perc / 100); + snprintf(buf, sizeof(buf), "%d MB (%d %%%%)", val_mb, val_perc); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)val_perc / 100); pbar = evas_object_data_get(inst->cfg->memusage.popup, "mem_shared_pbar"); val_mb = inst->cfg->memusage.mem_shared / 1024; val_perc = 100 * ((float)inst->cfg->memusage.mem_shared / (float)inst->cfg->memusage.mem_total); - snprintf(buf, sizeof(buf), "%d MB (%d %%)", val_mb, val_perc); - elm_progressbar_value_set(pbar, (float)val_perc / 100); + snprintf(buf, sizeof(buf), "%d MB (%d %%%%)", val_mb, val_perc); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)val_perc / 100); } if (inst->cfg->memusage.swp_total) @@ -69,9 +69,9 @@ _memusage_popup_update(Instance *inst) val_mb = inst->cfg->memusage.swp_used / 1024; val_perc = 100 * ((float)inst->cfg->memusage.swp_used / (float)inst->cfg->memusage.swp_total); - snprintf(buf, sizeof(buf), "%d MB (%d %%)", val_mb, val_perc); - elm_progressbar_value_set(pbar, (float)val_perc / 100); + snprintf(buf, sizeof(buf), "%d MB (%d %%%%)", val_mb, val_perc); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)val_perc / 100); } } diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index 5d29f9432..93caf4ee9 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -42,19 +42,19 @@ _netstatus_face_update(Thread_Config *thc) if (thc->inst->cfg->netstatus.popup) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s (%d %%)", + snprintf(buf, sizeof(buf), "%s (%d %%%%)", thc->inst->cfg->netstatus.instring, thc->inst->cfg->netstatus.inpercent); + elm_progressbar_unit_format_set(thc->inst->cfg->netstatus.popup_inpbar, buf); elm_progressbar_value_set(thc->inst->cfg->netstatus.popup_inpbar, (float)thc->inst->cfg->netstatus.inpercent / 100); - elm_progressbar_unit_format_set(thc->inst->cfg->netstatus.popup_inpbar, buf); memset(buf, 0x00, sizeof(buf)); - snprintf(buf, sizeof(buf), "%s (%d %%)", + snprintf(buf, sizeof(buf), "%s (%d %%%%)", thc->inst->cfg->netstatus.outstring, thc->inst->cfg->netstatus.outpercent); + elm_progressbar_unit_format_set(thc->inst->cfg->netstatus.popup_outpbar, buf); elm_progressbar_value_set(thc->inst->cfg->netstatus.popup_outpbar, (float)thc->inst->cfg->netstatus.outpercent / 100); - elm_progressbar_unit_format_set(thc->inst->cfg->netstatus.popup_outpbar, buf); } } @@ -124,7 +124,7 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ elm_table_pack(table, label, 0, 1, 1, 1); evas_object_show(label); - snprintf(buf, sizeof(buf), "%s (%d %%)", + snprintf(buf, sizeof(buf), "%s (%d %%%%)", inst->cfg->netstatus.instring, inst->cfg->netstatus.inpercent); @@ -132,6 +132,7 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ E_EXPAND(pbar); E_FILL(pbar); elm_progressbar_span_size_set(pbar, 200 * e_scale); + elm_progressbar_unit_format_set(pbar, buf); elm_progressbar_value_set(pbar, (float)inst->cfg->netstatus.inpercent / 100); elm_table_pack(table, pbar, 1, 1, 1, 1); evas_object_show(pbar); @@ -144,7 +145,7 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ evas_object_show(label); memset(buf, 0x00, sizeof(buf)); - snprintf(buf, sizeof(buf), "%s (%d %%)", + snprintf(buf, sizeof(buf), "%s (%d %%%%)", inst->cfg->netstatus.outstring, inst->cfg->netstatus.outpercent); @@ -152,8 +153,8 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ E_EXPAND(pbar); E_FILL(pbar); elm_progressbar_span_size_set(pbar, 200 * e_scale); - elm_progressbar_value_set(pbar, (float)inst->cfg->netstatus.outpercent / 100); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)inst->cfg->netstatus.outpercent / 100); elm_table_pack(table, pbar, 1, 2, 1, 1); evas_object_show(pbar); inst->cfg->netstatus.popup_outpbar = pbar; diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index a423d67fd..c1441aee0 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -67,13 +67,14 @@ _thermal_apply(Instance *inst, int temp) char buf[4096]; if (inst->cfg->thermal.units == FAHRENHEIT) - snprintf(buf, sizeof(buf), "%d F (%d %%)", + snprintf(buf, sizeof(buf), "%d F (%d %%%%)", (int)((inst->cfg->thermal.temp * 9.0 / 5.0) + 32), inst->cfg->thermal.percent); else - snprintf(buf, sizeof(buf), "%d C (%d %%)", + snprintf(buf, sizeof(buf), "%d C (%d %%%%)", (int)inst->cfg->thermal.temp, inst->cfg->thermal.percent); + elm_progressbar_unit_format_set(inst->cfg->thermal.popup_pbar, buf); elm_progressbar_value_set(inst->cfg->thermal.popup_pbar, (float)inst->cfg->thermal.percent / 100); } @@ -205,19 +206,19 @@ _thermal_popup_create(Instance *inst) evas_object_show(label); if (inst->cfg->thermal.units == FAHRENHEIT) - snprintf(buf, sizeof(buf), "%d F (%d %%)", + snprintf(buf, sizeof(buf), "%d F (%d %%%%)", (int)((inst->cfg->thermal.temp * 9.0 / 5.0) + 32), inst->cfg->thermal.percent); else - snprintf(buf, sizeof(buf), "%d C (%d %%)", + snprintf(buf, sizeof(buf), "%d C (%d %%%%)", (int)inst->cfg->thermal.temp, inst->cfg->thermal.percent); pbar = elm_progressbar_add(table); E_EXPAND(pbar); E_FILL(pbar); elm_progressbar_span_size_set(pbar, 200 * e_scale); - elm_progressbar_value_set(pbar, (float)inst->cfg->thermal.percent / 100); elm_progressbar_unit_format_set(pbar, buf); + elm_progressbar_value_set(pbar, (float)inst->cfg->thermal.percent / 100); elm_table_pack(table, pbar, 0, 1, 2, 1); evas_object_show(pbar); inst->cfg->thermal.popup_pbar = pbar; --
