From 47038e43495967e5a69c73588bff15ea69e772f7 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cdonaghey728@gmail.com>
Date: Sun, 7 Jan 2018 08:31:36 +0000
Subject: [PATCH 1/3] WL 21664 - Window.innerHeight should not include the menu
 bar

---
 .../src/scripting/WindowScriptingInterface.cpp   | 16 ++++++++++------
 .../src/scripting/WindowScriptingInterface.h     |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 4b355653b6..7fe7022e47 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -176,10 +176,6 @@ bool  WindowScriptingInterface::isPointOnDesktopWindow(QVariant point) {
     return offscreenUi->isPointOnDesktopWindow(point);
 }
 
-glm::vec2 WindowScriptingInterface::getDeviceSize() const {
-    return qApp->getDeviceSize();
-}
-
 /// Makes sure that the reticle is visible, use this in blocking forms that require a reticle and
 /// might be in same thread as a script that sets the reticle to invisible
 void WindowScriptingInterface::ensureReticleVisible() const {
@@ -391,11 +387,19 @@ QString WindowScriptingInterface::checkVersion() {
 }
 
 int WindowScriptingInterface::getInnerWidth() {
-    return qApp->getWindow()->geometry().width();
+    return qApp->getDeviceSize().x;
 }
 
 int WindowScriptingInterface::getInnerHeight() {
-    return qApp->getWindow()->geometry().height();
+    return qApp->getDeviceSize().y;
+}
+
+int WindowScriptingInterface::getMenuHeight() {
+    return qApp->getPrimaryMenu()->geometry().height();
+}
+
+glm::vec2 WindowScriptingInterface::getDeviceSize() const {
+    return qApp->getDeviceSize();
 }
 
 int WindowScriptingInterface::getX() {
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index d223f95af4..57ada00ed8 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -39,11 +39,14 @@ class WindowScriptingInterface : public QObject, public Dependency {
     Q_PROPERTY(int innerHeight READ getInnerHeight)
     Q_PROPERTY(int x READ getX)
     Q_PROPERTY(int y READ getY)
+    Q_PROPERTY(int menuHeight READ getMenuHeight)
+
 public:
     WindowScriptingInterface();
     ~WindowScriptingInterface();
     int getInnerWidth();
     int getInnerHeight();
+    int getMenuHeight();
     int getX();
     int getY();
 

From 0e3913baffd9193cd6db957701a38331cc587fd5 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cdonaghey728@gmail.com>
Date: Tue, 9 Jan 2018 09:07:26 +0000
Subject: [PATCH 2/3] Removed Window.menuHeight

---
 interface/src/scripting/WindowScriptingInterface.cpp | 4 ----
 interface/src/scripting/WindowScriptingInterface.h   | 2 --
 2 files changed, 6 deletions(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 7fe7022e47..5677e6b32e 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -394,10 +394,6 @@ int WindowScriptingInterface::getInnerHeight() {
     return qApp->getDeviceSize().y;
 }
 
-int WindowScriptingInterface::getMenuHeight() {
-    return qApp->getPrimaryMenu()->geometry().height();
-}
-
 glm::vec2 WindowScriptingInterface::getDeviceSize() const {
     return qApp->getDeviceSize();
 }
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 57ada00ed8..3b8412900f 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -39,14 +39,12 @@ class WindowScriptingInterface : public QObject, public Dependency {
     Q_PROPERTY(int innerHeight READ getInnerHeight)
     Q_PROPERTY(int x READ getX)
     Q_PROPERTY(int y READ getY)
-    Q_PROPERTY(int menuHeight READ getMenuHeight)
 
 public:
     WindowScriptingInterface();
     ~WindowScriptingInterface();
     int getInnerWidth();
     int getInnerHeight();
-    int getMenuHeight();
     int getX();
     int getY();
 

From b26e31a36244579a41516b79d84754ea122c34fd Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 10 Jan 2018 20:27:19 +0000
Subject: [PATCH 3/3] Copy paste? Never!

---
 interface/src/scripting/WindowScriptingInterface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 3b8412900f..33ff8d1f96 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -1,5 +1,5 @@
 //
-//  WindowScriptingInterface.cpp
+//  WindowScriptingInterface.h
 //  interface/src/scripting
 //
 //  Created by Ryan Huffman on 4/29/14.