uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't make horizontal scrolling and vertical scrolling affect each other.

Browse Source
This commit is contained in:
László Monda
2017-12-14 01:30:06 +01:00
parent 6a54944cb1
commit 23459e3791
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
right/src/usb_report_updater.c
View File

@@ -99,15 +99,21 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
float distance = kineticState->currentSpeed * elapsedTime / 1000; float distance = kineticState->currentSpeed * elapsedTime / 1000;
if (kineticState->isScroll && !kineticState->wasMoveAction) { if (kineticState->isScroll && !kineticState->wasMoveAction) {
kineticState->xSum = 0; kineticState->xSum = 0;
kineticState->ySum = 0; kineticState->ySum = 0;
} }
// Update horizontal state
bool horizontalMovement = true;
if (activeMouseStates[kineticState->leftState]) { if (activeMouseStates[kineticState->leftState]) {
kineticState->xSum -= distance; kineticState->xSum -= distance;
} else if (activeMouseStates[kineticState->rightState]) { } else if (activeMouseStates[kineticState->rightState]) {
kineticState->xSum += distance; kineticState->xSum += distance;
} else {
horizontalMovement = false;
} }
float xSumInt; float xSumInt;
@@ -115,15 +121,20 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
kineticState->xSum = xSumFrac; kineticState->xSum = xSumFrac;
kineticState->xOut = xSumInt; kineticState->xOut = xSumInt;
if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->xOut == 0) { if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->xOut == 0 && horizontalMovement) {
kineticState->xOut = kineticState->xSum > 0 ? 1 : -1; kineticState->xOut = kineticState->xSum > 0 ? 1 : -1;
kineticState->xSum = 0; kineticState->xSum = 0;
} }
// Update vertical state
bool verticalMovement = true;
if (activeMouseStates[kineticState->upState]) { if (activeMouseStates[kineticState->upState]) {
kineticState->ySum -= distance; kineticState->ySum -= distance;
} else if (activeMouseStates[kineticState->downState]) { } else if (activeMouseStates[kineticState->downState]) {
kineticState->ySum += distance; kineticState->ySum += distance;
} else {
verticalMovement = false;
} }
float ySumInt; float ySumInt;
@@ -131,7 +142,7 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
kineticState->ySum = ySumFrac; kineticState->ySum = ySumFrac;
kineticState->yOut = ySumInt; kineticState->yOut = ySumInt;
if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->yOut == 0) { if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->yOut == 0 && verticalMovement) {
kineticState->yOut = kineticState->ySum > 0 ? 1 : -1; kineticState->yOut = kineticState->ySum > 0 ? 1 : -1;
kineticState->ySum = 0; kineticState->ySum = 0;
} }