fix: composing key label not display and reset as expected

if-can · WhiredPlanck · commit 7a3232d4e078 · 2025-01-17T23:21:10.000+08:00
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)) }
         }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ package com.osfans.trime.ime.keyboard`
`8`	`8`	`@Deprecated("Migrate into KeyboardWindow")`
`9`	`9`	`object KeyboardSwitcher {`
`10`	`10`	`lateinit var currentKeyboard: Keyboard`
	`11`	`+ lateinit var currentKeyboardView: KeyboardView`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,6 @@ class KeyboardView(`
`1024`	`1024`	`if (mOldPointerCount > 1 \|\| mComboMode) KeyBehavior.COMBO else KeyBehavior.CLICK,`
`1025`	`1025`	`)`
`1026`	`1026`	`}`
`1027`		`- invalidateAllKeys()`
`1028`	`1027`	`mRepeatKeyIndex = NOT_A_KEY`
`1029`	`1028`	`return false`
`1030`	`1029`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ class KeyboardWindow(`
`123`	`123`	`cachedKeyboards[target] = newKeyboard to it`
`124`	`124`	`}`
`125`	`125`	`newView.let {`
	`126`	`+ KeyboardSwitcher.currentKeyboardView = it`
`126`	`127`	`it.keyboardActionListener = keyboardActionListener`
`127`	`128`	`keyboardView.apply { add(it, lParams(matchParent, matchParent)) }`
`128`	`129`	`}`