From 3a709c51c494bc6727df805f6131fb98323ea9c4 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sun, 7 Feb 2016 10:40:06 -0800 Subject: [PATCH] Hide more Widget member variables. --- firmware/application/ui_navigation.cpp | 2 +- firmware/common/ui_widget.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index efd4c2ea..97084f6f 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 ba2172b2..929d46ec 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.