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
27292729 _glWidget->windowHandle()->setFormat(getDefaultOpenGLSurfaceFormat());
27302730
27312731 // 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
27332733 // global share context
27342734 auto globalShareContext = qt_gl_global_share_context();
2735−
2735+
27362736 #if !defined(DISABLE_QML)
27372737 // Build a shared canvas / context for the Chromium processes
27382738 if (!globalShareContext) {
@@ -8554,11 +8554,11 @@ void Application::createLoginDialogOverlay() { · 5815 unmodified lines
85548554
85558555 QList<QVariant> leftPointerTriggerProperties;
85568556 QVariantMap ltClick1 {
8557− { "action", standard["LTClick"] },
8557+ { "action", controller::StandardButtonChannel::LT_CLICK },
85588558 { "button", "Focus" }
85598559 };
85608560 QVariantMap ltClick2 {
8561− { "action", standard["LTClick"] },
8561+ { "action", controller::StandardButtonChannel::LT_CLICK },
85628562 { "button", "Primary" }
85638563 };
85648564
@@ -8580,11 +8580,11 @@ void Application::createLoginDialogOverlay() { · 15 unmodified lines
85808580 const unsigned int rightHand = 1;
85818581 QList<QVariant> rightPointerTriggerProperties;
85828582 QVariantMap rtClick1 {
8583− { "action", standard["RTClick"] },
8583+ { "action", controller::StandardButtonChannel::RT_CLICK },
85848584 { "button", "Focus" }
85858585 };
85868586 QVariantMap rtClick2 {
8587− { "action", standard["RTClick"] },
8587+ { "action", controller::StandardButtonChannel::RT_CLICK },
85888588 { "button", "Primary" }
85898589 };
85908590 rightPointerTriggerProperties.append(rtClick1);
@@ -8799,7 +8799,7 @@ QUuid Application::getTabletFrameID() const { · 208 unmodified lines
87998799 }
88008800
88018801 QVector<QUuid> Application::getTabletIDs() const {
8802− // Most important overlays first.
8802+ // Most important overlays first.
88038803 QVector<QUuid> result;
88048804 auto HMD = DependencyManager::get<HMDScriptingInterface>();
88058805 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