History

Merge branch 'ui-refactor' into m_and_m

Brad Davis committed 11 years ago

Commit fbdb9b12 parents 1ff8c67 9fbd5d731 files · +419 −323Browse files

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

Unified · Split

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