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

removed a dead line of code, made a couple formating changes

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

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

@ -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<ToolbarScriptingInterface>(); auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>();
connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString))); connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString)));

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

@ -270,7 +270,7 @@ private:
QList<QObject*> _modalDialogListeners; QList<QObject*> _modalDialogListeners;
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;
}; };
#endif #endif

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

@ -466,7 +466,9 @@ function onDisplayModeChanged(isHMDMode) {
function onToolbarVisibleChanged(isVisible, toolbarName) { function onToolbarVisibleChanged(isVisible, toolbarName) {
if (isVisible && toolbarName == TOOLBAR_NAME) { if (isVisible && toolbarName == TOOLBAR_NAME) {
var toolbar = Toolbars.getToolbar(toolbarName); var toolbar = Toolbars.getToolbar(toolbarName);
toolbar.writeProperty("visible", false); if (toolbar) {
toolbar.writeProperty("visible", false);
}
} }
} }