From 6f8ecbbb367cf6d1f6f31adc1051d98963b329d8 Mon Sep 17 00:00:00 2001 From: eshifri Date: Mon, 21 Jun 2021 16:35:54 -0700 Subject: [PATCH 1/2] fix color for the HW diagnostic screen(s) --- radio/src/gui/colorlcd/radio_diaganas.cpp | 2 +- radio/src/gui/colorlcd/radio_diagkeys.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio_diaganas.cpp index f08d848c6..3b24c3cd6 100644 --- a/radio/src/gui/colorlcd/radio_diaganas.cpp +++ b/radio/src/gui/colorlcd/radio_diaganas.cpp @@ -67,7 +67,7 @@ class RadioAnalogsDiagsWindow: public Window { void RadioAnalogsDiagsPage::buildHeader(Window * window) { - new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_ANALOGS, 0, MENU_COLOR); + new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_ANALOGS, 0, MENU_HIGHLIGHT_COLOR); } void RadioAnalogsDiagsPage::buildBody(Window * window) diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp index 6f0c5f033..8d95ce8e6 100644 --- a/radio/src/gui/colorlcd/radio_diagkeys.cpp +++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp @@ -114,7 +114,7 @@ class RadioKeyDiagsWindow : public Window void RadioKeyDiagsPage::buildHeader(Window * window) { - new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_SWITCHES, 0, MENU_COLOR); + new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_SWITCHES, 0, MENU_HIGHLIGHT_COLOR); } void RadioKeyDiagsPage::buildBody(Window * window) From eee081e54065f61fbd17d0dc541893379d6c398b Mon Sep 17 00:00:00 2001 From: eshifri Date: Mon, 21 Jun 2021 21:51:45 -0700 Subject: [PATCH 2/2] Fix #303 --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index cd442c3c1..2eef2e5fa 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -33,8 +33,8 @@ class FileNameEditWindow : public Page FileNameEditWindow(const std::string iName) : Page(ICON_RADIO_SD_MANAGER), name(std::move(iName)) { - buildBody(&body); buildHeader(&header); + buildBody(&body); }; #if defined(DEBUG_WINDOWS) @@ -45,7 +45,7 @@ class FileNameEditWindow : public Page void buildHeader(Window *window) { - new StaticText(window, {70, 4, 180, 30}, STR_RENAME_FILE, MENU_BGCOLOR); + new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_RENAME_FILE, 0, MENU_HIGHLIGHT_COLOR); } void buildBody(Window *window)