summaryrefslogtreecommitdiff
path: root/src/tangara/ui/screen.hpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-06-12 18:46:07 +1000
committerjacqueline <me@jacqueline.id.au>2024-06-12 18:46:07 +1000
commite58dcf6dc5332c60a346509436f9934d9e3bbfbb (patch)
treef1b5cf9c7d99739008ff52dbd837c574b2b0ea36 /src/tangara/ui/screen.hpp
parent64bd9053a25297f7a442ca831c7da5b44bd33f84 (diff)
downloadtangara-fw-e58dcf6dc5332c60a346509436f9934d9e3bbfbb.tar.gz
WIP fix issues introduced by lvgl version bump
Diffstat (limited to 'src/tangara/ui/screen.hpp')
-rw-r--r--src/tangara/ui/screen.hpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/tangara/ui/screen.hpp b/src/tangara/ui/screen.hpp
index 40284fda..4a9976ba 100644
--- a/src/tangara/ui/screen.hpp
+++ b/src/tangara/ui/screen.hpp
@@ -34,25 +34,16 @@ class Screen {
auto content() -> lv_obj_t* { return content_; }
auto alert() -> lv_obj_t* { return alert_; }
- auto modal_content() -> lv_obj_t* { return modal_content_; }
- auto modal_group(lv_group_t* g) -> void { modal_group_ = g; }
- auto group() -> lv_group_t* {
- if (modal_group_) {
- return modal_group_;
- }
- return group_;
- }
+ auto group() -> lv_group_t* { return group_; }
virtual auto canPop() -> bool = 0;
protected:
lv_obj_t* const root_;
lv_obj_t* content_;
- lv_obj_t* modal_content_;
lv_obj_t* alert_;
lv_group_t* const group_;
- lv_group_t* modal_group_;
};
} // namespace ui