Showing the changes to interface/src/Application.cpp (1 of 31 files). Show all
Unified · Split
| @@ -84,7 +84,6 @@ · 83 unmodified lines | ||
| 84 | 84 | #include <TextRenderer.h> |
| 85 | 85 | #include <UserActivityLogger.h> |
| 86 | 86 | #include <UUID.h> |
| 87 | −#include <OAuthNetworkAccessManager.h> | |
| 88 | 87 | #include <MessageDialog.h> |
| 89 | 88 | |
| 90 | 89 | #include <SceneScriptingInterface.h> |
| @@ -1101,6 +1100,11 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1010 unmodified lines | ||
| 1101 | 1100 | bool isKeypad = event->modifiers().testFlag(Qt::KeypadModifier); |
| 1102 | 1101 | switch (event->key()) { |
| 1103 | 1102 | break; |
| 1103 | + case Qt::Key_Enter: | |
| 1104 | + case Qt::Key_Return: | |
| 1105 | + Menu::getInstance()->triggerOption(MenuOption::AddressBar); | |
| 1106 | + break; | |
| 1107 | + | |
| 1104 | 1108 | case Qt::Key_L: |
| 1105 | 1109 | if (isShifted && isMeta) { |
| 1106 | 1110 | Menu::getInstance()->triggerOption(MenuOption::Log); |
| @@ -1533,9 +1537,11 @@ void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) { · 426 unmodified lines | ||
| 1533 | 1537 | } |
| 1534 | 1538 | |
| 1535 | 1539 | void Application::touchUpdateEvent(QTouchEvent* event) { |
| 1536 | − TouchEvent thisEvent(*event, _lastTouchEvent); | |
| 1537 | − _controllerScriptingInterface.emitTouchUpdateEvent(thisEvent); // send events to any registered scripts | |
| 1538 | − _lastTouchEvent = thisEvent; | |
| 1540 | + if (event->type() == QEvent::TouchUpdate) { | |
| 1541 | + TouchEvent thisEvent(*event, _lastTouchEvent); | |
| 1542 | + _controllerScriptingInterface.emitTouchUpdateEvent(thisEvent); // send events to any registered scripts | |
| 1543 | + _lastTouchEvent = thisEvent; | |
| 1544 | + } | |
| 1539 | 1545 | |
| 1540 | 1546 | // if one of our scripts have asked to capture this event, then stop processing it |
| 1541 | 1547 | if (_controllerScriptingInterface.isTouchCaptured()) { |