From e58dcf6dc5332c60a346509436f9934d9e3bbfbb Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 12 Jun 2024 18:46:07 +1000 Subject: WIP fix issues introduced by lvgl version bump --- src/tangara/ui/screen.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/tangara/ui/screen.hpp') 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 -- cgit v1.2.3