diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index efd4c2ea0..97084f6f0 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -175,7 +175,7 @@ SystemView::SystemView( ) : View { parent_rect }, context_(context) { - style_ = &style_default; + set_style(&style_default); constexpr ui::Dim status_view_height = 16; diff --git a/firmware/common/ui_widget.hpp b/firmware/common/ui_widget.hpp index ba2172b29..929d46ecf 100644 --- a/firmware/common/ui_widget.hpp +++ b/firmware/common/ui_widget.hpp @@ -115,14 +115,14 @@ public: void set_highlighted(const bool value); protected: + void dirty_overlapping_children_in_rect(const Rect& child_rect); + +private: /* Widget rectangle relative to parent pos(). */ Rect parent_rect; const Style* style_ { nullptr }; Widget* parent_ { nullptr }; - void dirty_overlapping_children_in_rect(const Rect& child_rect); - -private: struct flags_t { bool dirty : 1; // Widget content has changed. bool hidden : 1; // Hide widget and children.