From c703cb3ac9b19dc142a572b95a809acefbc481c6 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 16 Dec 2024 21:32:37 +1100 Subject: [PATCH] fix(color): solid background for fullscreen warning dialogs (#5712) --- radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp index 83261aa8e29..27413dff43f 100644 --- a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp +++ b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp @@ -40,13 +40,11 @@ FullScreenDialog::FullScreenDialog( confirmHandler(confirmHandler) { setWindowFlag(OPAQUE); + etx_solid_bg(lvobj, COLOR_THEME_WARNING_INDEX); // In case alert raised while splash screen is showing. cancelSplash(); - Window* p = Layer::back(); - if (p) p->hide(); - Layer::push(this); bringToTop(); @@ -72,8 +70,7 @@ void FullScreenDialog::build() { auto div = new Window(this, {0, ALERT_FRAME_TOP, LCD_W, ALERT_FRAME_HEIGHT}); div->setWindowFlag(NO_FOCUS); - etx_bg_color(div->getLvObj(), COLOR_THEME_PRIMARY2_INDEX); - etx_obj_add_style(div->getLvObj(), styles->bg_opacity_50, LV_PART_MAIN); + etx_solid_bg(div->getLvObj(), COLOR_THEME_PRIMARY2_INDEX); new StaticIcon( this, ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP, @@ -175,8 +172,8 @@ void FullScreenDialog::deleteLater(bool detach, bool trash) Layer::pop(this); Window::deleteLater(detach, trash); } - Window* p = Layer::back(); - if (p) p->show(); + // Window* p = Layer::back(); + // if (p) p->show(); } void FullScreenDialog::setMessage(std::string text)