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

Merge pull request #12240 from luiscuenca/gotoFixForHMD

Browse source 
RC63 GoTo fix for HMD
This commit is contained in:
John Conklin II 2018-01-25 09:37:59 -08:00 committed by GitHub
commit d537146fd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/Feed.qml
View file

@ -33,6 +33,7 @@ Column {
property int labelSize: 20; property int labelSize: 20;
property string metaverseServerUrl: ''; property string metaverseServerUrl: '';
property string protocol: '';
property string actions: 'snapshot'; property string actions: 'snapshot';
// sendToScript doesn't get wired until after everything gets created. So we have to queue fillDestinations on nextTick. // sendToScript doesn't get wired until after everything gets created. So we have to queue fillDestinations on nextTick.
property string labelText: actions; property string labelText: actions;
@ -102,7 +103,7 @@ Column {
'include_actions=' + actions, 'include_actions=' + actions,
'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'), 'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
'require_online=true', 'require_online=true',
'protocol=' + encodeURIComponent(Window.protocolSignature()), 'protocol=' + protocol,
'page=' + pageNumber 'page=' + pageNumber
]; ];
var url = metaverseBase + 'user_stories?' + options.join('&'); var url = metaverseBase + 'user_stories?' + options.join('&');

1
interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
View file

@ -54,6 +54,7 @@ StackView {
console.debug('TabletAddressDialog::fromScript: refreshFeeds', 'feeds = ', feeds); console.debug('TabletAddressDialog::fromScript: refreshFeeds', 'feeds = ', feeds);
feeds.forEach(function(feed) { feeds.forEach(function(feed) {
feed.protocol = encodeURIComponent(message.protocolSignature);
Qt.callLater(feed.fillDestinations); Qt.callLater(feed.fillDestinations);
}); });

2
scripts/system/tablet-goto.js
View file

@ -100,7 +100,7 @@
button.editProperties({isActive: shouldActivateButton}); button.editProperties({isActive: shouldActivateButton});
wireEventBridge(true); wireEventBridge(true);
messagesWaiting(false); messagesWaiting(false);
tablet.sendToQml({ method: 'refreshFeeds' }) tablet.sendToQml({ method: 'refreshFeeds', protocolSignature: Window.protocolSignature() })
} else { } else {
shouldActivateButton = false; shouldActivateButton = false;