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

FIx missing button frame for reveal button

Browse Source
This commit is contained in:
jpirnay
2026-04-12 23:27:17 +02:00
parent 32df69ea80
commit bb9687d585
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/util/KeyboardEntryActivity.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ void KeyboardEntryActivity::render(RenderLock&&) {
bottomKeys.push_back({KeyboardKeyType::Shift, symMode ? shiftString[0] : shiftString[shiftState]}); bottomKeys.push_back({KeyboardKeyType::Shift, symMode ? shiftString[0] : shiftString[shiftState]});
bottomKeys.push_back({KeyboardKeyType::Mode, symMode ? "abc" : "#@!"}); bottomKeys.push_back({KeyboardKeyType::Mode, symMode ? "abc" : "#@!"});
if (isPassword) { if (isPassword) {
bottomKeys.push_back({KeyboardKeyType::Normal, passwordVisible ? tr(STR_HIDE) : tr(STR_SHOW)}); bottomKeys.push_back({KeyboardKeyType::Reveal, passwordVisible ? tr(STR_HIDE) : tr(STR_SHOW)});
} }
bottomKeys.push_back({KeyboardKeyType::Space, nullptr}); bottomKeys.push_back({KeyboardKeyType::Space, nullptr});
bottomKeys.push_back({KeyboardKeyType::Del, nullptr}); bottomKeys.push_back({KeyboardKeyType::Del, nullptr});
src/components/themes/BaseTheme.cpp
+3 -2
View File
@@ -884,8 +884,9 @@ void BaseTheme::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.fillRect(rect.x, rect.y, rect.width, rect.height, true); renderer.fillRect(rect.x, rect.y, rect.width, rect.height, true);
} else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode || keyType == KeyboardKeyType::Del || } else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode ||
keyType == KeyboardKeyType::Space || keyType == KeyboardKeyType::Ok) { keyType == KeyboardKeyType::Reveal || keyType == KeyboardKeyType::Space ||
keyType == KeyboardKeyType::Del || keyType == KeyboardKeyType::Ok) {
renderer.drawRect(rect.x, rect.y, rect.width, rect.height); renderer.drawRect(rect.x, rect.y, rect.width, rect.height);
} }
src/components/themes/BaseTheme.h
+1 -1
View File
@@ -68,7 +68,7 @@ struct ThemeMetrics {
enum UIIcon { Folder, Text, Image, Book, File, Recent, Settings, Transfer, Library, Wifi, Hotspot, Weather }; enum UIIcon { Folder, Text, Image, Book, File, Recent, Settings, Transfer, Library, Wifi, Hotspot, Weather };
enum class KeyboardKeyType { Normal, Shift, Mode, Space, Del, Ok }; enum class KeyboardKeyType { Normal, Shift, Mode, Reveal, Space, Del, Ok };
// Default theme implementation (Classic Theme) // Default theme implementation (Classic Theme)
// Additional themes can inherit from this and override methods as needed // Additional themes can inherit from this and override methods as needed