preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-14 18:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53 from unknownbrackets/pointer

Browse Source 
Adjust the deadzone for taps and swipes
This commit is contained in:
Henrik Rydgård committed 2013-03-15 09:04:26 -07:00
2 parents 22136ff257 93ec9dc2ba
commit b9486d43e9
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
ui/ui.cpp
+5 -3
View File
@@ -297,7 +297,8 @@ void UIList::pointerDown(int pointer, float x, float y) {
movedDistanceY = 0.0f;
}
const int holdFrames = 6;
const int holdFramesClick = 3;
const int holdFramesScroll = 10;
void UIList::pointerMove(int pointer, float x, float y, bool inside) {
float deltaX = x - lastX;
@@ -313,7 +314,8 @@ void UIList::pointerMove(int pointer, float x, float y, bool inside) {
inertiaY = 0.8 * inertiaY + 0.2 * -deltaY;
}
if (inside && movedDistanceY > 35 && movedDistanceY > movedDistanceX && !scrolling && uistate.mouseframesdown[0] > holdFrames) {
const int deadzone = 30 * holdFramesScroll;
if (inside && movedDistanceY * uistate.mouseframesdown[0] > deadzone && !scrolling) {
scrolling = true;
}
}
@@ -407,7 +409,7 @@ int UIList::Do(int id, int x, int y, int w, int h, UIListAdapter *adapter) {
if (item_y >= y - itemHeight && item_y <= y + h) {
for (int k = 0; k < 1; k++) { // MAX_POINTERS if we add back multitouch
if (uistate.mousedown[k] &&
uistate.mouseframesdown[k] >= holdFrames &&
uistate.mouseframesdown[k] >= holdFramesClick &&
adapter->itemEnabled(i) &&
!scrolling &&
selected == -1 &&