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

On create button, switch Tablet to landscape mode

Browse source
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-05-30 16:51:04 +02:00
parent 66415dadc6
commit 0f80a8b7af
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/edit.js
View file

@ -564,6 +564,8 @@ var toolBar = (function () {
enabled: active enabled: active
})); }));
isActive = active; isActive = active;
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
if (!isActive) { if (!isActive) {
entityListTool.setVisible(false); entityListTool.setVisible(false);
gridTool.setVisible(false); gridTool.setVisible(false);
@ -572,8 +574,8 @@ var toolBar = (function () {
selectionManager.clearSelections(); selectionManager.clearSelections();
cameraManager.disable(); cameraManager.disable();
selectionDisplay.triggerMapping.disable(); selectionDisplay.triggerMapping.disable();
tablet.landscape = false;
} else { } else {
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.loadQMLSource("Edit.qml"); tablet.loadQMLSource("Edit.qml");
UserActivityLogger.enabledEdit(); UserActivityLogger.enabledEdit();
entityListTool.setVisible(true); entityListTool.setVisible(true);
@ -581,6 +583,8 @@ var toolBar = (function () {
grid.setEnabled(true); grid.setEnabled(true);
propertiesTool.setVisible(true); propertiesTool.setVisible(true);
selectionDisplay.triggerMapping.enable(); selectionDisplay.triggerMapping.enable();
print("starting tablet in landscape mode")
tablet.landscape = true;
// Not sure what the following was meant to accomplish, but it currently causes // Not sure what the following was meant to accomplish, but it currently causes
// everybody else to think that Interface has lost focus overall. fogbugzid:558 // everybody else to think that Interface has lost focus overall. fogbugzid:558
// Window.setFocus(); // Window.setFocus();

8
scripts/system/tablet-ui/tabletUI.js
View file

@ -191,16 +191,12 @@
gTablet.updateAudioBar(currentMicLevel); gTablet.updateAudioBar(currentMicLevel);
} }
if (validCheckTime - now > MSECS_PER_SEC/4) { if (now - validCheckTime > MSECS_PER_SEC) {
//each 250ms should be just fine validCheckTime = now;
updateTabletWidthFromSettings(); updateTabletWidthFromSettings();
if (UIWebTablet) { if (UIWebTablet) {
UIWebTablet.setLandscape(landscape); UIWebTablet.setLandscape(landscape);
} }
}
if (validCheckTime - now > MSECS_PER_SEC) {
validCheckTime = now;
if (tabletRezzed && UIWebTablet && !tabletIsValid()) { if (tabletRezzed && UIWebTablet && !tabletIsValid()) {
// when we switch domains, the tablet entity gets destroyed and recreated. this causes // when we switch domains, the tablet entity gets destroyed and recreated. this causes
// the overlay to be deleted, but not recreated. If the overlay is deleted for this or any // the overlay to be deleted, but not recreated. If the overlay is deleted for this or any