mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 21:12:53 +02:00
Merge pull request #9944 from vladest/tablet-ui-wrap-menu
Menu items in Tablet UI now wrapped
This commit is contained in:
commit
e945a290cd
1 changed files with 4 additions and 2 deletions
|
@ -32,8 +32,7 @@ Item {
|
||||||
anchors {
|
anchors {
|
||||||
left: parent.left
|
left: parent.left
|
||||||
leftMargin: hifi.dimensions.menuPadding.x + 15
|
leftMargin: hifi.dimensions.menuPadding.x + 15
|
||||||
top: label.top
|
verticalCenter: label.verticalCenter
|
||||||
topMargin: 0
|
|
||||||
}
|
}
|
||||||
width: 20
|
width: 20
|
||||||
visible: source.visible && source.type === 1 && source.checkable
|
visible: source.visible && source.type === 1 && source.checkable
|
||||||
|
@ -51,6 +50,8 @@ Item {
|
||||||
RalewaySemiBold {
|
RalewaySemiBold {
|
||||||
id: label
|
id: label
|
||||||
size: 20
|
size: 20
|
||||||
|
//wrap will work only if width is set
|
||||||
|
width: parent.width - (check.width + check.anchors.leftMargin) - tail.width
|
||||||
font.capitalization: isSubMenu ? Font.MixedCase : Font.AllUppercase
|
font.capitalization: isSubMenu ? Font.MixedCase : Font.AllUppercase
|
||||||
anchors.left: check.right
|
anchors.left: check.right
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -58,6 +59,7 @@ Item {
|
||||||
color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow50
|
color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow50
|
||||||
enabled: source.visible && (source.type !== 0 ? source.enabled : false)
|
enabled: source.visible && (source.type !== 0 ? source.enabled : false)
|
||||||
visible: source.visible
|
visible: source.visible
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
Loading…
Reference in a new issue