Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -3220,6 +3220,7 @@ void Application::setSettingConstrainToolbarPosition(bool setting) { · 3219 unmodified lines | ||
| 3220 | 3220 | void Application::showHelp() { |
| 3221 | 3221 | static const QString HAND_CONTROLLER_NAME_VIVE = "vive"; |
| 3222 | 3222 | static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus"; |
| 3223 | + static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR"; | |
| 3223 | 3224 | |
| 3224 | 3225 | static const QString TAB_KEYBOARD_MOUSE = "kbm"; |
| 3225 | 3226 | static const QString TAB_GAMEPAD = "gamepad"; |
| @@ -3234,9 +3235,13 @@ void Application::showHelp() { · 8 unmodified lines | ||
| 3234 | 3235 | } else if (PluginUtils::isOculusTouchControllerAvailable()) { |
| 3235 | 3236 | defaultTab = TAB_HAND_CONTROLLERS; |
| 3236 | 3237 | handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH; |
| 3238 | + } else if (qApp->getActiveDisplayPlugin()->getName() == "WindowMS") { | |
| 3239 | + defaultTab = TAB_HAND_CONTROLLERS; | |
| 3240 | + handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR; | |
| 3237 | 3241 | } else if (PluginUtils::isXboxControllerAvailable()) { |
| 3238 | 3242 | defaultTab = TAB_GAMEPAD; |
| 3239 | 3243 | } |
| 3244 | + // TODO need some way to detect windowsMR to load controls reference default tab in Help > Controls Reference menu. | |
| 3240 | 3245 | |
| 3241 | 3246 | QUrlQuery queryString; |
| 3242 | 3247 | queryString.addQueryItem("handControllerName", handControllerName); |