Dismiss popup onDetachedFromWindow

tamo · Jan 24, 2025 · bffb6db · bffb6db
1 parent bf4dace
commit bffb6db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/jp/deadend/noname/skk/FlickJPKeyboardView.kt b/app/src/main/java/jp/deadend/noname/skk/FlickJPKeyboardView.kt
@@ -99,6 +99,12 @@ class FlickJPKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView
         keyboard = mJPKeyboard
     }
 
+    override fun onDetachedFromWindow() {
+        if (mPopup?.isShowing == true) mPopup!!.dismiss()
+        super.onDetachedFromWindow()
+        //isShifted = false
+    }
+
     private fun setShiftPosition() {
         val defaultShiftKeys = arrayOf(mShiftKeyJP, mShiftKeyNum, mShiftKeyVoice)
         val defaultKanaKeys = arrayOf(mKanaKeyJP, mKanaKeyNum, mKanaKeyVoice)

diff --git a/app/src/main/java/jp/deadend/noname/skk/GodanKeyboardView.kt b/app/src/main/java/jp/deadend/noname/skk/GodanKeyboardView.kt
@@ -75,7 +75,7 @@ class GodanKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView(c
     }
 
     override fun onDetachedFromWindow() {
-        if (mPopup?.isShowing == true) mPopup!!.dismiss() // これFlickJPにもバックポートすべきか?
+        if (mPopup?.isShowing == true) mPopup!!.dismiss()
         super.onDetachedFromWindow()
         isShifted = false
         isCapsLocked = false