Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:29:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hopefully good now

Browse source
This commit is contained in:
Preston Bezos 2019-06-12 15:36:20 -07:00
parent 8fa80f8935
commit 29d795af5b
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/ui/src/OffscreenUi.cpp
View file

@ -27,6 +27,7 @@
#include "VrMenu.h" #include "VrMenu.h"
#include "ui/Logging.h" #include "ui/Logging.h"
#include "ui/ToolbarScriptingInterface.h"
#include <PointerManager.h> #include <PointerManager.h>
#include "MainWindow.h" #include "MainWindow.h"

2
libraries/ui/src/OffscreenUi.h
View file

@ -24,7 +24,6 @@
#include <DependencyManager.h> #include <DependencyManager.h>
#include "ui/OffscreenQmlSurface.h" #include "ui/OffscreenQmlSurface.h"
#include "ui/ToolbarScriptingInterface.h"
#include "OffscreenQmlElement.h" #include "OffscreenQmlElement.h"
class VrMenu; class VrMenu;
@ -272,7 +271,6 @@ private:
std::unordered_map<int, bool> _pressedKeys; std::unordered_map<int, bool> _pressedKeys;
VrMenu* _vrMenu { nullptr }; VrMenu* _vrMenu { nullptr };
QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers; QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers;
ToolbarProxy* _currentToolbarProxy;
}; };
#endif #endif

2
libraries/ui/src/ui/ToolbarScriptingInterface.cpp
View file

@ -119,4 +119,4 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) {
} }
return new ToolbarProxy(rawToolbar); return new ToolbarProxy(rawToolbar);
} }

8
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -464,8 +464,8 @@ function onDisplayModeChanged(isHMDMode) {
} }
function onToolbarVisibleChanged(isVisible, toolbarName) { function onToolbarVisibleChanged(isVisible, toolbarName) {
var toolbar = Toolbars.getToolbar(toolbarName); if (isVisible && toolbarName == TOOLBAR_NAME) {
if (isVisible) { var toolbar = Toolbars.getToolbar(toolbarName);
toolbar.writeProperty("visible", false); toolbar.writeProperty("visible", false);
} }
} }
@ -497,7 +497,9 @@ function startup() {
if (!HMD.active) { if (!HMD.active) {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
toolbar.writeProperty("visible", false); if (toolbar) {
toolbar.writeProperty("visible", false);
}
} }
} }