netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=f37c4c2daf2e057aec6312c0dac28d9782f7ebd8
commit f37c4c2daf2e057aec6312c0dac28d9782f7ebd8 Author: Alastair Poole <[email protected]> Date: Tue May 12 21:03:26 2020 +0100 ui: improve tabs? --- src/bin/ui.c | 22 ++++++++++++++++++---- src/bin/ui.h | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/bin/ui.c b/src/bin/ui.c index 195012d..fa8cfbb 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -2669,6 +2669,13 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_style_set(border, "pad_small"); + elm_box_pack_end(hbox, border); + evas_object_show(border); + + border = elm_frame_add(parent); + evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_style_set(border, "pad_small"); evas_object_show(border); ui->btn_general = button = elm_button_add(hbox); @@ -2683,7 +2690,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_smart_callback_add(button, "clicked", _tab_system_activity_clicked_cb, ui); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_style_set(border, "pad_small"); evas_object_show(border); @@ -2699,7 +2706,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_smart_callback_add(button, "clicked", _tab_cpu_activity_clicked_cb, ui); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_style_set(border, "pad_small"); evas_object_show(border); @@ -2715,7 +2722,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_smart_callback_add(button, "clicked", _tab_memory_activity_clicked_cb, ui); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_style_set(border, "pad_small"); evas_object_show(border); @@ -2731,7 +2738,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_smart_callback_add(button, "clicked", _tab_disk_activity_clicked_cb, ui); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_style_set(border, "pad_small"); evas_object_show(border); @@ -2746,6 +2753,13 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) elm_box_pack_end(hbox, border); evas_object_smart_callback_add(button, "clicked", _tab_misc_clicked_cb, ui); + border = elm_frame_add(parent); + evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_style_set(border, "pad_small"); + elm_box_pack_end(hbox, border); + evas_object_show(border); + elm_object_content_set(frame, hbox); elm_table_pack(ui->content, frame, 0, 0, 1, 1); diff --git a/src/bin/ui.h b/src/bin/ui.h index 9c54319..2a11058 100644 --- a/src/bin/ui.h +++ b/src/bin/ui.h @@ -56,7 +56,7 @@ typedef enum SORT_BY_CPU_USAGE, } Sort_Type; -#define TAB_BTN_SIZE 75 +#define TAB_BTN_SIZE 96 typedef struct Ui { --
