This commit is contained in:
Alastair Poole 2020-12-16 13:06:45 +00:00
parent 2ed625ac13
commit 094b5a45dd
1 changed files with 19 additions and 9 deletions

View File

@ -390,7 +390,7 @@ _item_create(Evas_Object *parent)
obj = parent;
tbl = elm_table_add(obj);
evas_object_size_hint_align_set(tbl, 1.0, FILL);
evas_object_size_hint_align_set(tbl, FILL, 0);
evas_object_size_hint_weight_set(tbl, EXPAND, EXPAND);
hbx = elm_box_add(tbl);
@ -399,6 +399,10 @@ _item_create(Evas_Object *parent)
evas_object_size_hint_weight_set(hbx, EXPAND, EXPAND);
evas_object_show(hbx);
rec = evas_object_rectangle_add(tbl);
evas_object_size_hint_min_set(rec, 1, ELM_SCALE_SIZE(24));
elm_box_pack_end(hbx, rec);
ic = elm_icon_add(tbl);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
evas_object_size_hint_align_set(ic, FILL, FILL);
@ -1210,7 +1214,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_cmd = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_CMD ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_CMD ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_CMD);
evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1222,7 +1227,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_uid = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_UID ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_UID ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_UID);
evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1234,7 +1240,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_pid = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_PID ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_PID ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_PID);
evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1246,7 +1253,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_size = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_SIZE ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_SIZE ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_SIZE);
evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1258,7 +1266,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_rss = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_RSS ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_RSS ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_RSS);
evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1270,7 +1279,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_state = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_STATE ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_STATE ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_STATE);
evas_object_size_hint_weight_set(btn, 0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1282,7 +1292,8 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_cpu_usage = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
ui->settings.sort_type == SORT_BY_CPU_USAGE ? ui->settings.sort_reverse : EINA_FALSE,
(ui->settings.sort_type == SORT_BY_CPU_USAGE ?
ui->settings.sort_reverse : EINA_FALSE),
ui->settings.sort_type == SORT_BY_CPU_USAGE);
evas_object_size_hint_weight_set(btn, EXPAND, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
@ -1299,7 +1310,6 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_AUTO);
elm_genlist_homogeneous_set(plist, EINA_TRUE);
elm_genlist_multi_select_set(plist, EINA_FALSE);
evas_object_size_hint_weight_set(plist, EXPAND, EXPAND);
evas_object_size_hint_align_set(plist, FILL, FILL);