From 126bfba5125d21fa16603a3b829550d444e083a0 Mon Sep 17 00:00:00 2001
From: Faye Li Si Fi <si.fi.faye.li@gmail.com>
Date: Tue, 17 Jan 2017 16:40:12 -0800
Subject: [PATCH 1/3] fix tablet menu scrolling issue

---
 interface/resources/qml/hifi/tablet/TabletMenu.qml   |  7 ++-----
 .../resources/qml/hifi/tablet/TabletMenuView.qml     | 12 ++++++++----
 interface/resources/qml/styles-uit/HifiConstants.qml |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 2a057937cf..87daceea3b 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -78,11 +78,8 @@ Item {
                 hoverEnabled: true
                 onEntered: breadcrumbText.color = "#1fc6a6";
                 onExited: breadcrumbText.color = "#ffffff";
-                // navigate back to parent level menu if there is one
-                onClicked:
-                    if (breadcrumbText.text !== "Menu") {
-                        menuPopperUpper.closeLastMenu();
-                    }
+                // navigate back to parent level menu
+                onClicked: menuPopperUpper.closeLastMenu();
             }
         }
     }
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
index 4038ba060a..b02c5b67ec 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -36,14 +36,18 @@ FocusScope {
         //color: isSubMenu ? hifi.colors.faintGray : hifi.colors.faintGray80
     }
 
+
     ListView {
         id: listView
         x: 0
         y: 0
         width: 480
         height: 720
+        contentWidth: 480
+        contentHeight: 720
 
-        topMargin: hifi.dimensions.menuPadding.y + 90
+        topMargin: hifi.dimensions.menuPadding.y
+        bottomMargin: hifi.dimensions.menuPadding.y
         onEnabledChanged: recalcSize();
         onVisibleChanged: recalcSize();
         onCountChanged: recalcSize();
@@ -94,12 +98,12 @@ FocusScope {
                     newHeight += currentItem.implicitHeight
                 }
             }
-            newHeight += 2 * hifi.dimensions.menuPadding.y;  // White space at top and bottom.
+            newHeight += hifi.dimensions.menuPadding.y * 2;  // White space at top and bottom.
             if (maxWidth > width) {
                 width = maxWidth;
             }
-            if (newHeight > height) {
-                height = newHeight
+            if (newHeight > contentHeight) {
+                contentHeight = newHeight;
             }
             currentIndex = originalIndex;
         }
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 7eca1aa725..af8df853aa 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -156,7 +156,7 @@ Item {
         readonly property real modalDialogTitleHeight: 40
         readonly property real controlLineHeight: 28  // Height of spinbox control on 1920 x 1080 monitor
         readonly property real controlInterlineHeight: 21  // 75% of controlLineHeight
-        readonly property vector2d menuPadding: Qt.vector2d(14, 12)
+        readonly property vector2d menuPadding: Qt.vector2d(14, 102)
         readonly property real scrollbarBackgroundWidth: 18
         readonly property real scrollbarHandleWidth: scrollbarBackgroundWidth - 2
     }

From 42a96a94b48c64de2cd94a28b658ad03edfa0de5 Mon Sep 17 00:00:00 2001
From: Faye Li Si Fi <si.fi.faye.li@gmail.com>
Date: Tue, 17 Jan 2017 16:54:40 -0800
Subject: [PATCH 2/3] fix

---
 interface/resources/qml/hifi/tablet/TabletMenu.qml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 87daceea3b..ad0f91f7c9 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -78,8 +78,11 @@ Item {
                 hoverEnabled: true
                 onEntered: breadcrumbText.color = "#1fc6a6";
                 onExited: breadcrumbText.color = "#ffffff";
-                // navigate back to parent level menu
-                onClicked: menuPopperUpper.closeLastMenu();
+                // navigate back to parent level menu if there is one
+                onClicked: 
+                    if (breadcrumbText.text !== "Menu) {
+                        menuPopperUpper.closeLastMenu();
+                    }
             }
         }
     }

From d7209ef7f7b247cc9cfc1b1d72fa0e15a5a53694 Mon Sep 17 00:00:00 2001
From: Faye Li Si Fi <si.fi.faye.li@gmail.com>
Date: Tue, 17 Jan 2017 16:56:54 -0800
Subject: [PATCH 3/3] syntax

---
 interface/resources/qml/hifi/tablet/TabletMenu.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index ad0f91f7c9..39f48f0334 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -80,7 +80,7 @@ Item {
                 onExited: breadcrumbText.color = "#ffffff";
                 // navigate back to parent level menu if there is one
                 onClicked: 
-                    if (breadcrumbText.text !== "Menu) {
+                    if (breadcrumbText.text !== "Menu") {
                         menuPopperUpper.closeLastMenu();
                     }
             }