History

tweak to UI size, clean up screen to overlay

Brad Hefta-Gaub committed 10 years ago

Commit 7be58111 parent d1e10677 files · +27 −62Browse files

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

Unified · Split

interface/src/Application.cpp+2−3
@@ -1265,8 +1265,7 @@ void Application::initializeUi() { · 1264 unmodified lines
1265 auto displayPlugin = getActiveDisplayPlugin();1265 auto displayPlugin = getActiveDisplayPlugin();
1266 if (displayPlugin->isHmd()) {1266 if (displayPlugin->isHmd()) {
1267 _compositor.handleRealMouseMoveEvent(false);1267 _compositor.handleRealMouseMoveEvent(false);
1268 auto fakeScreen = _compositor.getReticlePosition();1268 auto resultVec = _compositor.getReticlePosition();
1269 auto resultVec = _compositor.screenToOverlay(fakeScreen); // toGlm(pt));
1270 result = QPointF(resultVec.x, resultVec.y);1269 result = QPointF(resultVec.x, resultVec.y);
1271 }1270 }
1272 return result.toPoint();1271 return result.toPoint();
@@ -2579,7 +2578,7 @@ void Application::setLowVelocityFilter(bool lowVelocityFilter) { · 1306 unmodified lines
2579 2578
2580ivec2 Application::getMouse() {2579ivec2 Application::getMouse() {
2581 if (isHMDMode()) {2580 if (isHMDMode()) {
2582 return _compositor.screenToOverlay(getTrueMouse());2581 return getTrueMouse(); // FIXME
2583 }2582 }
2584 return getTrueMouse();2583 return getTrueMouse();
2585}2584}