diff options
| author | jacqueline <me@jacqueline.id.au> | 2024-06-14 13:34:41 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2024-06-14 13:34:41 +1000 |
| commit | 5086ab96ea648cd842addb02b188f29bff7bbadd (patch) | |
| tree | 7a3579d655c906ace9e76c394c33eb164d7ce7aa /src/tangara/ui/screen.cpp | |
| parent | 194f0e6b59259986b36448c376788c227d490f06 (diff) | |
| parent | 37ed3996017e43b343e4880981d70c4a6d4a5636 (diff) | |
| download | tangara-fw-5086ab96ea648cd842addb02b188f29bff7bbadd.tar.gz | |
Merge branch 'jqln/lvgl-bump'
Diffstat (limited to 'src/tangara/ui/screen.cpp')
| -rw-r--r-- | src/tangara/ui/screen.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tangara/ui/screen.cpp b/src/tangara/ui/screen.cpp index 8357cfbd..5541b6be 100644 --- a/src/tangara/ui/screen.cpp +++ b/src/tangara/ui/screen.cpp @@ -10,7 +10,6 @@ #include "core/lv_obj_pos.h" #include "core/lv_obj_tree.h" -#include "hal/lv_hal_disp.h" #include "misc/lv_area.h" #include "misc/lv_color.h" @@ -19,20 +18,15 @@ namespace ui { Screen::Screen() : root_(lv_obj_create(NULL)), content_(lv_obj_create(root_)), - modal_content_(lv_obj_create(root_)), alert_(lv_obj_create(root_)), - group_(lv_group_create()), - modal_group_(nullptr) { + group_(lv_group_create()) { lv_obj_set_size(root_, lv_pct(100), lv_pct(100)); lv_obj_set_size(content_, lv_pct(100), lv_pct(100)); - lv_obj_set_size(modal_content_, lv_pct(100), lv_pct(100)); lv_obj_set_size(alert_, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_center(root_); lv_obj_center(content_); - lv_obj_center(modal_content_); lv_obj_center(alert_); - lv_obj_set_style_bg_opa(modal_content_, LV_OPA_TRANSP, 0); lv_obj_set_style_bg_opa(alert_, LV_OPA_TRANSP, 0); lv_obj_set_scrollbar_mode(root_, LV_SCROLLBAR_MODE_OFF); |
