Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 19:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16010 from MiladNazeri/v0.83.0-rc

Browse source 
changed root to micBar which had the gated property
This commit is contained in:
Shannon Romano 2019-07-30 15:32:26 -07:00 committed by GitHub
commit a58efe744b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/audio/MicBarApplication.qml
View file

@ -39,8 +39,8 @@ Rectangle {
} }
Component.onCompleted: { Component.onCompleted: {
AudioScriptingInterface.noiseGateOpened.connect(function() { root.gated = false; }); AudioScriptingInterface.noiseGateOpened.connect(function() { micBar.gated = false; });
AudioScriptingInterface.noiseGateClosed.connect(function() { root.gated = true; }); AudioScriptingInterface.noiseGateClosed.connect(function() { micBar.gated = true; });
HMD.displayModeChanged.connect(function() { HMD.displayModeChanged.connect(function() {
muted = AudioScriptingInterface.muted; muted = AudioScriptingInterface.muted;
pushToTalk = AudioScriptingInterface.pushToTalk; pushToTalk = AudioScriptingInterface.pushToTalk;
@ -151,7 +151,7 @@ Rectangle {
readonly property string yellow: "#C0C000"; readonly property string yellow: "#C0C000";
readonly property string fill: "#55000000"; readonly property string fill: "#55000000";
readonly property string border: standalone ? "#80FFFFFF" : "#55FFFFFF"; readonly property string border: standalone ? "#80FFFFFF" : "#55FFFFFF";
readonly property string icon: (muted || clipping) ? mutedColor : root.gated ? gatedColor : unmutedColor; readonly property string icon: (muted || clipping) ? mutedColor : micBar.gated ? gatedColor : unmutedColor;
} }
Item { Item {
@ -169,7 +169,7 @@ Rectangle {
Image { Image {
id: image; id: image;
source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon : source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
clipping ? clippingIcon : root.gated ? gatedIcon : unmutedIcon; clipping ? clippingIcon : micBar.gated ? gatedIcon : unmutedIcon;
width: 29; width: 29;
height: 32; height: 32;
anchors { anchors {