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

Merge pull request #11103 from vladest/fix_toolbar_apps_switch

Browse source 
Fix toolbar apps switch
This commit is contained in:
druiz17 2017-08-02 12:59:31 -07:00 committed by GitHub
commit 6680be2a03
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -33,7 +33,7 @@ Rectangle {
// only show the title if loaded through a "loader" // only show the title if loaded through a "loader"
function showTitle() { function showTitle() {
return root.parent.objectName == "loader"; return (root.parent !== null) && root.parent.objectName == "loader";
} }
Column { Column {

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

@ -241,7 +241,6 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
_desktopWindow = nullptr; _desktopWindow = nullptr;
} }
} }
emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
} }
static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) { static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) {
@ -467,14 +466,14 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
} }
if (root) { if (root) {
if (_state != State::QML) { removeButtonsFromHomeScreen(); //works only in Tablet
removeButtonsFromHomeScreen();
QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path)); QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));
_state = State::QML; _state = State::QML;
if (path != _currentPathLoaded) {
emit screenChanged(QVariant("QML"), path); emit screenChanged(QVariant("QML"), path);
}
_currentPathLoaded = path; _currentPathLoaded = path;
QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true))); QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
}
} else { } else {
qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null"; qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
} }

2
scripts/system/edit.js
View file

@ -417,7 +417,7 @@ var toolBar = (function () {
createButton = activeButton; createButton = activeButton;
tablet.screenChanged.connect(function (type, url) { tablet.screenChanged.connect(function (type, url) {
if (isActive && (type !== "QML" || url !== "Edit.qml")) { if (isActive && (type !== "QML" || url !== "Edit.qml")) {
that.toggle(); that.setActive(false)
} }
}); });
tablet.fromQml.connect(fromQml); tablet.fromQml.connect(fromQml);