Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-10 22:21:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better fix for the toolbar remnant

Browse source
This commit is contained in:
Preston Bezos 2019-06-12 14:31:43 -07:00
parent fade8f9c04
commit 34e9acc0b5
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/Desktop.qml
View file

@ -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);
}
}

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

@ -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<ToolbarScriptingInterface>();
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()));

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

@ -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);
}
}

3
libraries/ui/src/ui/ToolbarScriptingInterface.h
View file

@ -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);
};

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

@ -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;