History

Screw it; just use the standard mouse hiding.

Andrzej Kapolka committed 12 years ago

Commit fa5f8b01 parent bdba0572 files · +2 −8Browse files

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

Unified · Split

interface/src/Application.cpp+2−6
@@ -1082,7 +1082,7 @@ void Application::keyReleaseEvent(QKeyEvent* event) { · 1081 unmodified lines
1082 1082
1083void Application::mouseMoveEvent(QMouseEvent* event) {1083void Application::mouseMoveEvent(QMouseEvent* event) {
1084 _lastMouseMove = usecTimestampNow();1084 _lastMouseMove = usecTimestampNow();
1085 if (_mouseHidden && !isFullscreenOculus()) {1085 if (_mouseHidden) {
1086 getGLWidget()->setCursor(Qt::ArrowCursor);1086 getGLWidget()->setCursor(Qt::ArrowCursor);
1087 _mouseHidden = false;1087 _mouseHidden = false;
1088 _seenMouseMove = true;1088 _seenMouseMove = true;
@@ -1658,10 +1658,6 @@ void Application::findAxisAlignment() { · 569 unmodified lines
1658 }1658 }
1659}1659}
1660 1660
1661bool Application::isFullscreenOculus() const {
1662 return OculusManager::isConnected() && _window->windowState().testFlag(Qt::WindowFullScreen);
1663}
1664
1665void Application::nudgeVoxels() {1661void Application::nudgeVoxels() {
1666 VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);1662 VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
1667 if (!Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && selectedNode) {1663 if (!Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && selectedNode) {
@@ -2400,7 +2396,7 @@ void Application::updateCursor(float deltaTime) { · 732 unmodified lines
2400 uint64_t now = usecTimestampNow();2396 uint64_t now = usecTimestampNow();
2401 int elapsed = now - _lastMouseMove;2397 int elapsed = now - _lastMouseMove;
2402 const int HIDE_CURSOR_TIMEOUT = 1 * 1000 * 1000; // 1 second2398 const int HIDE_CURSOR_TIMEOUT = 1 * 1000 * 1000; // 1 second
2403 if ((elapsed > HIDE_CURSOR_TIMEOUT && (underMouse || !_seenMouseMove)) || isFullscreenOculus()) {2399 if (elapsed > HIDE_CURSOR_TIMEOUT && (underMouse || !_seenMouseMove)) {
2404 getGLWidget()->setCursor(Qt::BlankCursor);2400 getGLWidget()->setCursor(Qt::BlankCursor);
2405 _mouseHidden = true;2401 _mouseHidden = true;
2406 }2402 }

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