From 3cf56210b239b15dce26e8e69a0a8fa3c3b478c5 Mon Sep 17 00:00:00 2001 From: milad Date: Wed, 11 Sep 2019 12:30:24 -0700 Subject: [PATCH 1/3] modified Audio.qml to handle desktop audio level meter visible --- interface/resources/qml/hifi/audio/Audio.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index d3bf6aca0a..dbfd46ded1 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -266,6 +266,7 @@ Rectangle { labelTextSize: 16; backgroundOnColor: "#E3E3E3"; checked: AudioScriptingInterface.warnWhenMuted; + visible: bar.currentIndex === 0 ? false : true; onClicked: { AudioScriptingInterface.warnWhenMuted = checked; checked = Qt.binding(function() { return AudioScriptingInterface.warnWhenMuted; }); // restore binding @@ -277,8 +278,8 @@ Rectangle { id: audioLevelSwitch height: root.switchHeight; switchWidth: root.switchWidth; - anchors.top: warnMutedSwitch.bottom - anchors.topMargin: 24 + anchors.top: bar.currentIndex === 0 ? parent.top : warnMutedSwitch.bottom + anchors.topMargin: bar.currentIndex === 0 ? 0 : 24 anchors.left: parent.left labelTextOn: qsTr("Audio Level Meter"); labelTextSize: 16; From d95a803324b687bb1800dd6d31e4c39c67190b36 Mon Sep 17 00:00:00 2001 From: MiladNazeri Date: Wed, 11 Sep 2019 12:44:59 -0700 Subject: [PATCH 2/3] Update interface/resources/qml/hifi/audio/Audio.qml Co-Authored-By: Zach Fox --- interface/resources/qml/hifi/audio/Audio.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index dbfd46ded1..d177094d92 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -266,7 +266,7 @@ Rectangle { labelTextSize: 16; backgroundOnColor: "#E3E3E3"; checked: AudioScriptingInterface.warnWhenMuted; - visible: bar.currentIndex === 0 ? false : true; + visible: bar.currentIndex !== 0; onClicked: { AudioScriptingInterface.warnWhenMuted = checked; checked = Qt.binding(function() { return AudioScriptingInterface.warnWhenMuted; }); // restore binding From a9da5b8f16a16e2162cc75cfe3b04563f9033827 Mon Sep 17 00:00:00 2001 From: MiladNazeri Date: Wed, 11 Sep 2019 12:45:18 -0700 Subject: [PATCH 3/3] Update interface/resources/qml/hifi/audio/Audio.qml Co-Authored-By: Zach Fox --- interface/resources/qml/hifi/audio/Audio.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index d177094d92..fccba12a8a 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -278,7 +278,7 @@ Rectangle { id: audioLevelSwitch height: root.switchHeight; switchWidth: root.switchWidth; - anchors.top: bar.currentIndex === 0 ? parent.top : warnMutedSwitch.bottom + anchors.top: warnMutedSwitch.visible ? warnMutedSwitch.bottom : parent.top anchors.topMargin: bar.currentIndex === 0 ? 0 : 24 anchors.left: parent.left labelTextOn: qsTr("Audio Level Meter");