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

ui: Formatting and "logic"

This commit is contained in:
Alastair Poole 2020-04-22 22:55:22 +01:00
parent 7d98f61332
commit 10cbba80f5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/ui.c
View File

@ -414,7 +414,7 @@ _tab_memory_update(Ui *ui, results_t *results)
elm_object_text_set(ui->title_mem, eina_slstr_printf( elm_object_text_set(ui->title_mem, eina_slstr_printf(
"<subtitle>Memory</subtitle><br>" \ "<subtitle>Memory</subtitle><br>" \
"<bigger>Physical %s</bigger><br>" \ "<bigger>Physical %s</bigger><br><br>" \
"Swap %s", "Swap %s",
_mem_format(ui->data_unit, results->memory.total), _mem_format(ui->data_unit, results->memory.total),
_mem_format(ui->data_unit, results->memory.swap_total))); _mem_format(ui->data_unit, results->memory.swap_total)));
@ -1586,8 +1586,7 @@ _item_menu_priority_add(Evas_Object *menu, Elm_Object_Item *menu_it, Proc_Info *
elm_object_item_disabled_set(it, EINA_TRUE); elm_object_item_disabled_set(it, EINA_TRUE);
} }
static static Evas_Object *
Evas_Object *
_item_menu_create(Ui *ui, Proc_Info *proc) _item_menu_create(Ui *ui, Proc_Info *proc)
{ {
Elm_Object_Item *menu_it, *menu_it2; Elm_Object_Item *menu_it, *menu_it2;
@ -2459,7 +2458,7 @@ _ui_tab_memory_add(Ui *ui)
elm_table_pack(table, label, 0, 2, 1, 1); elm_table_pack(table, label, 0, 2, 1, 1);
elm_table_pack(table, progress, 1, 2, 1, 1); elm_table_pack(table, progress, 1, 2, 1, 1);
label = _label_mem(box, "Res"); label = _label_mem(box, "Shared");
ui->progress_mem_shared = progress = elm_progressbar_add(frame); ui->progress_mem_shared = progress = elm_progressbar_add(frame);
evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -2800,18 +2799,18 @@ _evisum_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
if (!ev || !ev->keyname) if (!ev || !ev->keyname)
return; return;
control = evas_key_modifier_is_set(ev->modifiers, "Control");
ui->skip_wait = EINA_TRUE;
if (!control) return;
if (!strcmp(ev->keyname, "Escape")) if (!strcmp(ev->keyname, "Escape"))
{ {
ecore_main_loop_quit(); ecore_main_loop_quit();
return; return;
} }
control = evas_key_modifier_is_set(ev->modifiers, "Control");
ui->skip_wait = EINA_TRUE;
if (!control) return;
if ((ev->keyname[0] == 'K' || ev->keyname[0] == 'k')) if ((ev->keyname[0] == 'K' || ev->keyname[0] == 'k'))
ui->data_unit = DATA_UNIT_KB; ui->data_unit = DATA_UNIT_KB;
else if ((ev->keyname[0] == 'M' || ev->keyname[0] == 'm')) else if ((ev->keyname[0] == 'M' || ev->keyname[0] == 'm'))