enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fix LARGE fonts

This commit is contained in:
Alastair Poole 2020-06-24 13:52:53 +01:00
parent ad7ab21ae5
commit b13e42e6ea
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/ui/ui_memory.c
View File

@ -123,40 +123,36 @@ ui_tab_memory_update(Ui *ui, Sys_Info *info)
value = info->memory.used / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s (%1.0f %)",
eina_slstr_printf("%s / %s",
evisum_size_format(info->memory.used),
evisum_size_format(info->memory.total),
value));
evisum_size_format(info->memory.total)));
pb = ui->progress_mem_cached;
ratio = info->memory.total / 100.0;
value = info->memory.cached / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s (%1.0f %)",
eina_slstr_printf("%s / %s",
evisum_size_format(info->memory.cached),
evisum_size_format(info->memory.total),
value));
evisum_size_format(info->memory.total)));
pb = ui->progress_mem_buffered;
ratio = info->memory.total / 100.0;
value = info->memory.buffered / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s (%1.0f %)",
eina_slstr_printf("%s / %s",
evisum_size_format(info->memory.buffered),
evisum_size_format(info->memory.total),
value));
evisum_size_format(info->memory.total)));
pb = ui->progress_mem_shared;
ratio = info->memory.total / 100.0;
value = info->memory.shared / ratio;
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s (%1.0f %)",
eina_slstr_printf("%s / %s",
evisum_size_format(info->memory.shared),
evisum_size_format(info->memory.total),
value));
evisum_size_format(info->memory.total)));
pb = ui->progress_mem_swap;
if (info->memory.swap_total)
@ -168,9 +164,8 @@ ui_tab_memory_update(Ui *ui, Sys_Info *info)
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
eina_slstr_printf("%s / %s (%1.0f %)",
eina_slstr_printf("%s / %s",
evisum_size_format(info->memory.swap_used),
evisum_size_format(info->memory.swap_total),
value));
evisum_size_format(info->memory.swap_total)));
}

9
src/bin/ui/ui_misc.c
View File

@ -132,12 +132,17 @@ _network_transfer_format(double rate)
{
const char *unit = "B/s";
if (rate > 1048576)
if (rate > 1073741824)
{
rate /= 1073741824;
unit = "GB/s";
}
else if (rate > 1048576 && rate <= 1073741824)
{
rate /= 1048576;
unit = "MB/s";
}
else if (rate > 1024 && rate < 1048576)
else if (rate > 1024 && rate <= 1048576)
{
rate /= 1024;
unit = "KB/s";

2
src/bin/ui/ui_util.c
View File

@ -30,7 +30,7 @@ evisum_ui_tab_add(Evas_Object *parent, Evas_Object **alias, const char *text,
evas_object_size_hint_align_set(label, FILL, FILL);
evas_object_show(label);
elm_object_text_set(label,
eina_slstr_printf("<bigger>%s</bigger>", text));
eina_slstr_printf("%s", text));
elm_layout_content_set(button, "elm.swallow.content", label);
elm_table_pack(tbl, rect, 0, 0, 1, 1);