Merge pull request #5077 from jherico/render_cursor

Always use GL rendered cursor & fix broken cursor after merge

Brad Hefta-Gaub committed 11 years ago

Commit fb4e5a72 parents 759a4a3 78ab6a03 files · +47 −20Browse files

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

Unified · Split

     _window->setVisible(true);
     _glWidget->setFocusPolicy(Qt::StrongFocus);
     _glWidget->setFocus();
+    _glWidget->setCursor(Qt::BlankCursor);
     // enable mouse tracking; otherwise, we only get drag events
     _glWidget->setMouseTracking(true);
     }
     resizeGL();
-    updateCursorVisibility();
 }
 void Application::setLowVelocityFilter(bool lowVelocityFilter) {
     lastMousePos = QCursor::pos();
 }
-void Application::updateCursorVisibility() {
-    if (!_cursorVisible ||
-        Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode) ||
-        Menu::getInstance()->isOptionChecked(MenuOption::Enable3DTVMode)) {
-        _window->setCursor(Qt::BlankCursor);
-    } else {
-        _window->unsetCursor();
-    }
-}
 void Application::setCursorVisible(bool visible) {
     _cursorVisible = visible;
-    updateCursorVisibility();
 }
 void Application::update(float deltaTime) {

Keyboard shortcuts