From c27ad2349bd9a66c027398a688b85b46bb2cfa26 Mon Sep 17 00:00:00 2001 From: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Date: Thu, 19 Feb 2026 21:49:43 -0500 Subject: [PATCH] Suppress Navigation bar for Freetext frames --- src/graphics/draw/UIRenderer.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/graphics/draw/UIRenderer.cpp b/src/graphics/draw/UIRenderer.cpp index 4a16ef774..662ad4e63 100644 --- a/src/graphics/draw/UIRenderer.cpp +++ b/src/graphics/draw/UIRenderer.cpp @@ -1423,9 +1423,12 @@ void UIRenderer::drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *sta const int totalWidth = (pageEnd - pageStart) * iconSize + (pageEnd - pageStart - 1) * spacing; const int xStart = (SCREEN_WIDTH - totalWidth) / 2; - // Suppress nav overlay while canned-message text compose UI is active (freetext + emote picker). - const bool hideForTextCompose = (cannedMessageModule && cannedMessageModule->isFreeTextUIActive()); - bool navBarVisible = !hideForTextCompose && (millis() - lastFrameChangeTime <= ICON_DISPLAY_DURATION_MS); + // Suppress nav overlay entirely + if (cannedMessageModule && cannedMessageModule->isFreeTextUIActive()) { + return; + } + + bool navBarVisible = millis() - lastFrameChangeTime <= ICON_DISPLAY_DURATION_MS; int y = navBarVisible ? (SCREEN_HEIGHT - iconSize - 1) : SCREEN_HEIGHT; #if defined(USE_EINK) @@ -1455,10 +1458,6 @@ void UIRenderer::drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *sta navBarPrevVisible = navBarVisible; #endif - if (!navBarVisible) { - return; - } - // Pre-calculate bounding rect const int rectX = xStart - 2 - bigOffset; const int rectWidth = totalWidth + 4 + (bigOffset * 2);