diff --git a/main.c b/main.c index a16aa63..efaa242 100644 --- a/main.c +++ b/main.c @@ -475,7 +475,6 @@ int main(int argc, char *argv[]) { const int base_keyboard_height = ver_res > hor_res ? ver_res / 3 : ver_res / 2; /* Height for 4 rows */ const int keyboard_height = base_keyboard_height * 1.25; /* Add space for an extra top row */ const int padding = keyboard_height / 10; - // const int label_width = hor_res - 2 * padding; const int textarea_container_max_width = LV_MIN(hor_res, ver_res); /* Main flexbox */ @@ -533,32 +532,6 @@ int main(int argc, char *argv[]) { lv_obj_set_size(flexible_spacer, LV_PCT(100), 0); lv_obj_set_flex_grow(flexible_spacer, 1); - /* Label container */ - // lv_obj_t *label_container = lv_obj_create(container); - // lv_obj_set_size(label_container, label_width, LV_PCT(100)); - // lv_obj_set_flex_grow(label_container, 1); - - // /* Label */ - // lv_obj_t *spangroup = lv_spangroup_create(label_container); - // lv_spangroup_set_align(spangroup, LV_TEXT_ALIGN_CENTER); - // lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_BREAK); - // lv_spangroup_set_overflow(spangroup, LV_SPAN_OVERFLOW_ELLIPSIS); - // lv_span_t *span1 = lv_spangroup_new_span(spangroup); - - // /* Label text */ - // const char *crypttab_tried = getenv("CRYPTTAB_TRIED"); - // if (crypttab_tried && atoi(crypttab_tried) > 0) { - // lv_span_set_text(span1, "Password incorrect"); - // } else { - // lv_span_set_text(span1, "Password required for booting"); - // } - - // /* Size label to content */ - // const lv_coord_t label_height = lv_spangroup_get_expand_height(spangroup, label_width); - // lv_obj_set_style_max_height(spangroup, LV_PCT(100), LV_PART_MAIN); - // lv_obj_set_size(spangroup, label_width, label_height); - // lv_obj_set_align(spangroup, LV_ALIGN_BOTTOM_MID); - /* Textarea flexbox */ lv_obj_t *textarea_container = lv_obj_create(container); lv_obj_set_size(textarea_container, LV_PCT(100), LV_SIZE_CONTENT); @@ -600,11 +573,6 @@ int main(int argc, char *argv[]) { lv_obj_t *fixed_spacer = lv_obj_create(container); lv_obj_set_size(fixed_spacer, LV_PCT(100), padding); - // /* Hide label if it clips veritcally */ - // if (label_height > lv_obj_get_height(label_container)) { - // lv_obj_set_height(spangroup, 0); - // } - /* Keyboard (after textarea / label so that key popovers are not drawn over) */ keyboard = lv_keyboard_create(lv_scr_act()); lv_keyboard_set_mode(keyboard, LV_KEYBOARD_MODE_TEXT_LOWER); diff --git a/screenshots/breezy-dark-1024x768.png b/screenshots/breezy-dark-1024x768.png index 7252ba7..1ee0303 100644 Binary files a/screenshots/breezy-dark-1024x768.png and b/screenshots/breezy-dark-1024x768.png differ diff --git a/screenshots/breezy-dark-1280x800.png b/screenshots/breezy-dark-1280x800.png index e7997e0..8ed2d72 100644 Binary files a/screenshots/breezy-dark-1280x800.png and b/screenshots/breezy-dark-1280x800.png differ diff --git a/screenshots/breezy-dark-1440x720.png b/screenshots/breezy-dark-1440x720.png index fcbe6fd..644f440 100644 Binary files a/screenshots/breezy-dark-1440x720.png and b/screenshots/breezy-dark-1440x720.png differ diff --git a/screenshots/breezy-dark-1920x1080.png b/screenshots/breezy-dark-1920x1080.png index b9f746e..28ed8d4 100644 Binary files a/screenshots/breezy-dark-1920x1080.png and b/screenshots/breezy-dark-1920x1080.png differ diff --git a/screenshots/breezy-dark-480x800.png b/screenshots/breezy-dark-480x800.png index d50a858..5b43828 100644 Binary files a/screenshots/breezy-dark-480x800.png and b/screenshots/breezy-dark-480x800.png differ diff --git a/screenshots/breezy-dark-540x960.png b/screenshots/breezy-dark-540x960.png index d4f754a..2064d93 100644 Binary files a/screenshots/breezy-dark-540x960.png and b/screenshots/breezy-dark-540x960.png differ diff --git a/screenshots/breezy-dark-768x1024.png b/screenshots/breezy-dark-768x1024.png index 2e54e5c..0fce9cc 100644 Binary files a/screenshots/breezy-dark-768x1024.png and b/screenshots/breezy-dark-768x1024.png differ diff --git a/screenshots/breezy-dark-800x480.png b/screenshots/breezy-dark-800x480.png index a76c18c..656f8e4 100644 Binary files a/screenshots/breezy-dark-800x480.png and b/screenshots/breezy-dark-800x480.png differ diff --git a/screenshots/breezy-dark-960x540.png b/screenshots/breezy-dark-960x540.png index 943e6dd..29d1cce 100644 Binary files a/screenshots/breezy-dark-960x540.png and b/screenshots/breezy-dark-960x540.png differ diff --git a/screenshots/breezy-light-1024x768.png b/screenshots/breezy-light-1024x768.png index 5fd9e29..24ecab5 100644 Binary files a/screenshots/breezy-light-1024x768.png and b/screenshots/breezy-light-1024x768.png differ diff --git a/screenshots/breezy-light-1280x800.png b/screenshots/breezy-light-1280x800.png index 17422e0..2afaaeb 100644 Binary files a/screenshots/breezy-light-1280x800.png and b/screenshots/breezy-light-1280x800.png differ diff --git a/screenshots/breezy-light-1440x720.png b/screenshots/breezy-light-1440x720.png index cd2b4b6..cf2e9dd 100644 Binary files a/screenshots/breezy-light-1440x720.png and b/screenshots/breezy-light-1440x720.png differ diff --git a/screenshots/breezy-light-1920x1080.png b/screenshots/breezy-light-1920x1080.png index 1d20a17..964d4a9 100644 Binary files a/screenshots/breezy-light-1920x1080.png and b/screenshots/breezy-light-1920x1080.png differ diff --git a/screenshots/breezy-light-480x800.png b/screenshots/breezy-light-480x800.png index 95547af..ad107f6 100644 Binary files a/screenshots/breezy-light-480x800.png and b/screenshots/breezy-light-480x800.png differ diff --git a/screenshots/breezy-light-540x960.png b/screenshots/breezy-light-540x960.png index d1e1df4..39b2788 100644 Binary files a/screenshots/breezy-light-540x960.png and b/screenshots/breezy-light-540x960.png differ diff --git a/screenshots/breezy-light-768x1024.png b/screenshots/breezy-light-768x1024.png index 8629eac..0bd78c6 100644 Binary files a/screenshots/breezy-light-768x1024.png and b/screenshots/breezy-light-768x1024.png differ diff --git a/screenshots/breezy-light-800x480.png b/screenshots/breezy-light-800x480.png index e439d57..5eecd66 100644 Binary files a/screenshots/breezy-light-800x480.png and b/screenshots/breezy-light-800x480.png differ diff --git a/screenshots/breezy-light-960x540.png b/screenshots/breezy-light-960x540.png index 8a08af5..24e9e89 100644 Binary files a/screenshots/breezy-light-960x540.png and b/screenshots/breezy-light-960x540.png differ diff --git a/screenshots/pmos-dark-1024x768.png b/screenshots/pmos-dark-1024x768.png index ec64231..2cd6cbb 100644 Binary files a/screenshots/pmos-dark-1024x768.png and b/screenshots/pmos-dark-1024x768.png differ diff --git a/screenshots/pmos-dark-1280x800.png b/screenshots/pmos-dark-1280x800.png index 905b936..d5b6dcf 100644 Binary files a/screenshots/pmos-dark-1280x800.png and b/screenshots/pmos-dark-1280x800.png differ diff --git a/screenshots/pmos-dark-1440x720.png b/screenshots/pmos-dark-1440x720.png index e60346c..8f9a32e 100644 Binary files a/screenshots/pmos-dark-1440x720.png and b/screenshots/pmos-dark-1440x720.png differ diff --git a/screenshots/pmos-dark-1920x1080.png b/screenshots/pmos-dark-1920x1080.png index 72a1ed7..99e1348 100644 Binary files a/screenshots/pmos-dark-1920x1080.png and b/screenshots/pmos-dark-1920x1080.png differ diff --git a/screenshots/pmos-dark-480x800.png b/screenshots/pmos-dark-480x800.png index 962a745..e627bd9 100644 Binary files a/screenshots/pmos-dark-480x800.png and b/screenshots/pmos-dark-480x800.png differ diff --git a/screenshots/pmos-dark-540x960.png b/screenshots/pmos-dark-540x960.png index a09a7ef..1e92f02 100644 Binary files a/screenshots/pmos-dark-540x960.png and b/screenshots/pmos-dark-540x960.png differ diff --git a/screenshots/pmos-dark-768x1024.png b/screenshots/pmos-dark-768x1024.png index 3949fff..a58cb6d 100644 Binary files a/screenshots/pmos-dark-768x1024.png and b/screenshots/pmos-dark-768x1024.png differ diff --git a/screenshots/pmos-dark-800x480.png b/screenshots/pmos-dark-800x480.png index 9f9340d..925dc4f 100644 Binary files a/screenshots/pmos-dark-800x480.png and b/screenshots/pmos-dark-800x480.png differ diff --git a/screenshots/pmos-dark-960x540.png b/screenshots/pmos-dark-960x540.png index 9965433..395c205 100644 Binary files a/screenshots/pmos-dark-960x540.png and b/screenshots/pmos-dark-960x540.png differ diff --git a/screenshots/pmos-light-1024x768.png b/screenshots/pmos-light-1024x768.png index 645e568..966a356 100644 Binary files a/screenshots/pmos-light-1024x768.png and b/screenshots/pmos-light-1024x768.png differ diff --git a/screenshots/pmos-light-1280x800.png b/screenshots/pmos-light-1280x800.png index 61de1fb..be085fb 100644 Binary files a/screenshots/pmos-light-1280x800.png and b/screenshots/pmos-light-1280x800.png differ diff --git a/screenshots/pmos-light-1440x720.png b/screenshots/pmos-light-1440x720.png index 99ea6a2..fc53b5b 100644 Binary files a/screenshots/pmos-light-1440x720.png and b/screenshots/pmos-light-1440x720.png differ diff --git a/screenshots/pmos-light-1920x1080.png b/screenshots/pmos-light-1920x1080.png index 48d38c6..5c692ef 100644 Binary files a/screenshots/pmos-light-1920x1080.png and b/screenshots/pmos-light-1920x1080.png differ diff --git a/screenshots/pmos-light-480x800.png b/screenshots/pmos-light-480x800.png index 7179e10..a73cfab 100644 Binary files a/screenshots/pmos-light-480x800.png and b/screenshots/pmos-light-480x800.png differ diff --git a/screenshots/pmos-light-540x960.png b/screenshots/pmos-light-540x960.png index abecdb6..5851701 100644 Binary files a/screenshots/pmos-light-540x960.png and b/screenshots/pmos-light-540x960.png differ diff --git a/screenshots/pmos-light-768x1024.png b/screenshots/pmos-light-768x1024.png index f01d022..7e48332 100644 Binary files a/screenshots/pmos-light-768x1024.png and b/screenshots/pmos-light-768x1024.png differ diff --git a/screenshots/pmos-light-800x480.png b/screenshots/pmos-light-800x480.png index 3f6be13..3f21396 100644 Binary files a/screenshots/pmos-light-800x480.png and b/screenshots/pmos-light-800x480.png differ diff --git a/screenshots/pmos-light-960x540.png b/screenshots/pmos-light-960x540.png index e32aac5..20de34a 100644 Binary files a/screenshots/pmos-light-960x540.png and b/screenshots/pmos-light-960x540.png differ