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

Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch

Browse source 
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
This commit is contained in:
Zach Fox 2019-07-05 12:59:56 -07:00 committed by GitHub
commit 243733028b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
View file

@ -25,6 +25,14 @@ Flickable {
if (visible) { if (visible) {
root.contentX = 0; root.contentX = 0;
root.contentY = 0; root.contentY = 0;
// When the user clicks the About tab, refresh the audio I/O model so that
// the delegate Component.onCompleted handlers fire, which will update
// the text that appears in the About screen.
audioOutputDevices.model = undefined;
audioOutputDevices.model = AudioScriptingInterface.devices.output;
audioInputDevices.model = undefined;
audioInputDevices.model = AudioScriptingInterface.devices.input;
} }
} }
@ -207,7 +215,6 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height Layout.preferredHeight: contentItem.height
interactive: false interactive: false
model: AudioScriptingInterface.devices.input
delegate: Item { delegate: Item {
Component.onCompleted: { Component.onCompleted: {
if (HMD.active && selectedHMD) { if (HMD.active && selectedHMD) {
@ -241,7 +248,6 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height Layout.preferredHeight: contentItem.height
interactive: false interactive: false
model: AudioScriptingInterface.devices.output
delegate: Item { delegate: Item {
Component.onCompleted: { Component.onCompleted: {
if (HMD.active && selectedHMD) { if (HMD.active && selectedHMD) {