Skip to content

Commit 8a4177d

Browse files
goofyzBambooin
authored andcommitted
fix: show toolbar whenever selectLiquidKeyboard() is called
This fixes an unintentional side effect caused by commit db63dab. refs #1177
1 parent c07b2c4 commit 8a4177d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

app/src/main/java/com/osfans/trime/ime/core/Trime.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ public void selectLiquidKeyboard(final int tabIndex) {
330330
mTabRoot.setBackground(mCandidateRoot.getBackground());
331331
mTabRoot.move(tabView.getHightlightLeft(), tabView.getHightlightRight());
332332
}
333+
showLiquidKeyboardToolbar();
333334
} else {
334335
symbolKeyboardType = SymbolKeyboardType.NO_KEY;
335336
// 设置液体键盘处于隐藏状态
@@ -1109,8 +1110,7 @@ public int updateComposing() {
11091110
Timber.d("updateComposing() SymbolKeyboardType=%s", symbolKeyboardType.toString());
11101111
if (symbolKeyboardType != SymbolKeyboardType.NO_KEY
11111112
&& symbolKeyboardType != SymbolKeyboardType.CANDIDATE) {
1112-
mComposition.setWindow();
1113-
showCompositionView(false);
1113+
showLiquidKeyboardToolbar();
11141114
} else {
11151115
mComposition.setVisibility(View.VISIBLE);
11161116
startNum = mComposition.setWindow(minPopupSize, minPopupCheckSize, Integer.MAX_VALUE);
@@ -1133,6 +1133,11 @@ public int updateComposing() {
11331133
return startNum;
11341134
}
11351135

1136+
private void showLiquidKeyboardToolbar() {
1137+
mComposition.changeToLiquidKeyboardToolbar();
1138+
showCompositionView(false);
1139+
}
1140+
11361141
public void showDialogAboveInputView(@NonNull final Dialog dialog) {
11371142
final IBinder token = inputRootBinding.inputRoot.getWindowToken();
11381143
final Window window = dialog.getWindow();

app/src/main/java/com/osfans/trime/ime/text/Composition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ else if (m.containsKey("candidate")) {
581581
}
582582

583583
/** 设置悬浮窗, 用于liquidKeyboard的悬浮窗工具栏 */
584-
public void setWindow() {
584+
public void changeToLiquidKeyboardToolbar() {
585585
if (getVisibility() != View.VISIBLE) return;
586586
if (liquid_keyboard_window_comp.isEmpty()) {
587587
this.setVisibility(GONE);

0 commit comments

Comments
 (0)