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

some tweaks to users and menus got tablet

Browse source
This commit is contained in:
Dante Ruiz 2017-02-04 00:13:39 +00:00
parent 1ddafa3cee
commit 0c28776ea2
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
View file

@ -87,7 +87,11 @@ Item {
if (topMenu.objectName === "") { if (topMenu.objectName === "") {
breadcrumbText.text = "Menu"; breadcrumbText.text = "Menu";
} else { } else {
breadcrumbText.text = topMenu.objectName; if (menuStack.length === 1) {
breadcrumbText.text = "Menu";
} else {
breadcrumbText.text = topMenu.objectName;
}
} }
} else { } else {
breadcrumbText.text = "Menu"; breadcrumbText.text = "Menu";
@ -164,6 +168,7 @@ Item {
d.popMenu(); d.popMenu();
return true; return true;
} }
return false; return false;
} }

5
scripts/system/tablet-users.js
View file

@ -12,6 +12,7 @@
(function() { // BEGIN LOCAL_SCOPE (function() { // BEGIN LOCAL_SCOPE
var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html"; var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html";
var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends"; var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends";
var FRIENDS_WINDOW_WIDTH = 290; var FRIENDS_WINDOW_WIDTH = 290;
@ -39,6 +40,10 @@
}); });
function onClicked() { function onClicked() {
var tabletEntity = HMD.tabletID;
if (tabletEntity) {
Entities.editEntity(tabletEntity, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
}
tablet.gotoWebScreen(USERS_URL); tablet.gotoWebScreen(USERS_URL);
} }