From 29d795af5b3b48982141e13e08a1848cfde5f05f Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Wed, 12 Jun 2019 15:36:20 -0700
Subject: [PATCH] hopefully good now
---
libraries/ui/src/OffscreenUi.cpp | 1 +
libraries/ui/src/OffscreenUi.h | 2 --
libraries/ui/src/ui/ToolbarScriptingInterface.cpp | 2 +-
scripts/simplifiedUI/ui/simplifiedUI.js | 8 +++++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 0b114a2e3e..e49ee811e0 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -27,6 +27,7 @@
#include "VrMenu.h"
#include "ui/Logging.h"
+#include "ui/ToolbarScriptingInterface.h"
#include <PointerManager.h>
#include "MainWindow.h"
diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h
index 67c23ce41e..13326f8c2d 100644
--- a/libraries/ui/src/OffscreenUi.h
+++ b/libraries/ui/src/OffscreenUi.h
@@ -24,7 +24,6 @@
#include <DependencyManager.h>
#include "ui/OffscreenQmlSurface.h"
-#include "ui/ToolbarScriptingInterface.h"
#include "OffscreenQmlElement.h"
class VrMenu;
@@ -272,7 +271,6 @@ private:
std::unordered_map<int, bool> _pressedKeys;
VrMenu* _vrMenu { nullptr };
QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers;
- ToolbarProxy* _currentToolbarProxy;
};
#endif
diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
index 7ddc6463c3..d01b538004 100644
--- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
+++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
@@ -119,4 +119,4 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) {
}
return new ToolbarProxy(rawToolbar);
-}
\ No newline at end of file
+}
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 84ee93ecbf..73b3d14fec 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -464,8 +464,8 @@ function onDisplayModeChanged(isHMDMode) {
}
function onToolbarVisibleChanged(isVisible, toolbarName) {
- var toolbar = Toolbars.getToolbar(toolbarName);
- if (isVisible) {
+ if (isVisible && toolbarName == TOOLBAR_NAME) {
+ var toolbar = Toolbars.getToolbar(toolbarName);
toolbar.writeProperty("visible", false);
}
}
@@ -497,7 +497,9 @@ function startup() {
if (!HMD.active) {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
- toolbar.writeProperty("visible", false);
+ if (toolbar) {
+ toolbar.writeProperty("visible", false);
+ }
}
}