diff options
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index 530ac9e7e..392ec8194 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -179,7 +179,9 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi duration = times[index] - times[index - 1]; } else if (0 < index && index < inputSize - 1) { length = getDistanceInt(xCoordinates[index - 1], yCoordinates[index - 1], - xCoordinates[index + 1], yCoordinates[index + 1]); + xCoordinates[index], yCoordinates[index]) + + getDistanceInt(xCoordinates[index], yCoordinates[index], + xCoordinates[index + 1], yCoordinates[index + 1]); duration = times[index + 1] - times[index - 1]; } else { length = 0; @@ -202,7 +204,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi const int x = mInputXs[i]; const int y = mInputYs[i]; const float normalizedSquaredDistance = - mProximityInfo->getNormalizedSquaredDistanceFromCenterFloat(k, x, y); + mProximityInfo->getNormalizedSquaredDistanceFromCenterFloatG(k, x, y); mDistanceCache[index] = normalizedSquaredDistance; if (normalizedSquaredDistance < NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD) { mNearKeysVector[i].set(k, 1); @@ -234,7 +236,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi memset(mNormalizedSquaredDistances, NOT_A_DISTANCE, sizeof(mNormalizedSquaredDistances)); memset(mPrimaryInputWord, 0, sizeof(mPrimaryInputWord)); mTouchPositionCorrectionEnabled = mInputSize > 0 && mHasTouchPositionCorrectionData - && xCoordinates && yCoordinates && !isGeometric; + && xCoordinates && yCoordinates; if (!isGeometric && pointerId == 0) { for (int i = 0; i < inputSize; ++i) { mPrimaryInputWord[i] = getPrimaryCharAt(i); @@ -298,7 +300,7 @@ float ProximityInfoState::updateNearKeysDistances(const int x, const int y, const int keyCount = mProximityInfo->getKeyCount(); float nearestKeyDistance = mMaxPointToKeyLength; for (int k = 0; k < keyCount; ++k) { - const float dist = mProximityInfo->getNormalizedSquaredDistanceFromCenterFloat(k, x, y); + const float dist = mProximityInfo->getNormalizedSquaredDistanceFromCenterFloatG(k, x, y); if (dist < NEAR_KEY_THRESHOLD) { currentNearKeysDistances->insert(std::pair<int, float>(k, dist)); } @@ -509,7 +511,7 @@ float ProximityInfoState::getPointToKeyLength(const int inputIndex, const int co return min(mDistanceCache[index] * scale, mMaxPointToKeyLength); } if (isSkippableChar(codePoint)) { - return 0; + return 0.0f; } // If the char is not a key on the keyboard then return the max length. return MAX_POINT_TO_KEY_LENGTH; |