From dae0ed81ba6214bd64bc98d758892d597b06d699 Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Wed, 15 Apr 2026 19:02:20 +0200
Subject: [PATCH] Fix help + X3 layout issue

---
 src/activities/util/KeyboardEntryActivity.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp
index c3434494..f334e076 100644
--- a/src/activities/util/KeyboardEntryActivity.cpp
+++ b/src/activities/util/KeyboardEntryActivity.cpp
@@ -296,7 +296,7 @@ void KeyboardEntryActivity::loop() {
 void KeyboardEntryActivity::render(RenderLock&&) {
   renderer.clearScreen();
 
-  const Rect contentRect = UITheme::getContentRect(renderer, true, false);
+  const Rect contentRect = UITheme::getContentRect(renderer, true, true);
   const int pageWidth = contentRect.width;
   const int pageHeight = contentRect.height;
   const int contentX = contentRect.x;
@@ -375,11 +375,12 @@ void KeyboardEntryActivity::render(RenderLock&&) {
     helpTexts[2] = tr(STR_KEYBOARD_HELP_DEFAULT_LINE_3);
   }
 
-  const int helpTop = inputStartY + inputHeight + metrics.verticalSpacing;
-  const int helpHeight = keyboardStartY - helpTop;
+  const int helpGap = keyboardStartY - (inputStartY + inputHeight);
   const int helpLineHeight = renderer.getLineHeight(SMALL_FONT_ID);
-  const int maxHelpLines = std::max(0, helpHeight / helpLineHeight);
+  const int maxHelpLines = std::max(0, helpGap / helpLineHeight);
   const int helpLineCount = std::min(3, maxHelpLines);
+  const int helpBodyHeight = helpLineCount * helpLineHeight;
+  const int helpTop = inputStartY + inputHeight + std::max(0, (helpGap - helpBodyHeight) / 2);
   const int helpLineWidth = pageWidth - 2 * metrics.contentSidePadding;
   for (int i = 0; i < helpLineCount; ++i) {
     const char* helpText = helpTexts[i];
@@ -422,6 +423,9 @@ void KeyboardEntryActivity::render(RenderLock&&) {
         } else {
           cursorPixelX = contentX + effectiveMargin + beforeWidth;
         }
+        if (cursorPos == static_cast<size_t>(lineEndIdx) && cursorPos == displayText.length()) {
+          cursorPixelX += 2;
+        }
         cursorLineY = inputStartY + inputHeight;
         cursorDrawn = true;
         isCursorLine = true;