diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml index 2a057937cf..39f48f0334 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenu.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml @@ -79,7 +79,7 @@ Item { onEntered: breadcrumbText.color = "#1fc6a6"; onExited: breadcrumbText.color = "#ffffff"; // navigate back to parent level menu if there is one - onClicked: + onClicked: if (breadcrumbText.text !== "Menu") { 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 }