Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-17 05:58:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15717 from annabrewer/qml-stackview-push-workaround

Browse source 
BUGZ-297: QT - Crash when opening a menu that spawns a desktop popup window while in VR (running scripts, settings, etc)
This commit is contained in:
Anthony Thibault 2019-06-10 11:01:10 -07:00 committed by GitHub
commit 5ea65c0a5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/tablet/Edit.qml
View file

@ -34,7 +34,8 @@ StackView {
}
function pushSource(path) {
editRoot.push(Qt.resolvedUrl("../../" + path), itemProperties,
var item = Qt.createComponent(Qt.resolvedUrl("../../" + path));
editRoot.push(item, itemProperties,
StackView.Immediate);
editRoot.currentItem.sendToScript.connect(editRoot.sendToScript);
}

3
interface/resources/qml/hifi/tablet/EditTools.qml
View file

@ -37,7 +37,8 @@ StackView {
}
function pushSource(path) {
editRoot.push(Qt.resolvedUrl("../../" + path), itemProperties,
var item = Qt.createComponent(Qt.resolvedUrl("../../" + path));
editRoot.push(item, itemProperties,
StackView.Immediate);
editRoot.currentItem.sendToScript.connect(editRoot.sendToScript);
}

3
interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml
View file

@ -24,7 +24,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.resolvedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {

3
interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml
View file

@ -22,7 +22,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.reslovedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {

3
interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
View file

@ -22,7 +22,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.resolvedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {

3
interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
View file

@ -22,7 +22,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.resolvedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {

3
interface/resources/qml/hifi/tablet/TabletLodPreferences.qml
View file

@ -22,7 +22,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.resolvedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {

3
interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml
View file

@ -22,7 +22,8 @@ StackView {
signal sendToScript(var message);
function pushSource(path) {
profileRoot.push(Qt.resolvedUrl(path));
var item = Qt.createComponent(Qt.resolvedUrl(path));
profileRoot.push(item);
}
function popSource() {