Skip to content

Commit 5c5a033

Browse files
committed
fix: incorrect sound effect on press of some keys
1 parent 5cb29ef commit 5c5a033

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

app/src/main/java/com/osfans/trime/data/soundeffect/SoundEffect.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data class SoundEffect(
3535

3636
fun querySoundIndex(keyCode: Int): Int {
3737
if (sounds.isEmpty()) return -1
38-
if (sysKeyCodes.isEmpty() && minKeyCode >= maxKeyCode) return -1
38+
if (sysKeyCodes.isEmpty() && minKeyCode > maxKeyCode) return -1
3939
if (sysKeyCodes.isEmpty()) {
4040
if (keyCode !in minKeyCode..maxKeyCode) return -1
4141
return sounds[if (inOrder) (keyCode - minKeyCode) % sounds.size else sounds.indices.random()]

app/src/main/java/com/osfans/trime/ime/keyboard/InputFeedbackManager.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@ object InputFeedbackManager {
122122
var index = 0
123123
for (key in effect.keyset) {
124124
val i = key.querySoundIndex(keyCode)
125-
if (i >= 0) index = i
126-
break
125+
if (i >= 0) {
126+
index = i
127+
break
128+
}
127129
}
128130
Timber.d("without melody: index: $index, sounds.size=${sounds.size}")
129131
index

0 commit comments

Comments
 (0)