n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add decomposeTapPosition fallback for nonintersecting cases

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-01-22 08:21:27 +02:00
parent 5e0722c984
commit 7aea41eede
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
native/jni/src/suggest/core/layout/proximity_info.h
View File

@ -147,6 +147,7 @@ class ProximityInfo {
float tapRadius = MOST_COMMON_KEY_WIDTH / 1.33f;
float totalArea = M_PI * ((float)(tapRadius * tapRadius));
bool anySet = false;
for(int key = 0; key < KEY_COUNT; key++) {
const int left = mKeyXCoordinates[key];
const int top = mKeyYCoordinates[key];
@ -154,6 +155,33 @@ class ProximityInfo {
const int bottom = top + mKeyHeights[key];
percentages[key] = insmat::area(left, right, bottom, top, tapX, tapY, tapRadius) / totalArea;
if(percentages[key] > 0.05f) {
anySet = true;
}
}
if(!anySet) {
// Fallback - have to pick the closest key
AKLOGE("FALLBACK - Have to pick closest key");
int closestKey = -1;
int minDistance = 1000000;
for(int key = 0; key < KEY_COUNT; key++) {
const int keyX = mKeyXCoordinates[key];
const int keyY = mKeyYCoordinates[key];
const int distance = (keyX - tapX) * (keyX - tapX) + (keyY - tapY) * (keyY - tapY);
if(distance < minDistance) {
minDistance = distance;
closestKey = key;
}
}
if(closestKey != -1) {
percentages[closestKey] = 1.0f;
} else {
AKLOGE("Failed to find even the closest key!");
}
}
return percentages;