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

fixing create app window on desktop

Browse source
This commit is contained in:
Wayne Chen 2018-11-07 09:26:34 -08:00
parent 1ded4b6fb8
commit fc32ba9ce3
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/InteractiveWindow.qml
View file

@ -54,7 +54,7 @@ Windows.Window {
onSourceChanged: { onSourceChanged: {
if (dynamicContent) { if (dynamicContent) {
dynamicContent.destroy(); dynamicContent.destroy();
dynamicContent = null; dynamicContent = null;
} }
QmlSurface.load(source, contentHolder, function(newObject) { QmlSurface.load(source, contentHolder, function(newObject) {
dynamicContent = newObject; dynamicContent = newObject;
@ -117,7 +117,7 @@ Windows.Window {
console.error("presentationMode should be set."); console.error("presentationMode should be set.");
} }
} }
Component.onCompleted: { Component.onCompleted: {
// Fix for parent loss on OSX: // Fix for parent loss on OSX:
parent.heightChanged.connect(updateContentParent); parent.heightChanged.connect(updateContentParent);
@ -132,7 +132,7 @@ Windows.Window {
import QtQuick 2.3; import QtQuick 2.3;
import QtQuick.Window 2.3; import QtQuick.Window 2.3;
Windows.Window { Window {
id: root; id: root;
Rectangle { Rectangle {
color: hifi.colors.baseGray color: hifi.colors.baseGray
@ -215,7 +215,7 @@ Windows.Window {
nativeWindow.raise(); nativeWindow.raise();
} }
} }
// Handle message traffic from our loaded QML to the script that launched us // Handle message traffic from our loaded QML to the script that launched us
signal sendToScript(var message); signal sendToScript(var message);

2
interface/src/Application.cpp
View file

@ -8490,7 +8490,7 @@ void Application::setShowBulletConstraintLimits(bool value) {
} }
void Application::checkReadyToCreateLoginDialogOverlay() { void Application::checkReadyToCreateLoginDialogOverlay() {
if (qApp->isHMDMode() && qApp->getActiveDisplayPlugin()->isDisplayVisible() && qApp->getLoginDialogPoppedUp() && _loginDialogOverlayID.isNull()) { if (qApp->isHMDMode() && qApp->getLoginDialogPoppedUp() && _loginDialogOverlayID.isNull()) {
createLoginDialogOverlay(); createLoginDialogOverlay();
_loginPointerManager.setUp(); _loginPointerManager.setUp();
} else if (qApp->getLoginDialogPoppedUp()) { } else if (qApp->getLoginDialogPoppedUp()) {

5
scripts/system/edit.js
View file

@ -931,6 +931,7 @@ var toolBar = (function () {
}; };
that.toggle = function () { that.toggle = function () {
print("toggling");
that.setActive(!isActive); that.setActive(!isActive);
if (!isActive) { if (!isActive) {
tablet.gotoHomeScreen(); tablet.gotoHomeScreen();
@ -2014,7 +2015,7 @@ function focusKey(value) {
if (value === 0) { // on release if (value === 0) { // on release
cameraManager.enable(); cameraManager.enable();
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions, cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
} }
} }
@ -2258,7 +2259,7 @@ var PropertiesTool = function (opts) {
}; };
that.setVisible(false); that.setVisible(false);
function emitScriptEvent(data) { function emitScriptEvent(data) {
var dataString = JSON.stringify(data); var dataString = JSON.stringify(data);
webView.emitScriptEvent(dataString); webView.emitScriptEvent(dataString);