History

changing button channel to enum

Wayne Chen committed 8 years ago

Commit 23141661 parent 7f805eb1 file · +7 −7Browse files

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

Unified · Split

interface/src/Application.cpp+7−7
@@ -2729,10 +2729,10 @@ void Application::initializeGL() { · 2728 unmodified lines
2729 _glWidget->windowHandle()->setFormat(getDefaultOpenGLSurfaceFormat());2729 _glWidget->windowHandle()->setFormat(getDefaultOpenGLSurfaceFormat());
2730 2730
2731 // When loading QtWebEngineWidgets, it creates a global share context on startup.2731 // When loading QtWebEngineWidgets, it creates a global share context on startup.
2732 // We have to account for this possibility by checking here for an existing 2732 // We have to account for this possibility by checking here for an existing
2733 // global share context2733 // global share context
2734 auto globalShareContext = qt_gl_global_share_context();2734 auto globalShareContext = qt_gl_global_share_context();
2735 2735
2736#if !defined(DISABLE_QML)2736#if !defined(DISABLE_QML)
2737 // Build a shared canvas / context for the Chromium processes2737 // Build a shared canvas / context for the Chromium processes
2738 if (!globalShareContext) {2738 if (!globalShareContext) {
@@ -8554,11 +8554,11 @@ void Application::createLoginDialogOverlay() { · 5815 unmodified lines
8554 8554
8555 QList<QVariant> leftPointerTriggerProperties;8555 QList<QVariant> leftPointerTriggerProperties;
8556 QVariantMap ltClick1 {8556 QVariantMap ltClick1 {
8557 { "action", standard["LTClick"] },8557 { "action", controller::StandardButtonChannel::LT_CLICK },
8558 { "button", "Focus" }8558 { "button", "Focus" }
8559 };8559 };
8560 QVariantMap ltClick2 {8560 QVariantMap ltClick2 {
8561 { "action", standard["LTClick"] },8561 { "action", controller::StandardButtonChannel::LT_CLICK },
8562 { "button", "Primary" }8562 { "button", "Primary" }
8563 };8563 };
8564 8564
@@ -8580,11 +8580,11 @@ void Application::createLoginDialogOverlay() { · 15 unmodified lines
8580 const unsigned int rightHand = 1;8580 const unsigned int rightHand = 1;
8581 QList<QVariant> rightPointerTriggerProperties;8581 QList<QVariant> rightPointerTriggerProperties;
8582 QVariantMap rtClick1 {8582 QVariantMap rtClick1 {
8583 { "action", standard["RTClick"] },8583 { "action", controller::StandardButtonChannel::RT_CLICK },
8584 { "button", "Focus" }8584 { "button", "Focus" }
8585 };8585 };
8586 QVariantMap rtClick2 {8586 QVariantMap rtClick2 {
8587 { "action", standard["RTClick"] },8587 { "action", controller::StandardButtonChannel::RT_CLICK },
8588 { "button", "Primary" }8588 { "button", "Primary" }
8589 };8589 };
8590 rightPointerTriggerProperties.append(rtClick1);8590 rightPointerTriggerProperties.append(rtClick1);
@@ -8799,7 +8799,7 @@ QUuid Application::getTabletFrameID() const { · 208 unmodified lines
8799}8799}
8800 8800
8801QVector<QUuid> Application::getTabletIDs() const {8801QVector<QUuid> Application::getTabletIDs() const {
8802 // Most important overlays first. 8802 // Most important overlays first.
8803 QVector<QUuid> result;8803 QVector<QUuid> result;
8804 auto HMD = DependencyManager::get<HMDScriptingInterface>();8804 auto HMD = DependencyManager::get<HMDScriptingInterface>();
8805 result << HMD->getCurrentTabletScreenID();8805 result << HMD->getCurrentTabletScreenID();

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