From a13e19a907cafc340c7c480defe6437272edcce7 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Tue, 26 Jan 2016 13:00:36 -0800 Subject: [PATCH] Paint background of Text object before string. --- firmware/application/ais_app.cpp | 1 + firmware/common/ui_widget.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/firmware/application/ais_app.cpp b/firmware/application/ais_app.cpp index ef96ec09..c688ae3b 100644 --- a/firmware/application/ais_app.cpp +++ b/firmware/application/ais_app.cpp @@ -299,6 +299,7 @@ void AISRecentEntryDetailView::set_entry(const AISRecentEntry& entry) { AISAppView::AISAppView(NavigationView&) { add_children({ { + &label_app_name, &label_channel, &options_channel, &recent_entries_view, diff --git a/firmware/common/ui_widget.cpp b/firmware/common/ui_widget.cpp index 8564514e..3cddbd40 100644 --- a/firmware/common/ui_widget.cpp +++ b/firmware/common/ui_widget.cpp @@ -291,9 +291,14 @@ void Text::set(const std::string value) { } void Text::paint(Painter& painter) { + const auto rect = screen_rect(); + const auto s = style(); + + painter.fill_rectangle(rect, s.background); + painter.draw_string( - screen_pos(), - style(), + rect.pos, + s, text ); }