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

now use it (plus a bit of cleanup)

Browse source
This commit is contained in:
David Kelly 2017-02-28 15:03:45 -07:00
parent c10b0389de
commit 678020fed6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/hifi/NameCard.qml
View file

@ -335,7 +335,7 @@ Item {
}
}
// Per-Avatar Gain Slider
// Per-Avatar Gain Slider
Slider {
id: gainSlider
// Size
@ -345,7 +345,7 @@ Item {
anchors.verticalCenter: nameCardVUMeter.verticalCenter
// Properties
visible: !isMyCard && selected
value: pal.gainSliderValueDB[uuid] ? pal.gainSliderValueDB[uuid] : 0.0
value: pal.gainSliderValueDB[uuid] ? pal.gainSliderValueDB[uuid] : Users.getAvatarGain(uuid)
minimumValue: -60.0
maximumValue: 20.0
stepSize: 5
@ -369,7 +369,7 @@ Item {
mouse.accepted = false
}
onReleased: {
// the above mouse.accepted seems to make this
// the above mouse.accepted seems to make this
// never get called, nonetheless...
mouse.accepted = false
}

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

@ -2,7 +2,7 @@
// Pal.qml
// qml/hifi
//
// People Action List
// People Action List
//
// Created by Howard Stearns on 12/12/2016
// Copyright 2016 High Fidelity, Inc.
@ -270,7 +270,7 @@ Rectangle {
// Anchors
anchors.left: parent.left
}
// 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
// will appear in the "hovered" state. Hovering over the checkbox will fix it.
@ -306,7 +306,7 @@ Rectangle {
checked = Qt.binding(function() { return (model[styleData.role])})
}
}
// This Button belongs in the columns that contain the stateless action buttons ("Silence" & "Ban" for now)
HifiControls.Button {
id: actionButton
@ -538,7 +538,7 @@ Rectangle {
}
}
break;
case 'updateAudioLevel':
case 'updateAudioLevel':
for (var userId in message.params) {
var audioLevel = message.params[userId];
// If the userId is 0, we're updating "myData".
@ -554,7 +554,7 @@ Rectangle {
}
}
break;
case 'clearLocalQMLData':
case 'clearLocalQMLData':
ignored = {};
gainSliderValueDB = {};
break;