From 83d2a54b0fa132949b4eb3dd8b08a8fcac87e28c Mon Sep 17 00:00:00 2001
From: druiz17 <danteruiz102@gmail.com>
Date: Thu, 12 Oct 2017 13:48:21 -0700
Subject: [PATCH] fixed some bugs

---
 interface/resources/qml/desktop/Desktop.qml | 3 ++-
 interface/src/ui/Stats.cpp                  | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index a93dd3cdd7..329e71a305 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -302,11 +302,12 @@ FocusScope {
         for (var i = 0; i < desktop.visibleChildren.length; i++) {
             var child = desktop.visibleChildren[i];
             if (child.hasOwnProperty("modality")) {
-                var mappedPoint = child.mapFromGlobal(point.x, point.y);
+                var mappedPoint = mapToItem(child, point.x, point.y);
                 if (child.hasOwnProperty("frame")) {
                     var outLine = child.frame.children[2];
                     var framePoint = outLine.mapFromGlobal(point.x, point.y);
                     if (child.contains(mappedPoint) || outLine.contains(framePoint)) {
+                        console.log("it should not be here");
                         return true;
                     }
                 }
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 8140dfb8ae..d4a300c337 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -106,14 +106,15 @@ extern std::atomic<size_t> DECIMATED_TEXTURE_COUNT;
 extern std::atomic<size_t> RECTIFIED_TEXTURE_COUNT;
 
 void Stats::updateStats(bool force) {
+    QQuickItem* parent = parentItem();
     if (!force) {
         if (!Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
-            if (isVisible()) {
-                setVisible(false);
+            if (parent->isVisible()) {
+                parent->setVisible(false);
             }
             return;
-        } else if (!isVisible()) {
-            setVisible(true);
+        } else if (!parent->isVisible()) {
+            parent->setVisible(true);
         }
     }