From 51c2cc793a173b0ac973d762ee515d65d0888da2 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 12 Jun 2019 10:20:54 -0700 Subject: [PATCH 1/9] Tinkering with toolbar visibility signal - not quite working --- interface/resources/qml/hifi/Desktop.qml | 8 ++++++++ libraries/ui/src/OffscreenUi.cpp | 6 ++++++ libraries/ui/src/OffscreenUi.h | 4 +++- libraries/ui/src/ui/ToolbarScriptingInterface.cpp | 5 +++++ libraries/ui/src/ui/ToolbarScriptingInterface.h | 6 ++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 5fa6234504..64a145b0c5 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -12,6 +12,8 @@ import controlsUit 1.0 OriginalDesktop.Desktop { id: desktop + property alias toolbarObjectName: sysToolbar.objectName + MouseArea { id: hoverWatch anchors.fill: parent @@ -70,7 +72,13 @@ OriginalDesktop.Desktop { x: sysToolbar.x buttonModel: tablet ? tablet.buttons : null; shown: tablet ? tablet.toolbarMode : false; + + onVisibleChanged: { + console.log("ZRF HERE DESKTOP.QML: " + visible); + desktop.toolbarVisibleChanged(visible); + } } + signal toolbarVisibleChanged(bool isVisible); QtSettings.Settings { id: settings; diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp index 1e6a01c187..c39159748d 100644 --- a/libraries/ui/src/OffscreenUi.cpp +++ b/libraries/ui/src/OffscreenUi.cpp @@ -688,6 +688,12 @@ void OffscreenUi::createDesktop(const QUrl& url) { menuInitializer(_vrMenu); } + + QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system" + auto toolbarScriptingInterface = DependencyManager::get(); + _currentToolbarProxy = dynamic_cast(toolbarScriptingInterface->getToolbar(toolbarName)); + connect(_desktop, SIGNAL(toolbarVisibleChanged(bool)), _currentToolbarProxy, SLOT(onToolbarVisibleChanged(bool))); + auto keyboardFocus = new KeyboardFocusHack(); connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop())); emit desktopReady(); diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h index 6abbc486d0..67c23ce41e 100644 --- a/libraries/ui/src/OffscreenUi.h +++ b/libraries/ui/src/OffscreenUi.h @@ -24,6 +24,7 @@ #include #include "ui/OffscreenQmlSurface.h" +#include "ui/ToolbarScriptingInterface.h" #include "OffscreenQmlElement.h" class VrMenu; @@ -270,7 +271,8 @@ private: QList _modalDialogListeners; std::unordered_map _pressedKeys; VrMenu* _vrMenu { nullptr }; - QQueue> _queuedMenuInitializers; + QQueue> _queuedMenuInitializers; + ToolbarProxy* _currentToolbarProxy; }; #endif diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp index d01b538004..ebc22d528b 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp @@ -63,6 +63,11 @@ void ToolbarButtonProxy::editProperties(const QVariantMap& properties) { } } +void ToolbarProxy::onToolbarVisibleChanged(bool isVisible) { + qDebug() << "ZRF HERE IN ENGINE SLOT"; + emit ToolbarProxy::toolbarVisibleChanged(isVisible); +} + ToolbarProxy::ToolbarProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) { Q_ASSERT(QThread::currentThread() == qApp->thread()); } diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.h b/libraries/ui/src/ui/ToolbarScriptingInterface.h index 409ea28fdc..8ce548f7b6 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.h +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.h @@ -129,6 +129,12 @@ public: * @param {string[]} propertyList * @returns {object} */ + +public slots: + void onToolbarVisibleChanged(bool isVisible); + +signals: + void toolbarVisibleChanged(bool isVisible); }; Q_DECLARE_METATYPE(ToolbarProxy*); From fade8f9c043006769e41d8b2aab012a6ef4e01f6 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 12 Jun 2019 12:42:58 -0700 Subject: [PATCH 2/9] It works! --- interface/resources/qml/hifi/Desktop.qml | 6 +++--- libraries/ui/src/OffscreenUi.cpp | 3 +-- libraries/ui/src/ui/ToolbarScriptingInterface.cpp | 10 +++++----- libraries/ui/src/ui/ToolbarScriptingInterface.h | 12 ++++++------ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 64a145b0c5..87647efe3f 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -74,11 +74,11 @@ OriginalDesktop.Desktop { shown: tablet ? tablet.toolbarMode : false; onVisibleChanged: { - console.log("ZRF HERE DESKTOP.QML: " + visible); - desktop.toolbarVisibleChanged(visible); + console.log("ZRF HERE DESKTOP.QML: " + visible + " " + sysToolbar.objectName); + desktop.toolbarVisibleChanged(visible, sysToolbar.objectName); } } - signal toolbarVisibleChanged(bool isVisible); + signal toolbarVisibleChanged(bool isVisible, string toolbarName); QtSettings.Settings { id: settings; diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp index c39159748d..32512e6316 100644 --- a/libraries/ui/src/OffscreenUi.cpp +++ b/libraries/ui/src/OffscreenUi.cpp @@ -691,8 +691,7 @@ void OffscreenUi::createDesktop(const QUrl& url) { QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system" auto toolbarScriptingInterface = DependencyManager::get(); - _currentToolbarProxy = dynamic_cast(toolbarScriptingInterface->getToolbar(toolbarName)); - connect(_desktop, SIGNAL(toolbarVisibleChanged(bool)), _currentToolbarProxy, SLOT(onToolbarVisibleChanged(bool))); + connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SLOT(onToolbarVisibleChanged(bool, QString))); auto keyboardFocus = new KeyboardFocusHack(); connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop())); diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp index ebc22d528b..dc31d08e42 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp @@ -63,11 +63,6 @@ void ToolbarButtonProxy::editProperties(const QVariantMap& properties) { } } -void ToolbarProxy::onToolbarVisibleChanged(bool isVisible) { - qDebug() << "ZRF HERE IN ENGINE SLOT"; - emit ToolbarProxy::toolbarVisibleChanged(isVisible); -} - ToolbarProxy::ToolbarProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) { Q_ASSERT(QThread::currentThread() == qApp->thread()); } @@ -125,3 +120,8 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) { return new ToolbarProxy(rawToolbar); } + +void ToolbarScriptingInterface::onToolbarVisibleChanged(bool isVisible, QString toolbarName) { + qDebug() << "ZRF HERE IN ENGINE SLOT" << isVisible << toolbarName; + emit ToolbarScriptingInterface::toolbarVisibleChanged(isVisible, toolbarName); +} diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.h b/libraries/ui/src/ui/ToolbarScriptingInterface.h index 8ce548f7b6..8266bb93f2 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.h +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.h @@ -129,12 +129,6 @@ public: * @param {string[]} propertyList * @returns {object} */ - -public slots: - void onToolbarVisibleChanged(bool isVisible); - -signals: - void toolbarVisibleChanged(bool isVisible); }; Q_DECLARE_METATYPE(ToolbarProxy*); @@ -156,6 +150,12 @@ public: * @returns {ToolbarProxy} */ Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId); + +public slots: + void onToolbarVisibleChanged(bool isVisible, QString toolbarName); + +signals: + void toolbarVisibleChanged(bool isVisible, QString toolbarName); }; From 34e9acc0b5647040a6f5e6282bc432c5c1bd4517 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 14:31:43 -0700 Subject: [PATCH 3/9] better fix for the toolbar remnant --- interface/resources/qml/hifi/Desktop.qml | 1 - libraries/ui/src/OffscreenUi.cpp | 2 +- .../ui/src/ui/ToolbarScriptingInterface.cpp | 7 +------ .../ui/src/ui/ToolbarScriptingInterface.h | 3 --- scripts/simplifiedUI/ui/simplifiedUI.js | 19 +++++++++++++------ 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 87647efe3f..3239471a00 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -74,7 +74,6 @@ OriginalDesktop.Desktop { shown: tablet ? tablet.toolbarMode : false; onVisibleChanged: { - console.log("ZRF HERE DESKTOP.QML: " + visible + " " + sysToolbar.objectName); desktop.toolbarVisibleChanged(visible, sysToolbar.objectName); } } diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp index 32512e6316..0b114a2e3e 100644 --- a/libraries/ui/src/OffscreenUi.cpp +++ b/libraries/ui/src/OffscreenUi.cpp @@ -691,7 +691,7 @@ void OffscreenUi::createDesktop(const QUrl& url) { QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system" auto toolbarScriptingInterface = DependencyManager::get(); - connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SLOT(onToolbarVisibleChanged(bool, QString))); + connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString))); auto keyboardFocus = new KeyboardFocusHack(); connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop())); diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp index dc31d08e42..7ddc6463c3 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp @@ -119,9 +119,4 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) { } return new ToolbarProxy(rawToolbar); -} - -void ToolbarScriptingInterface::onToolbarVisibleChanged(bool isVisible, QString toolbarName) { - qDebug() << "ZRF HERE IN ENGINE SLOT" << isVisible << toolbarName; - emit ToolbarScriptingInterface::toolbarVisibleChanged(isVisible, toolbarName); -} +} \ No newline at end of file diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.h b/libraries/ui/src/ui/ToolbarScriptingInterface.h index 8266bb93f2..952d3cce95 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.h +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.h @@ -151,9 +151,6 @@ public: */ Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId); -public slots: - void onToolbarVisibleChanged(bool isVisible, QString toolbarName); - signals: void toolbarVisibleChanged(bool isVisible, QString toolbarName); }; diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index bafc5fffe1..84ee93ecbf 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -457,12 +457,19 @@ function onGeometryChanged(rect) { } } -function ensureFirstPersonCameraInHMD(isHMDMode) { +function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person"); } } +function onToolbarVisibleChanged(isVisible, toolbarName) { + var toolbar = Toolbars.getToolbar(toolbarName); + if (isVisible) { + toolbar.writeProperty("visible", false); + } +} + function onStatusChanged() { sendLocalStatusToQml(); @@ -505,11 +512,12 @@ function startup() { updateOutputDeviceMutedOverlay(isOutputMuted()); Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); Window.geometryChanged.connect(onGeometryChanged); - HMD.displayModeChanged.connect(ensureFirstPersonCameraInHMD); + HMD.displayModeChanged.connect(onDisplayModeChanged); Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.systemInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); + Toolbars.toolbarVisibleChanged.connect(onToolbarVisibleChanged); oldShowAudioTools = AvatarInputs.showAudioTools; AvatarInputs.showAudioTools = false; @@ -535,9 +543,7 @@ function shutdown() { if (!HMD.active) { var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); - if (toolbar) { - toolbar.writeProperty("visible", true); - } + toolbar.writeProperty("visible", true); } } @@ -561,11 +567,12 @@ function shutdown() { Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); Window.geometryChanged.disconnect(onGeometryChanged); - HMD.displayModeChanged.disconnect(ensureFirstPersonCameraInHMD); + HMD.displayModeChanged.disconnect(onDisplayModeChanged); Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.systemInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); + Toolbars.toolbarVisibleChanged.disconnect(onToolbarVisibleChanged); AvatarInputs.showAudioTools = oldShowAudioTools; AvatarInputs.showBubbleTools = oldShowBubbleTools; From 8fa80f89350d525e6f0d774041be6efed9108f81 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 14:57:37 -0700 Subject: [PATCH 4/9] fixed some formatting problems --- scripts/simplifiedUI/ui/simplifiedUI.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 91d8096881..84ee93ecbf 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -457,19 +457,9 @@ function onGeometryChanged(rect) { } } -<<<<<<< HEAD -======= -var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700; ->>>>>>> f360adccbc827bb52dc4a73ebe2c6890e8be039e function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person"); - } else if (Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) { - // works for now, but not a permanent fix by any means. - Script.setTimeout(function () { - var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); - toolbar.writeProperty("visible", false); - }, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS); } } From 29d795af5b3b48982141e13e08a1848cfde5f05f Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 15:36:20 -0700 Subject: [PATCH 5/9] 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 #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 #include "ui/OffscreenQmlSurface.h" -#include "ui/ToolbarScriptingInterface.h" #include "OffscreenQmlElement.h" class VrMenu; @@ -272,7 +271,6 @@ private: std::unordered_map _pressedKeys; VrMenu* _vrMenu { nullptr }; QQueue> _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); + } } } From 8dcf6e6a036d74af7707dd19600e879deb2a1f74 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 15:47:19 -0700 Subject: [PATCH 6/9] removed a dead line of code, made a couple formating changes --- libraries/ui/src/OffscreenUi.cpp | 1 - libraries/ui/src/OffscreenUi.h | 2 +- scripts/simplifiedUI/ui/simplifiedUI.js | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp index e49ee811e0..f0b27904ae 100644 --- a/libraries/ui/src/OffscreenUi.cpp +++ b/libraries/ui/src/OffscreenUi.cpp @@ -690,7 +690,6 @@ void OffscreenUi::createDesktop(const QUrl& url) { } - QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system" auto toolbarScriptingInterface = DependencyManager::get(); connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString))); diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h index 13326f8c2d..6abbc486d0 100644 --- a/libraries/ui/src/OffscreenUi.h +++ b/libraries/ui/src/OffscreenUi.h @@ -270,7 +270,7 @@ private: QList _modalDialogListeners; std::unordered_map _pressedKeys; VrMenu* _vrMenu { nullptr }; - QQueue> _queuedMenuInitializers; + QQueue> _queuedMenuInitializers; }; #endif diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 73b3d14fec..45dd02dc2a 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -466,7 +466,9 @@ function onDisplayModeChanged(isHMDMode) { function onToolbarVisibleChanged(isVisible, toolbarName) { if (isVisible && toolbarName == TOOLBAR_NAME) { var toolbar = Toolbars.getToolbar(toolbarName); - toolbar.writeProperty("visible", false); + if (toolbar) { + toolbar.writeProperty("visible", false); + } } } From 3cd3f1a508f2c3acdaa9b345eb24bbf3be0a32f2 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 15:56:27 -0700 Subject: [PATCH 7/9] one last fix --- scripts/simplifiedUI/ui/simplifiedUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 45dd02dc2a..428ade8fd6 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -547,7 +547,9 @@ function shutdown() { if (!HMD.active) { var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); - toolbar.writeProperty("visible", true); + if (toolbar) { + toolbar.writeProperty("visible", true); + } } } From 2eeec3518d860ab34a34bdbebe97e36402ee62be Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 16:03:03 -0700 Subject: [PATCH 8/9] one last fix --- scripts/simplifiedUI/ui/simplifiedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 428ade8fd6..da37038c28 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -464,7 +464,7 @@ function onDisplayModeChanged(isHMDMode) { } function onToolbarVisibleChanged(isVisible, toolbarName) { - if (isVisible && toolbarName == TOOLBAR_NAME) { + if (isVisible && toolbarName == TOOLBAR_NAME && Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) { var toolbar = Toolbars.getToolbar(toolbarName); if (toolbar) { toolbar.writeProperty("visible", false); From e32d6e96ce67b01a2b2627a0e3e5c4e5e146a17d Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 16:12:24 -0700 Subject: [PATCH 9/9] code was backwards --- scripts/simplifiedUI/ui/simplifiedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index da37038c28..16f081fb6b 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -464,7 +464,7 @@ function onDisplayModeChanged(isHMDMode) { } function onToolbarVisibleChanged(isVisible, toolbarName) { - if (isVisible && toolbarName == TOOLBAR_NAME && Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) { + if (isVisible && toolbarName == TOOLBAR_NAME && !Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) { var toolbar = Toolbars.getToolbar(toolbarName); if (toolbar) { toolbar.writeProperty("visible", false);