fix: composing key label not display and reset as expected

osfans · Jan 16, 2025 · deb7c99 · deb7c99
1 parent b14a5ac
commit deb7c99
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -55,6 +55,7 @@ import com.osfans.trime.ime.candidates.suggestion.InlineSuggestionHandler
 import com.osfans.trime.ime.composition.ComposingPopupWindow
 import com.osfans.trime.ime.keyboard.InitializationUi
 import com.osfans.trime.ime.keyboard.InputFeedbackManager
+import com.osfans.trime.ime.keyboard.KeyboardSwitcher
 import com.osfans.trime.util.findSectionFrom
 import com.osfans.trime.util.forceShowSelf
 import com.osfans.trime.util.isNightMode
@@ -236,6 +237,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                         commitText(commit.text)
                     }
                     updateComposingText(ctx)
+                    KeyboardSwitcher.currentKeyboardView.invalidateAllKeys()
                 }
             is RimeMessage.KeyMessage ->
                 it.data.let event@{

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt
@@ -8,4 +8,5 @@ package com.osfans.trime.ime.keyboard
 @Deprecated("Migrate into KeyboardWindow")
 object KeyboardSwitcher {
     lateinit var currentKeyboard: Keyboard
+    lateinit var currentKeyboardView: KeyboardView
 }
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt
@@ -1024,7 +1024,6 @@ class KeyboardView(
                     if (mOldPointerCount > 1 || mComboMode) KeyBehavior.COMBO else KeyBehavior.CLICK,
                 )
             }
-            invalidateAllKeys()
             mRepeatKeyIndex = NOT_A_KEY
             return false
         }

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
@@ -123,6 +123,7 @@ class KeyboardWindow(
                 cachedKeyboards[target] = newKeyboard to it
             }
         newView.let {
+            KeyboardSwitcher.currentKeyboardView = it
             it.keyboardActionListener = keyboardActionListener
             keyboardView.apply { add(it, lParams(matchParent, matchParent)) }
         }