From 18d11d28d482a411ad19e51ad81225cec5f60d77 Mon Sep 17 00:00:00 2001 From: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Date: Thu, 15 May 2025 12:14:24 -0400 Subject: [PATCH] Line added to non-inverted header --- src/graphics/Screen.cpp | 4 ++-- src/graphics/SharedUIDisplay.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 5b97a5f80..8b201da27 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1504,7 +1504,7 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat !defined(DISPLAY_FORCE_SMALL_FONTS) display->drawFastImage(x, y + 3, 8, 8, imgUser); #else - display->drawFastImage(x, y, 8, 8, imgUser); + display->drawFastImage(x, y + 1, 8, 8, imgUser); #endif display->drawString(x + 10, y - 2, usersString); int string_offset = (SCREEN_WIDTH > 128) ? 2 : 1; @@ -2571,7 +2571,7 @@ static void drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *state, i config.display.heading_bold = false; // Display Region and Channel Utilization - drawNodes(display, x + 1, compactFirstLine + 3, nodeStatus, -1, false, "online"); + drawNodes(display, x + 1, compactFirstLine + 2, nodeStatus, -1, false, "online"); uint32_t uptime = millis() / 1000; char uptimeStr[6]; diff --git a/src/graphics/SharedUIDisplay.cpp b/src/graphics/SharedUIDisplay.cpp index 39c2f3fec..080ca66f4 100644 --- a/src/graphics/SharedUIDisplay.cpp +++ b/src/graphics/SharedUIDisplay.cpp @@ -62,6 +62,12 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y) if (isInverted) { drawRoundedHighlight(display, x, y, screenW, highlightHeight, 2); display->setColor(BLACK); + } else { + if (screenW > 128) { + display->drawLine(0, 20, screenW, 20); + } else { + display->drawLine(0, 14, screenW, 14); + } } // === Battery State ===