storm/thunderpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from etbh/master

Browse Source 
Fix for #46 : Positive mapping of axis not released when one of the bindings is set to a mouse button
This commit is contained in:
Mathias Panzenböck
2021-04-15 02:07:35 +02:00
committed by GitHub
parent 0800b91218 e86bb12144
commit ed64d1faf5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/axis.cpp
View File

@ -12,6 +12,7 @@ Axis::Axis( int i, QObject *parent ) : QObject(parent) {
index = i; index = i;
isOn = false; isOn = false;
isDown = false; isDown = false;
useMouse = false;
state = 0; state = 0;
interpretation = ZeroOne; interpretation = ZeroOne;
gradient = false; gradient = false;
@ -378,7 +379,7 @@ void Axis::move( bool press ) {
//dialog being open and blocking events from happening. //dialog being open and blocking events from happening.
if (isDown == press) return; if (isDown == press) return;
isDown = press; isDown = press;
bool useMouse = (state > 0)?puseMouse:nuseMouse; useMouse = (state == 0 )? useMouse: (state > 0) ?puseMouse:nuseMouse;
if (press) { if (press) {
e.type = useMouse ? FakeEvent::MouseDown : FakeEvent::KeyDown; e.type = useMouse ? FakeEvent::MouseDown : FakeEvent::KeyDown;
downkey = (state > 0)?pkeycode:nkeycode; downkey = (state > 0)?pkeycode:nkeycode;

2
src/axis.h
View File

@ -72,6 +72,8 @@ class Axis : public QObject {
virtual void move( bool press ); virtual void move( bool press );
//is a key currently depressed? //is a key currently depressed?
bool isDown; bool isDown;
//is a mouse button currently in use?
bool useMouse;
//variables for calculating quadratic used for gradient mouse axes //variables for calculating quadratic used for gradient mouse axes
float inverseRange; float inverseRange;