Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch from column layout to item

Browse source
This commit is contained in:
Wayne Chen 2019-03-10 17:07:02 -07:00
parent 04c6c42512
commit 2eaa1e63d3
1 changed files with 8 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,10 +166,12 @@ Rectangle {
Separator {}
ColumnLayout {
spacing: muteMic.spacing;
Item {
width: rightMostInputLevelPos
height: pttTextContainer.height + pttCheckBox.height + margins.paddings + 10
AudioControls.CheckBox {
spacing: muteMic.spacing
id: pttCheckBox
anchors.top: parent.top
text: qsTr("Push To Talk (T)");
checked: isVR ? AudioScriptingInterface.pushToTalkHMD : AudioScriptingInterface.pushToTalkDesktop;
onClicked: {
@ -189,69 +191,9 @@ Rectangle {
}
Item {
id: pttTextContainer
x: margins.paddings;
width: rightMostInputLevelPos
height: pttTextMetrics.height
visible: true
TextMetrics {
id: pttTextMetrics
text: pttText.text
font: pttText.font
}
RalewayRegular {
id: pttText
wrapMode: Text.WordWrap
color: hifi.colors.white;
width: parent.width;
font.italic: true
size: 16;
text: isVR ? qsTr("Press and hold grip triggers on both of your controllers to unmute.") :
qsTr("Press and hold the button \"T\" to unmute.");
onTextChanged: {
if (pttTextMetrics.width > rightMostInputLevelPos) {
pttTextContainer.height = Math.ceil(pttTextMetrics.width / rightMostInputLevelPos) * pttTextMetrics.height;
} else {
pttTextContainer.height = pttTextMetrics.height;
}
}
}
Component.onCompleted: {
if (pttTextMetrics.width > rightMostInputLevelPos) {
pttTextContainer.height = Math.ceil(pttTextMetrics.width / rightMostInputLevelPos) * pttTextMetrics.height;
} else {
pttTextContainer.height = pttTextMetrics.height;
}
}
}
}
Separator {}
ColumnLayout {
spacing: muteMic.spacing;
AudioControls.CheckBox {
spacing: muteMic.spacing
text: qsTr("Push To Talk (T)");
checked: isVR ? AudioScriptingInterface.pushToTalkHMD : AudioScriptingInterface.pushToTalkDesktop;
onClicked: {
if (isVR) {
AudioScriptingInterface.pushToTalkHMD = checked;
} else {
AudioScriptingInterface.pushToTalkDesktop = checked;
}
checked = Qt.binding(function() {
if (isVR) {
return AudioScriptingInterface.pushToTalkHMD;
} else {
return AudioScriptingInterface.pushToTalkDesktop;
}
}); // restore binding
}
}
Item {
id: pttTextContainer
x: margins.paddings;
width: rightMostInputLevelPos
anchors.top: pttCheckBox.bottom
anchors.topMargin: 10
width: parent.width
height: pttTextMetrics.height
visible: true
TextMetrics {