luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-14 05:52:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reload text on selection updates even if selection is as expected

Browse source 
if composing region was changed
e.g. KDE Connect removes composing region after entering a letter, and we should be able to deal with it
this is not really a good solution, as it will reload the suggestions, which flashes the underline and has noticeable performance impact

fixes #1141
This commit is contained in:
Helium314 2025-01-05 13:18:14 +01:00
parent d08afcd279
commit d3bd97a104
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/helium314/keyboard/latin/LatinIME.java
View file

@ -1120,7 +1120,7 @@ public class LatinIME extends InputMethodService implements
final SettingsValues settingsValues = mSettings.getCurrent();
if (isInputViewShown()
&& mInputLogic.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd,
settingsValues)) {
composingSpanStart, composingSpanEnd, settingsValues)) {
mKeyboardSwitcher.requestUpdatingShiftState(getCurrentAutoCapsState(),
getCurrentRecapitalizeState());
}

11
app/src/main/java/helium314/keyboard/latin/RichInputConnection.java
View file

@ -1061,10 +1061,17 @@ public final class RichInputConnection implements PrivateCommandPerformer {
* @return whether this is a belated expected update or not.
*/
public boolean isBelatedExpectedUpdate(final int oldSelStart, final int newSelStart,
final int oldSelEnd, final int newSelEnd) {
final int oldSelEnd, final int newSelEnd, final int composingSpanStart, final int composingSpanEnd) {
// This update is "belated" if we are expecting it. That is, mExpectedSelStart and
// mExpectedSelEnd match the new values that the TextView is updating TO.
if (mExpectedSelStart == newSelStart && mExpectedSelEnd == newSelEnd) return true;
if (mExpectedSelStart == newSelStart && mExpectedSelEnd == newSelEnd) {
if (composingSpanEnd - composingSpanStart < mComposingText.length()) {
// composing span is smaller than expected, maybe changed by the app (see #1141)
// larger composing span is ok, because mComposingText only contains the word up to the cursor
return false;
}
return true;
}
// This update is not belated if mExpectedSelStart and mExpectedSelEnd match the old
// values, and one of newSelStart or newSelEnd is updated to a different value. In this
// case, it is likely that something other than the IME has moved the selection endpoint

6
app/src/main/java/helium314/keyboard/latin/inputlogic/InputLogic.java
View file

@ -346,9 +346,9 @@ public final class InputLogic {
* @param settingsValues the current values of the settings.
* @return whether the cursor has moved as a result of user interaction.
*/
public boolean onUpdateSelection(final int oldSelStart, final int oldSelEnd,
final int newSelStart, final int newSelEnd, final SettingsValues settingsValues) {
if (mConnection.isBelatedExpectedUpdate(oldSelStart, newSelStart, oldSelEnd, newSelEnd)) {
public boolean onUpdateSelection(final int oldSelStart, final int oldSelEnd, final int newSelStart,
final int newSelEnd, final int composingSpanStart, final int composingSpanEnd, final SettingsValues settingsValues) {
if (mConnection.isBelatedExpectedUpdate(oldSelStart, newSelStart, oldSelEnd, newSelEnd, composingSpanStart, composingSpanEnd)) {
return false;
}
// TODO: the following is probably better done in resetEntireInputState().