Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-08 05:29:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix unmute when ignoring in PAL (you can't)

Browse source
This commit is contained in:
David Kelly 2017-03-02 08:36:58 -07:00
parent 48ad7fcaae
commit 79e440be81
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/Pal.qml
View file

@ -300,6 +300,8 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
onClicked: { onClicked: {
// cannot change mute status when ignoring
if (!model["ignore"]) {
var newValue = !model["personalMute"]; var newValue = !model["personalMute"];
userModel.setProperty(model.userIndex, "personalMute", newValue) userModel.setProperty(model.userIndex, "personalMute", newValue)
userModelData[model.userIndex]["personalMute"] = newValue // Defensive programming userModelData[model.userIndex]["personalMute"] = newValue // Defensive programming
@ -307,6 +309,7 @@ Rectangle {
UserActivityLogger["palAction"](newValue ? "personalMute" : "un-personalMute", model.sessionId) UserActivityLogger["palAction"](newValue ? "personalMute" : "un-personalMute", model.sessionId)
} }
} }
}
// This CheckBox belongs in the columns that contain the stateful action buttons ("Mute" & "Ignore" for now) // This CheckBox belongs in the columns that contain the stateful action buttons ("Mute" & "Ignore" for now)
// KNOWN BUG with the Checkboxes: When clicking in the center of the sorting header, the checkbox // KNOWN BUG with the Checkboxes: When clicking in the center of the sorting header, the checkbox
@ -336,6 +339,7 @@ Rectangle {
} else { } else {
delete ignored[model.sessionId] delete ignored[model.sessionId]
} }
avgAudioVolume.glyph = avgAudioVolume.getGlyph()
} }
// http://doc.qt.io/qt-5/qtqml-syntax-propertybinding.html#creating-property-bindings-from-javascript // http://doc.qt.io/qt-5/qtqml-syntax-propertybinding.html#creating-property-bindings-from-javascript
// I'm using an explicit binding here because clicking a checkbox breaks the implicit binding as set by // I'm using an explicit binding here because clicking a checkbox breaks the implicit binding as set by