From af8d0dc2801b5d2d10e35008335ac7ea9cea03a1 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Mon, 9 May 2016 11:34:52 -0700
Subject: [PATCH] Fix setReticlePosition and getReticlePosition to match.

---
 .../src/display-plugins/CompositorHelper.cpp   | 18 +++---------------
 .../src/display-plugins/CompositorHelper.h     |  2 --
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
index b8da7bd4f7..f9d527de8f 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
@@ -258,7 +258,7 @@ glm::vec2 CompositorHelper::getReticlePosition() const {
         QMutexLocker locker(&_reticleLock);
         return _reticlePositionInHMD;
     }
-    return toGlm(QCursor::pos());
+    return toGlm(_renderingWidget->mapFromGlobal(QCursor::pos()));
 }
 
 bool CompositorHelper::getReticleOverDesktop() const {
@@ -324,20 +324,8 @@ void CompositorHelper::setReticlePosition(const glm::vec2& position, bool sendFa
             sendFakeMouseEvent();
         }
     } else {
-        if (!_mainWindow) {
-            auto windows = qApp->topLevelWindows();
-            QWindow* result = nullptr;
-            for (auto window : windows) {
-                QVariant isMainWindow = window->property("MainWindow");
-                if (!qobject_cast<QQuickWindow*>(window)) {
-                    result = window;
-                    break;
-                }
-            }
-            _mainWindow = result;;
-        }
-        const int MENU_BAR_HEIGHT = 20;
-        QCursor::setPos(position.x + _mainWindow->x(), position.y + _mainWindow->y() + MENU_BAR_HEIGHT);
+        const QPoint point(position.x, position.y);
+        QCursor::setPos(_renderingWidget->mapToGlobal(point));
     }
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.h b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
index 83a1adde17..c0b53b329e 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.h
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
@@ -17,7 +17,6 @@
 #include <QtCore/QPropertyAnimation>
 #include <QtGui/QCursor>
 #include <QtGui/QMouseEvent>
-#include <QtGui/QWindow>
 
 #include <GLMHelpers.h>
 #include <Transform.h>
@@ -183,7 +182,6 @@ private:
     bool _fakeMouseEvent { false };
 
     ReticleInterface* _reticleInterface { nullptr };
-    QWindow* _mainWindow { nullptr };
 };
 
 // Scripting interface available to control the Reticle