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

CR fixes

Browse source
This commit is contained in:
Thijs Wenker 2018-07-09 16:38:53 +02:00
parent 4b2e0765db
commit b1884b0841
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/edit.js
View file

@ -545,7 +545,7 @@ var toolBar = (function () {
checkEditPermissionsAndUpdate(); checkEditPermissionsAndUpdate();
}); });
HMD.displayModeChanged.connect(function () { HMD.displayModeChanged.connect(function() {
if (isActive) { if (isActive) {
tablet.gotoHomeScreen(); tablet.gotoHomeScreen();
} }
@ -612,11 +612,12 @@ var toolBar = (function () {
} else { } else {
closeExistingDialogWindow(); closeExistingDialogWindow();
var qmlPath = Script.resourcesPath() + "qml/hifi/tablet/New" + entityType + "Window.qml"; var qmlPath = Script.resourcesPath() + "qml/hifi/tablet/New" + entityType + "Window.qml";
var DIALOG_WINDOW_SIZE = { x: 500, y: 300 };
dialogWindow = Desktop.createWindow(qmlPath, { dialogWindow = Desktop.createWindow(qmlPath, {
title: "New " + entityType + " Entity", title: "New " + entityType + " Entity",
flags: Desktop.ALWAYS_ON_TOP | Desktop.CLOSE_BUTTON_HIDES, flags: Desktop.ALWAYS_ON_TOP | Desktop.CLOSE_BUTTON_HIDES,
presentationMode: Desktop.PresentationMode.NATIVE, presentationMode: Desktop.PresentationMode.NATIVE,
size: { x: 500, y: 300 }, size: DIALOG_WINDOW_SIZE,
visible: true visible: true
}); });
dialogWindow.fromQml.connect(fromQml); dialogWindow.fromQml.connect(fromQml);

2
scripts/system/libraries/entityList.js
View file

@ -44,7 +44,7 @@ EntityListTool = function() {
var webView = null; var webView = null;
webView = Tablet.getTablet("com.highfidelity.interface.tablet.system"); webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
webView.setVisible = function (value) { }; webView.setVisible = function(value){ };
var filterInView = false; var filterInView = false;
var searchRadius = 100; var searchRadius = 100;

2
scripts/system/particle_explorer/particleExplorerTool.js
View file

@ -14,7 +14,7 @@
var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html'); var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
ParticleExplorerTool = function (createToolsWindow) { ParticleExplorerTool = function(createToolsWindow) {
var that = {}; var that = {};
that.activeParticleEntity = 0; that.activeParticleEntity = 0;
that.updatedActiveParticleProperties = {}; that.updatedActiveParticleProperties = {};