From efb33ff1af1550d153e97e9b18c12ee1d39835db Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 12 Jun 2022 19:11:54 +0200 Subject: [PATCH] fix(widget): update layout before computing main zone --- radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp | 3 --- radio/src/gui/colorlcd/view_main_decoration.cpp | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp b/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp index ed710df4a..2f4b9123f 100644 --- a/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp @@ -106,9 +106,6 @@ void Layout::adjustLayout() // and update relevant windows updateZones(); - - // probably not needed - //invalidate(); } rect_t Layout::getMainZone() const diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp index 7f0a2333b..9f5e9e121 100644 --- a/radio/src/gui/colorlcd/view_main_decoration.cpp +++ b/radio/src/gui/colorlcd/view_main_decoration.cpp @@ -98,6 +98,9 @@ void ViewMainDecoration::setFlightModeVisible(bool visible) rect_t ViewMainDecoration::getMainZone() const { + // update layout first + lv_obj_update_layout(parent->getLvObj()); + auto x_left = lv_obj_get_x2(w_ml->getLvObj()) + 1; auto x_right = lv_obj_get_x(w_mr->getLvObj());