aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info.cpp
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-02-01 19:59:40 +0900
committerKen Wakasa <kwakasa@google.com>2013-02-01 19:59:40 +0900
commitee456af9d4c7ce4fe2dc0513a8b2cf08c21b5f21 (patch)
tree36b3f1b3d91a8df930a369c6176e8c4636c5520b /native/jni/src/proximity_info.cpp
parent0ae5b07b3bab96fcd832ea17644d5c5f2c5ba678 (diff)
downloadlatinime-ee456af9d4c7ce4fe2dc0513a8b2cf08c21b5f21.tar.gz
latinime-ee456af9d4c7ce4fe2dc0513a8b2cf08c21b5f21.tar.xz
latinime-ee456af9d4c7ce4fe2dc0513a8b2cf08c21b5f21.zip
Cleanup in ProximityInfoParams
Change-Id: I4302e3cb2470cee32f9ac2f04e0837fff67ce0cd
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
-rw-r--r--native/jni/src/proximity_info.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 3979cfa9a..d812745ca 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -24,6 +24,7 @@
#include "geometry_utils.h"
#include "jni.h"
#include "proximity_info.h"
+#include "proximity_info_params.h"
namespace latinime {
@@ -127,17 +128,15 @@ bool ProximityInfo::hasSpaceProximity(const int x, const int y) const {
float ProximityInfo::getNormalizedSquaredDistanceFromCenterFloatG(
const int keyId, const int x, const int y) const {
- const static float verticalSweetSpotScaleForGeometric = 1.1f;
const bool correctTouchPosition = hasTouchPositionCorrectionData();
- const float centerX = static_cast<float>(correctTouchPosition
- ? getSweetSpotCenterXAt(keyId)
+ const float centerX = static_cast<float>(correctTouchPosition ? getSweetSpotCenterXAt(keyId)
: getKeyCenterXOfKeyIdG(keyId));
const float visualKeyCenterY = static_cast<float>(getKeyCenterYOfKeyIdG(keyId));
float centerY;
if (correctTouchPosition) {
const float sweetSpotCenterY = static_cast<float>(getSweetSpotCenterYAt(keyId));
const float gapY = sweetSpotCenterY - visualKeyCenterY;
- centerY = visualKeyCenterY + gapY * verticalSweetSpotScaleForGeometric;
+ centerY = visualKeyCenterY + gapY * ProximityInfoParams::VERTICAL_SWEET_SPOT_SCALE_G;
} else {
centerY = visualKeyCenterY;
}