Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 23:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode

Browse source 
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
This commit is contained in:
Zach Fox 2019-09-11 15:05:44 -07:00 committed by GitHub
commit a5504c3780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,6 +266,7 @@ Rectangle {
labelTextSize: 16; labelTextSize: 16;
backgroundOnColor: "#E3E3E3"; backgroundOnColor: "#E3E3E3";
checked: AudioScriptingInterface.warnWhenMuted; checked: AudioScriptingInterface.warnWhenMuted;
visible: bar.currentIndex !== 0;
onClicked: { onClicked: {
AudioScriptingInterface.warnWhenMuted = checked; AudioScriptingInterface.warnWhenMuted = checked;
checked = Qt.binding(function() { return AudioScriptingInterface.warnWhenMuted; }); // restore binding checked = Qt.binding(function() { return AudioScriptingInterface.warnWhenMuted; }); // restore binding
@ -277,8 +278,8 @@ Rectangle {
id: audioLevelSwitch id: audioLevelSwitch
height: root.switchHeight; height: root.switchHeight;
switchWidth: root.switchWidth; switchWidth: root.switchWidth;
anchors.top: warnMutedSwitch.bottom anchors.top: warnMutedSwitch.visible ? warnMutedSwitch.bottom : parent.top
anchors.topMargin: 24 anchors.topMargin: bar.currentIndex === 0 ? 0 : 24
anchors.left: parent.left anchors.left: parent.left
labelTextOn: qsTr("Audio Level Meter"); labelTextOn: qsTr("Audio Level Meter");
labelTextSize: 16; labelTextSize: 16;