mirror/LeanKeyboard
1
0
Fork 0
mirror of https://github.com/yuliskov/LeanKeyboard.git synced 2026-04-21 15:36:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

cyclic scroll: fin

Browse Source
This commit is contained in:
Yuriy Liskov
2020-06-30 21:18:44 +03:00
parent 1f4e245d7f
commit 65fe03ebd1
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardContainer.java
View File

@@ -679,20 +679,31 @@ public class LeanbackKeyboardContainer {
}
public void updateCyclicFocus(int dir, KeyFocus oldFocus, KeyFocus newFocus) {
if (oldFocus.equals(newFocus)) {
if (oldFocus.equals(newFocus) || newFocus.index == 0) { // submit button has index 0
if (LeanKeyPreferences.instance(mContext).getCyclicNavigationEnabled()) {
if (dir == DIRECTION_LEFT) {
offsetRect(mRect, mMainKeyboardView);
// rightmost key (usually ok button)
int keyIdx = mMainKeyboardView.getNearestIndex(mRect.right, mY - mRect.top);
Key key = mMainKeyboardView.getKey(keyIdx);
configureFocus(newFocus, mRect, keyIdx, key, 0);
boolean onSameRow = oldFocus.rect.top < mRect.bottom/2f && mRect.bottom/2f < oldFocus.rect.bottom;
if (onSameRow) {
offsetRect(mRect, mActionButtonView);
configureFocus(newFocus, mRect, 0, KeyFocus.TYPE_ACTION);
} else {
// rightmost key (usually ok button)
int keyIdx = mMainKeyboardView.getNearestIndex(mRect.right, mY - mRect.top);
Key key = mMainKeyboardView.getKey(keyIdx);
configureFocus(newFocus, mRect, keyIdx, key, 0);
}
} else if (dir == DIRECTION_RIGHT) {
offsetRect(mRect, mMainKeyboardView);
// leftmost key (usually a button)
int keyIdx = mMainKeyboardView.getNearestIndex(0, mY - mRect.top);
Key key = mMainKeyboardView.getKey(keyIdx);
configureFocus(newFocus, mRect, keyIdx, key, 0);
boolean onSameRow = Math.abs(oldFocus.rect.bottom - newFocus.rect.bottom) < 20;
if (oldFocus.index == 0 || !onSameRow) {
offsetRect(mRect, mMainKeyboardView);
// leftmost key (usually a button)
int keyIdx = mMainKeyboardView.getNearestIndex(0, mY - mRect.top);
Key key = mMainKeyboardView.getKey(keyIdx);
configureFocus(newFocus, mRect, keyIdx, key, 0);
}
}
}