n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add back PC symbols to default number row when shifted

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-09-23 14:40:16 +03:00
parent 727db278ca
commit fe1b99d896
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/org/futo/inputmethod/v2keyboard/BaseKey.kt
View File

@ -413,6 +413,11 @@ data class CaseSelector(
*/ */
val shifted: Key = normal, val shifted: Key = normal,
/**
* Key to use when shifted, excluding automatic shift
*/
val shiftedManually: Key = shifted,
/** /**
* Key to use when shift locked (caps lock), defaults to [shifted] * Key to use when shift locked (caps lock), defaults to [shifted]
*/ */
@ -434,9 +439,8 @@ data class CaseSelector(
when(elementId) { when(elementId) {
KeyboardId.ELEMENT_ALPHABET -> normal KeyboardId.ELEMENT_ALPHABET -> normal
// KeyboardState.kt currently doesn't distinguish between these KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED -> shifted
KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED, KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED -> shiftedManually
KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED -> shifted
// KeyboardState.kt currently doesn't distinguish between these // KeyboardState.kt currently doesn't distinguish between these
KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED, KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED,

7
java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
View File

@ -107,7 +107,12 @@ data class Row(
} }
val DefaultNumberRow = Row( val DefaultNumberRow = Row(
numbers = "1234567890".map { BaseKey(it.toString()) } numbers = "1234567890".mapIndexed { i, c ->
CaseSelector(
normal = BaseKey(c.toString()),
shiftedManually = BaseKey("!@#$%^&*()"[i].toString())
)
}
) )
val DefaultBottomRow = Row( val DefaultBottomRow = Row(