Skip to content

Fix: alternate key blue highlighting based on hold setting (#492) #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

Fix: alternate key blue highlighting based on hold setting (#492) #502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
802b790
Fix: alternate key blue highlighting based on hold setting (#492)
Akshaykomar890 Oct 6, 2025
77def9e
Merge branch 'main' into remove-scribe-blue
andrewtavis Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions app/src/main/java/be/scri/views/KeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,11 +1505,18 @@ class KeyboardView
}
selectedKeyIndex = Math.max(0, Math.min(selectedKeyIndex, keysCnt - 1))

for (i in 0 until keysCnt) {
mMiniKeyboard!!.mKeys[i].focused = i == selectedKeyIndex
if (setHoldForAltCharacters) {
for (i in 0 until keysCnt) {
mMiniKeyboard!!.mKeys[i].focused = i == selectedKeyIndex
}
mMiniKeyboardSelectedKeyIndex = selectedKeyIndex
} else {
for (i in 0 until keysCnt) {
mMiniKeyboard!!.mKeys[i].focused = false
}
mMiniKeyboardSelectedKeyIndex = -1
}

mMiniKeyboardSelectedKeyIndex = selectedKeyIndex
mMiniKeyboard!!.invalidateAllKeys()
val miniShiftStatus = if (isShifted()) SHIFT_ON_PERMANENT else SHIFT_OFF
mMiniKeyboard!!.setShifted(miniShiftStatus)
Expand Down Expand Up @@ -1559,9 +1566,14 @@ class KeyboardView
selectedKeyIndex = selectedKeyIndex.coerceIn(0, keysCnt - 1)

if (selectedKeyIndex != mMiniKeyboardSelectedKeyIndex) {
// Update focus highlight.
for (i in 0 until keysCnt) {
miniKeyboard.mKeys[i].focused = i == selectedKeyIndex
if (setHoldForAltCharacters) {
for (i in 0 until keysCnt) {
miniKeyboard.mKeys[i].focused = i == selectedKeyIndex
}
} else {
for (i in 0 until keysCnt) {
miniKeyboard.mKeys[i].focused = false
}
}
miniKeyboard.invalidateAllKeys()

Expand Down
Loading