From 0c28776ea2f3fd494d9d0e6c3df9f1cf6d0b7309 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Sat, 4 Feb 2017 00:13:39 +0000
Subject: [PATCH 1/2] some tweaks to users and menus got tablet

---
 interface/resources/qml/hifi/tablet/TabletMouseHandler.qml | 7 ++++++-
 scripts/system/tablet-users.js                             | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
index 32e34e279b..258a4c2f12 100644
--- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
@@ -87,7 +87,11 @@ Item {
                 if (topMenu.objectName === "") {
                     breadcrumbText.text = "Menu";
                 } else {
-                    breadcrumbText.text = topMenu.objectName;
+                    if (menuStack.length === 1) {
+                        breadcrumbText.text = "Menu";
+                    } else {
+                        breadcrumbText.text = topMenu.objectName;
+                    }
                 }
             } else {
                 breadcrumbText.text = "Menu";
@@ -164,6 +168,7 @@ Item {
             d.popMenu();
             return true;
         }
+            
         return false;
     }
 
diff --git a/scripts/system/tablet-users.js b/scripts/system/tablet-users.js
index 0fad0c56f3..a47e4c8c5c 100644
--- a/scripts/system/tablet-users.js
+++ b/scripts/system/tablet-users.js
@@ -12,6 +12,7 @@
 
 (function() { // BEGIN LOCAL_SCOPE
     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_WIDTH = 290;
@@ -39,6 +40,10 @@
     });
 
     function onClicked() {
+        var tabletEntity = HMD.tabletID;
+        if (tabletEntity) {
+            Entities.editEntity(tabletEntity, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
+        }
         tablet.gotoWebScreen(USERS_URL);
     }
 

From dd8f095bd8463a157737ae20ab87192c5587429e Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Sat, 4 Feb 2017 00:36:41 +0000
Subject: [PATCH 2/2] minimize diff

---
 interface/resources/qml/hifi/tablet/TabletMouseHandler.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
index 258a4c2f12..17a00eccde 100644
--- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
@@ -168,7 +168,6 @@ Item {
             d.popMenu();
             return true;
         }
-            
         return false;
     }