Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix QML formatting issue.

Browse source
This commit is contained in:
r3tk0n 2019-03-11 10:54:48 -07:00
parent c1ed01115d
commit 8aedc98a58
1 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -171,15 +171,14 @@ Rectangle {
}
}
Separator {}
ColumnLayout {
id: pttColumn
spacing: 24;
x: 2 * margins.paddings;
Separator { id: pttStartSeparator; }
Item {
width: rightMostInputLevelPos;
height: pttSwitch.height + pttText.height + 24;
HifiControlsUit.Switch {
id: pttSwitch
x: 2 * margins.paddings;
anchors.top: parent.top;
height: root.switchHeight;
switchWidth: root.switchWidth;
labelTextOn: qsTr("Push To Talk (T)");
@ -200,39 +199,25 @@ Rectangle {
}); // restore binding
}
}
Item {
id: pttTextContainer
width: rightMostInputLevelPos
height: pttTextMetrics.height
anchors.left: parent.left
anchors.leftMargin: -margins.padding
TextMetrics {
id: pttTextMetrics
text: pttText.text
font: pttText.font
}
RalewayRegular {
id: pttText
color: hifi.colors.white;
width: parent.width;
wrapMode: (bar.currentIndex === 0) ? Text.NoWrap : Text.WordWrap;
font.italic: true
size: 16;
RalewayRegular {
id: pttText
x: 2 * margins.paddings;
color: hifi.colors.white;
anchors.bottom: parent.bottom;
width: rightMostInputLevelPos;
height: paintedHeight;
wrapMode: Text.WordWrap;
font.italic: true
size: 16;
text: (bar.currentIndex === 0) ? qsTr("Press and hold the button \"T\" to unmute.") :
qsTr("Press and hold grip triggers on both of your controllers to unmute.");
onTextChanged: {
if (pttTextMetrics.width > pttTextContainer.width) {
pttTextContainer.height = Math.ceil(pttTextMetrics.width / pttTextContainer.width) * pttTextMetrics.height;
} else {
pttTextContainer.height = pttTextMetrics.height;
}
}
}
text: (bar.currentIndex === 0) ? qsTr("Press and hold the button \"T\" to unmute.") :
qsTr("Press and hold grip triggers on both of your controllers to unmute.");
}
}
Separator {}
Separator {
id: pttEndSeparator;
}
Item {