History

Merge remote-tracking branch 'upstream/master' into ui-refactor

Brad Davis committed 11 years ago

Commit dab87612 parents e7b8efc e5df17e17 files · +185 −94Browse files

Showing the changes to interface/src/Application.cpp (1 of 17 files). Show all

Unified · Split

interface/src/Application.cpp+5−3
@@ -1528,9 +1528,11 @@ void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) { · 1527 unmodified lines
1528}1528}
1529 1529
1530void Application::touchUpdateEvent(QTouchEvent* event) {1530void Application::touchUpdateEvent(QTouchEvent* event) {
1531 TouchEvent thisEvent(*event, _lastTouchEvent);1531 if (event->type() == QEvent::TouchUpdate) {
1532 _controllerScriptingInterface.emitTouchUpdateEvent(thisEvent); // send events to any registered scripts1532 TouchEvent thisEvent(*event, _lastTouchEvent);
1533 _lastTouchEvent = thisEvent;1533 _controllerScriptingInterface.emitTouchUpdateEvent(thisEvent); // send events to any registered scripts
1534 _lastTouchEvent = thisEvent;
1535 }
1534 1536
1535 // if one of our scripts have asked to capture this event, then stop processing it1537 // if one of our scripts have asked to capture this event, then stop processing it
1536 if (_controllerScriptingInterface.isTouchCaptured()) {1538 if (_controllerScriptingInterface.isTouchCaptured()) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t