From 1dcbad4d28b1003579878fcfdfd019975add1d18 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Sun, 12 Apr 2026 23:38:58 +0200 Subject: [PATCH] More fixes --- src/activities/util/KeyboardEntryActivity.cpp | 3 ++- src/activities/util/KeyboardEntryActivity.h | 1 - src/components/themes/lyra/LyraTheme.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp index 02ed4601..62613ff4 100644 --- a/src/activities/util/KeyboardEntryActivity.cpp +++ b/src/activities/util/KeyboardEntryActivity.cpp @@ -35,7 +35,8 @@ char KeyboardEntryActivity::getSelectedChar() const { if (selectedCol < 0 || selectedCol >= COLS) return '\0'; const KeyDef& key = layout[selectedRow][selectedCol]; - return (shiftState > 0 && key.secondary != '\0') ? key.secondary : key.primary; + const bool useSecondary = !symMode && shiftState > 0 && key.secondary != '\0'; + return useSecondary ? key.secondary : key.primary; } char KeyboardEntryActivity::getAlternativeChar() const { diff --git a/src/activities/util/KeyboardEntryActivity.h b/src/activities/util/KeyboardEntryActivity.h index e28e23f7..c5e29765 100644 --- a/src/activities/util/KeyboardEntryActivity.h +++ b/src/activities/util/KeyboardEntryActivity.h @@ -56,7 +56,6 @@ class KeyboardEntryActivity : public Activity { static constexpr int COLS = 10; static constexpr int ABC_ROWS = 4; static constexpr int SYM_ROWS = 4; - static constexpr int BOTTOM_KEY_COUNT = 5; static constexpr KeyDef abcLayout[ABC_ROWS][COLS] = { {{'0', ')'}, diff --git a/src/components/themes/lyra/LyraTheme.cpp b/src/components/themes/lyra/LyraTheme.cpp index 739a7afb..36fd800b 100644 --- a/src/components/themes/lyra/LyraTheme.cpp +++ b/src/components/themes/lyra/LyraTheme.cpp @@ -800,7 +800,8 @@ void LyraTheme::drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const ch const char* secondaryLabel, const KeyboardKeyType keyType) const { if (isSelected) { renderer.fillRoundedRect(rect.x, rect.y, rect.width, rect.height, cornerRadius, Color::Black); - } else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode || keyType == KeyboardKeyType::Del || + } else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode || + keyType == KeyboardKeyType::Reveal || keyType == KeyboardKeyType::Del || keyType == KeyboardKeyType::Space || keyType == KeyboardKeyType::Ok) { renderer.drawRoundedRect(rect.x, rect.y, rect.width, rect.height, 1, cornerRadius, true); }