From 9ff3706a1bad4cf8ec698c8098daebe810ede164 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Sat, 27 Jun 2020 15:35:41 +0100 Subject: [PATCH] sizing: this will have to do for now --- src/bin/ui/ui.c | 4 ++-- src/bin/ui/ui_disk.c | 4 ++-- src/bin/ui/ui_memory.c | 4 ++-- src/bin/ui/ui_misc.c | 10 +++++----- src/bin/ui/ui_util.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index ca7f454..8341dc5 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -1303,13 +1303,13 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_show(hbox); box = elm_box_add(parent); - evas_object_size_hint_weight_set(box, EXPAND, 0); + evas_object_size_hint_weight_set(box, EXPAND, EXPAND); evas_object_size_hint_align_set(box, FILL, FILL); elm_box_horizontal_set(box, EINA_TRUE); evas_object_show(box); frame = elm_frame_add(parent); - evas_object_size_hint_weight_set(frame, EXPAND, 0); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_style_set(frame, "pad_small"); evas_object_show(frame); diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c index bb5741e..1f70de3 100644 --- a/src/bin/ui/ui_disk.c +++ b/src/bin/ui/ui_disk.c @@ -112,7 +112,7 @@ _ui_disk_add(Ui *ui, File_System *inf) evas_object_show(label); elm_box_pack_end(vbox, label); - elm_object_text_set(label, eina_slstr_printf("%s", + elm_object_text_set(label, eina_slstr_printf("%s", inf->mount)); hbox = elm_box_add(parent); @@ -156,7 +156,7 @@ _ui_disk_add(Ui *ui, File_System *inf) evas_object_show(label); elm_object_text_set(label, - eina_slstr_printf("%s (%s)", + eina_slstr_printf("%s (%s)", inf->path, type)); elm_box_pack_end(vbox, label); diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c index a54aff6..4ffe17a 100644 --- a/src/bin/ui/ui_memory.c +++ b/src/bin/ui/ui_memory.c @@ -6,7 +6,7 @@ _label_mem(Evas_Object *parent, const char *text) Evas_Object *label = elm_label_add(parent); evas_object_size_hint_weight_set(label, 0, EXPAND); evas_object_size_hint_align_set(label, FILL, FILL); - elm_object_text_set(label, eina_slstr_printf("%s",text)); + elm_object_text_set(label, eina_slstr_printf("%s",text)); evas_object_show(label); return label; @@ -64,7 +64,7 @@ ui_tab_memory_add(Ui *ui) table = elm_table_add(parent); evas_object_size_hint_weight_set(table, EXPAND, EXPAND); evas_object_size_hint_align_set(table, FILL, FILL); - elm_table_padding_set(table, 0, 20 * elm_config_scale_get()); + elm_table_padding_set(table, 0, 40 * elm_config_scale_get()); evas_object_show(table); label = _label_mem(box, _("Used")); diff --git a/src/bin/ui/ui_misc.c b/src/bin/ui/ui_misc.c index 45f801a..baab4ed 100644 --- a/src/bin/ui/ui_misc.c +++ b/src/bin/ui/ui_misc.c @@ -29,9 +29,9 @@ _battery_usage_add(Evas_Object *box, power_t *power) elm_box_pack_end(vbox, label); if (power->have_ac && i == 0) - fmt = _("%s (plugged in) "); + fmt = _("%s (plugged in) "); else - fmt = _("%s"); + fmt = _("%s"); elm_object_text_set(label, eina_slstr_printf(fmt, power->batteries[i]->name)); @@ -93,7 +93,7 @@ _sensor_usage_add(Evas_Object *box, Sys_Info *info) evas_object_show(label); elm_box_pack_end(vbox, label); - elm_object_text_set(label, eina_slstr_printf("%s", + elm_object_text_set(label, eina_slstr_printf("%s", snsr->name)); hbox = elm_box_add(box); @@ -170,9 +170,9 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t bytes, Eina_Bool incoming) label = elm_label_add(box); if (incoming) - elm_object_text_set(label, _("Network Incoming")); + elm_object_text_set(label, _("Network Incoming")); else - elm_object_text_set(label, _("Network Outgoing")); + elm_object_text_set(label, _("Network Outgoing")); evas_object_size_hint_align_set(label, 1.0, FILL); evas_object_size_hint_weight_set(label, EXPAND, EXPAND); diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c index 17b5e28..195414d 100644 --- a/src/bin/ui/ui_util.c +++ b/src/bin/ui/ui_util.c @@ -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("%s", text)); + eina_slstr_printf("%s", text)); elm_layout_content_set(button, "elm.swallow.content", label); elm_table_pack(tbl, rect, 0, 0, 1, 1);