keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden

Thijs Wenker committed 11 years ago

Commit de3afa01 parent 9dbcefe2 files · +16 −5Browse files

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

Unified · Split

         _touchAvgX(0.0f),
         _touchAvgY(0.0f),
         _isTouchPressed(false),
+        _cursorVisible(true),
         _mousePressed(false),
         _enableProcessOctreeThread(true),
         _octreeProcessor(),
     auto glCanvas = DependencyManager::get<GLCanvas>();
     resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+    updateCursorVisibility();
 }
 void Application::setLowVelocityFilter(bool lowVelocityFilter) {
     lastMousePos = QCursor::pos();
 }
-void Application::setCursorVisible(bool visible) {
+void Application::updateCursorVisibility() {
-    if (visible) {
+    if (!_cursorVisible || Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode)) {
-        DependencyManager::get<GLCanvas>()->unsetCursor();
-    } else {
         DependencyManager::get<GLCanvas>()->setCursor(Qt::BlankCursor);
+    } else {
+        DependencyManager::get<GLCanvas>()->unsetCursor();
     }
 }
+void Application::setCursorVisible(bool visible) {
+    _cursorVisible = visible;
+    updateCursorVisibility();
+}
 void Application::update(float deltaTime) {
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::update()");

Keyboard shortcuts