Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6372 from ZappoMan/rightClickMenu

Browse source 
Tweaks to "click"
This commit is contained in:
Seth Alves 2015-11-11 17:27:50 -08:00
commit 315b5e9da2
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
View file

@ -16,6 +16,7 @@
#include <controllers/UserInputMapper.h> #include <controllers/UserInputMapper.h>
#include <PathUtils.h> #include <PathUtils.h>
#include <NumericalConstants.h>
const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse"; const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse";
@ -63,7 +64,8 @@ void KeyboardMouseDevice::mousePressEvent(QMouseEvent* event, unsigned int devic
// key pressed again ? without catching the release event ? // key pressed again ? without catching the release event ?
} }
_lastCursor = event->pos(); _lastCursor = event->pos();
_mousePressAt = event->pos(); _mousePressTime = usecTimestampNow();
_mouseMoved = false;
eraseMouseClicked(); eraseMouseClicked();
} }
@ -72,10 +74,11 @@ void KeyboardMouseDevice::mouseReleaseEvent(QMouseEvent* event, unsigned int dev
auto input = _inputDevice->makeInput((Qt::MouseButton) event->button()); auto input = _inputDevice->makeInput((Qt::MouseButton) event->button());
_inputDevice->_buttonPressedMap.erase(input.getChannel()); _inputDevice->_buttonPressedMap.erase(input.getChannel());
// if we pressed and released at the same location, then create a "_CLICKED" input for this button // if we pressed and released at the same location within a small time window, then create a "_CLICKED"
// we might want to add some small tolerance to this so if you do a small drag it still counts as // input for this button we might want to add some small tolerance to this so if you do a small drag it
// a clicked. // till counts as a clicked.
if (_mousePressAt == event->pos()) { static const int CLICK_TIME = USECS_PER_MSEC * 500; // 500 ms to click
if (!_mouseMoved && (usecTimestampNow() - _mousePressTime < CLICK_TIME)) {
_inputDevice->_buttonPressedMap.insert(_inputDevice->makeInput((Qt::MouseButton) event->button(), true).getChannel()); _inputDevice->_buttonPressedMap.insert(_inputDevice->makeInput((Qt::MouseButton) event->button(), true).getChannel());
} }
} }
@ -97,6 +100,7 @@ void KeyboardMouseDevice::mouseMoveEvent(QMouseEvent* event, unsigned int device
_inputDevice->_axisStateMap[MOUSE_AXIS_Y_NEG] = (currentMove.y() > 0 ? currentMove.y() : 0.0f); _inputDevice->_axisStateMap[MOUSE_AXIS_Y_NEG] = (currentMove.y() > 0 ? currentMove.y() : 0.0f);
_lastCursor = currentPos; _lastCursor = currentPos;
_mouseMoved = true;
eraseMouseClicked(); eraseMouseClicked();
} }

3
libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h
View file

@ -115,7 +115,8 @@ public:
protected: protected:
QPoint _lastCursor; QPoint _lastCursor;
QPoint _mousePressAt; quint64 _mousePressTime;
bool _mouseMoved;
glm::vec2 _lastTouch; glm::vec2 _lastTouch;
std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() }; std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() };