eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
jpirnay
2026-04-12 23:38:58 +02:00
parent 5d8e73349b
commit 1dcbad4d28
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/util/KeyboardEntryActivity.cpp
+2 -1
View File
@@ -35,7 +35,8 @@ char KeyboardEntryActivity::getSelectedChar() const {
if (selectedCol < 0 || selectedCol >= COLS) return '\0'; if (selectedCol < 0 || selectedCol >= COLS) return '\0';
const KeyDef& key = layout[selectedRow][selectedCol]; 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 { char KeyboardEntryActivity::getAlternativeChar() const {
src/activities/util/KeyboardEntryActivity.h
-1
View File
@@ -56,7 +56,6 @@ class KeyboardEntryActivity : public Activity {
static constexpr int COLS = 10; static constexpr int COLS = 10;
static constexpr int ABC_ROWS = 4; static constexpr int ABC_ROWS = 4;
static constexpr int SYM_ROWS = 4; static constexpr int SYM_ROWS = 4;
static constexpr int BOTTOM_KEY_COUNT = 5;
static constexpr KeyDef abcLayout[ABC_ROWS][COLS] = { static constexpr KeyDef abcLayout[ABC_ROWS][COLS] = {
{{'0', ')'}, {{'0', ')'},
src/components/themes/lyra/LyraTheme.cpp
+2 -1
View File
@@ -800,7 +800,8 @@ void LyraTheme::drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const ch
const char* secondaryLabel, const KeyboardKeyType keyType) const { const char* secondaryLabel, const KeyboardKeyType keyType) const {
if (isSelected) { if (isSelected) {
renderer.fillRoundedRect(rect.x, rect.y, rect.width, rect.height, cornerRadius, Color::Black); 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) { keyType == KeyboardKeyType::Space || keyType == KeyboardKeyType::Ok) {
renderer.drawRoundedRect(rect.x, rect.y, rect.width, rect.height, 1, cornerRadius, true); renderer.drawRoundedRect(rect.x, rect.y, rect.width, rect.height, 1, cornerRadius, true);
} }