netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=143c613edd069db73f02c97345ab8dee71c9cb01
commit 143c613edd069db73f02c97345ab8dee71c9cb01 Author: Alastair Poole <[email protected]> Date: Thu May 28 10:08:03 2020 +0100 ui: Fix Scaling. --- src/bin/ui/ui.c | 10 +++++----- src/bin/ui/ui_process_view.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index 1d811ec..6493e96 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -1315,7 +1315,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) elm_object_disabled_set(ui->btn_general, EINA_TRUE); evas_object_size_hint_weight_set(button, EXPAND, EXPAND); evas_object_size_hint_align_set(button, FILL, FILL); - evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); + evas_object_size_hint_min_set(button, elm_config_scale_get() * TAB_BTN_SIZE, 0); elm_object_text_set(button, _("General")); evas_object_show(button); elm_object_content_set(border, button); @@ -1332,7 +1332,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) ui->btn_cpu = button = elm_button_add(hbox); evas_object_size_hint_weight_set(button, EXPAND, EXPAND); evas_object_size_hint_align_set(button, FILL, FILL); - evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); + evas_object_size_hint_min_set(button, elm_config_scale_get() * TAB_BTN_SIZE, 0); elm_object_text_set(button, _("CPU")); elm_object_content_set(border, button); evas_object_show(button); @@ -1349,7 +1349,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) ui->btn_mem = button = elm_button_add(hbox); evas_object_size_hint_weight_set(button, EXPAND, EXPAND); evas_object_size_hint_align_set(button, FILL, FILL); - evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); + evas_object_size_hint_min_set(button, elm_config_scale_get() * TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Memory")); evas_object_show(button); elm_object_content_set(border, button); @@ -1366,7 +1366,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) ui->btn_storage = button = elm_button_add(hbox); evas_object_size_hint_weight_set(button, EXPAND, EXPAND); evas_object_size_hint_align_set(button, FILL, FILL); - evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); + evas_object_size_hint_min_set(button, elm_config_scale_get() * TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Storage")); evas_object_show(button); elm_object_content_set(border, button); @@ -1383,7 +1383,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) ui->btn_misc = button = elm_button_add(hbox); evas_object_size_hint_weight_set(button, FILL, EXPAND); evas_object_size_hint_align_set(button, FILL, FILL); - evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); + evas_object_size_hint_min_set(button, elm_config_scale_get() * TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Misc")); evas_object_show(button); elm_object_content_set(border, button); diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c index 8e566c1..eefe34a 100644 --- a/src/bin/ui/ui_process_view.c +++ b/src/bin/ui/ui_process_view.c @@ -930,7 +930,7 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) ui->btn_main = btn = elm_button_add(parent); evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); evas_object_size_hint_align_set(btn, FILL, FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); + evas_object_size_hint_min_set(btn, elm_config_scale_get() * TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Process")); elm_object_disabled_set(btn, EINA_TRUE); evas_object_show(btn); @@ -947,7 +947,7 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) ui->btn_thread = btn = elm_button_add(parent); evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); evas_object_size_hint_align_set(btn, FILL, FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); + evas_object_size_hint_min_set(btn, elm_config_scale_get() * TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Threads")); elm_object_disabled_set(btn, EINA_FALSE); evas_object_show(btn); @@ -964,7 +964,7 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) ui->btn_info = btn = elm_button_add(parent); evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); evas_object_size_hint_align_set(btn, FILL, FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); + evas_object_size_hint_min_set(btn, elm_config_scale_get() * TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Information")); elm_object_disabled_set(btn, EINA_FALSE); evas_object_show(btn); --
