From 0e3913baffd9193cd6db957701a38331cc587fd5 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Tue, 9 Jan 2018 09:07:26 +0000 Subject: [PATCH] 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();