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
10821082
10831083 void Application::mouseMoveEvent(QMouseEvent* event) {
10841084 _lastMouseMove = usecTimestampNow();
1085− if (_mouseHidden && !isFullscreenOculus()) {
1085+ if (_mouseHidden) {
10861086 getGLWidget()->setCursor(Qt::ArrowCursor);
10871087 _mouseHidden = false;
10881088 _seenMouseMove = true;
@@ -1658,10 +1658,6 @@ void Application::findAxisAlignment() { · 569 unmodified lines
16581658 }
16591659 }
16601660
1661−bool Application::isFullscreenOculus() const {
1662− return OculusManager::isConnected() && _window->windowState().testFlag(Qt::WindowFullScreen);
1663−}
1664−
16651661 void Application::nudgeVoxels() {
16661662 VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
16671663 if (!Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && selectedNode) {
@@ -2400,7 +2396,7 @@ void Application::updateCursor(float deltaTime) { · 732 unmodified lines
24002396 uint64_t now = usecTimestampNow();
24012397 int elapsed = now - _lastMouseMove;
24022398 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)) {
24042400 getGLWidget()->setCursor(Qt::BlankCursor);
24052401 _mouseHidden = true;
24062402 }

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