fix: show toolbar whenever selectLiquidKeyboard() is called

This fixes an unintentional side effect caused by commit db63dab. refs #1177
osfans · Jan 18, 2024 · 8a4177d · 8a4177d
1 parent c07b2c4
commit 8a4177d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java
@@ -330,6 +330,7 @@ public void selectLiquidKeyboard(final int tabIndex) {
         mTabRoot.setBackground(mCandidateRoot.getBackground());
         mTabRoot.move(tabView.getHightlightLeft(), tabView.getHightlightRight());
       }
+      showLiquidKeyboardToolbar();
     } else {
       symbolKeyboardType = SymbolKeyboardType.NO_KEY;
       // 设置液体键盘处于隐藏状态
@@ -1109,8 +1110,7 @@ public int updateComposing() {
         Timber.d("updateComposing() SymbolKeyboardType=%s", symbolKeyboardType.toString());
         if (symbolKeyboardType != SymbolKeyboardType.NO_KEY
             && symbolKeyboardType != SymbolKeyboardType.CANDIDATE) {
-          mComposition.setWindow();
-          showCompositionView(false);
+          showLiquidKeyboardToolbar();
         } else {
           mComposition.setVisibility(View.VISIBLE);
           startNum = mComposition.setWindow(minPopupSize, minPopupCheckSize, Integer.MAX_VALUE);
@@ -1133,6 +1133,11 @@ public int updateComposing() {
     return startNum;
   }
 
+  private void showLiquidKeyboardToolbar() {
+    mComposition.changeToLiquidKeyboardToolbar();
+    showCompositionView(false);
+  }
+
   public void showDialogAboveInputView(@NonNull final Dialog dialog) {
     final IBinder token = inputRootBinding.inputRoot.getWindowToken();
     final Window window = dialog.getWindow();

diff --git a/app/src/main/java/com/osfans/trime/ime/text/Composition.java b/app/src/main/java/com/osfans/trime/ime/text/Composition.java
@@ -581,7 +581,7 @@ else if (m.containsKey("candidate")) {
   }
 
   /** 设置悬浮窗, 用于liquidKeyboard的悬浮窗工具栏 */
-  public void setWindow() {
+  public void changeToLiquidKeyboardToolbar() {
     if (getVisibility() != View.VISIBLE) return;
     if (liquid_keyboard_window_comp.isEmpty()) {
       this.setVisibility(GONE);