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

Merge pull request #8 from wayne-chen/pushToTalk

Browse source 
changing micbar display
This commit is contained in:
Wayne Chen 2019-03-06 11:22:18 -08:00 committed by GitHub
commit 2dd939c85f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/audio/MicBar.qml
View file

@ -134,9 +134,9 @@ Rectangle {
Item { Item {
id: status; id: status;
readonly property string color: AudioScriptingInterface.pushToTalk ? hifi.colors.blueHighlight : AudioScriptingInterface.muted ? colors.muted : colors.unmuted; readonly property string color: AudioScriptingInterface.muted ? colors.muted : colors.unmuted;
visible: AudioScriptingInterface.pushingToTalk || AudioScriptingInterface.muted; visible: (AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk) || AudioScriptingInterface.muted;
anchors { anchors {
left: parent.left; left: parent.left;
@ -155,7 +155,7 @@ Rectangle {
color: parent.color; color: parent.color;
text: AudioScriptingInterface.pushToTalk ? (AudioScriptingInterface.pushingToTalk ? "SPEAKING" : "PUSH TO TALK") : (AudioScriptingInterface.muted ? "MUTED" : "MUTE"); text: (AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk) ? "MUTED-PTT (T)" : (AudioScriptingInterface.muted ? "MUTED" : "MUTE");
font.pointSize: 12; font.pointSize: 12;
} }
@ -165,7 +165,7 @@ Rectangle {
verticalCenter: parent.verticalCenter; verticalCenter: parent.verticalCenter;
} }
width: AudioScriptingInterface.pushToTalk ? (AudioScriptingInterface.pushingToTalk ? 45: 30) : 50; width: AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk ? 25 : 50;
height: 4; height: 4;
color: parent.color; color: parent.color;
} }
@ -176,7 +176,7 @@ Rectangle {
verticalCenter: parent.verticalCenter; verticalCenter: parent.verticalCenter;
} }
width: AudioScriptingInterface.pushToTalk ? (AudioScriptingInterface.pushingToTalk ? 45: 30) : 50; width: AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk ? 25 : 50;
height: 4; height: 4;
color: parent.color; color: parent.color;
} }