Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 06:02:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

It works!

Browse source
This commit is contained in:
Zach Fox 2019-06-12 12:42:58 -07:00 committed by Preston Bezos
parent 51c2cc793a
commit fade8f9c04
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,11 +74,11 @@ OriginalDesktop.Desktop {
shown: tablet ? tablet.toolbarMode : false; shown: tablet ? tablet.toolbarMode : false;
onVisibleChanged: { onVisibleChanged: {
console.log("ZRF HERE DESKTOP.QML: " + visible); console.log("ZRF HERE DESKTOP.QML: " + visible + " " + sysToolbar.objectName);
desktop.toolbarVisibleChanged(visible); desktop.toolbarVisibleChanged(visible, sysToolbar.objectName);
} }
} }
signal toolbarVisibleChanged(bool isVisible); signal toolbarVisibleChanged(bool isVisible, string toolbarName);
QtSettings.Settings { QtSettings.Settings {
id: settings; id: settings;

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

@ -691,8 +691,7 @@ void OffscreenUi::createDesktop(const QUrl& url) {
QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system" QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system"
auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>(); auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>();
_currentToolbarProxy = dynamic_cast<ToolbarProxy*>(toolbarScriptingInterface->getToolbar(toolbarName)); connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SLOT(onToolbarVisibleChanged(bool, QString)));
connect(_desktop, SIGNAL(toolbarVisibleChanged(bool)), _currentToolbarProxy, SLOT(onToolbarVisibleChanged(bool)));
auto keyboardFocus = new KeyboardFocusHack(); auto keyboardFocus = new KeyboardFocusHack();
connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop())); connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));

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

@ -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) { ToolbarProxy::ToolbarProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) {
Q_ASSERT(QThread::currentThread() == qApp->thread()); Q_ASSERT(QThread::currentThread() == qApp->thread());
} }
@ -125,3 +120,8 @@ ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) {
return new ToolbarProxy(rawToolbar); return new ToolbarProxy(rawToolbar);
} }
void ToolbarScriptingInterface::onToolbarVisibleChanged(bool isVisible, QString toolbarName) {
qDebug() << "ZRF HERE IN ENGINE SLOT" << isVisible << toolbarName;
emit ToolbarScriptingInterface::toolbarVisibleChanged(isVisible, toolbarName);
}

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

@ -129,12 +129,6 @@ public:
* @param {string[]} propertyList * @param {string[]} propertyList
* @returns {object} * @returns {object}
*/ */
public slots:
void onToolbarVisibleChanged(bool isVisible);
signals:
void toolbarVisibleChanged(bool isVisible);
}; };
Q_DECLARE_METATYPE(ToolbarProxy*); Q_DECLARE_METATYPE(ToolbarProxy*);
@ -156,6 +150,12 @@ public:
* @returns {ToolbarProxy} * @returns {ToolbarProxy}
*/ */
Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId); Q_INVOKABLE ToolbarProxy* getToolbar(const QString& toolbarId);
public slots:
void onToolbarVisibleChanged(bool isVisible, QString toolbarName);
signals:
void toolbarVisibleChanged(bool isVisible, QString toolbarName);
}; };