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

Merge pull request #15630 from zfox23/SUI/settingsFixes02

Browse source 
Fix BUGZ-312; BUGZ-311
This commit is contained in:
Zach Fox 2019-05-24 13:07:43 -07:00 committed by GitHub
commit 2bf95fe683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
View file

@ -69,8 +69,8 @@ Flickable {
SimplifiedControls.Slider { SimplifiedControls.Slider {
id: peopleVolume id: peopleVolume
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 30
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
height: 30
labelText: "People Volume" labelText: "People Volume"
from: simplifiedUI.numericConstants.mutedValue from: simplifiedUI.numericConstants.mutedValue
to: 20.0 to: 20.0
@ -96,8 +96,8 @@ Flickable {
SimplifiedControls.Slider { SimplifiedControls.Slider {
id: environmentVolume id: environmentVolume
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 30
Layout.topMargin: 2 Layout.topMargin: 2
height: 30
labelText: "Environment Volume" labelText: "Environment Volume"
from: simplifiedUI.numericConstants.mutedValue from: simplifiedUI.numericConstants.mutedValue
to: 20.0 to: 20.0
@ -124,8 +124,8 @@ Flickable {
SimplifiedControls.Slider { SimplifiedControls.Slider {
id: systemSoundVolume id: systemSoundVolume
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 30
Layout.topMargin: 2 Layout.topMargin: 2
height: 30
labelText: "System Sound Volume" labelText: "System Sound Volume"
from: simplifiedUI.numericConstants.mutedValue from: simplifiedUI.numericConstants.mutedValue
to: 20.0 to: 20.0
@ -169,8 +169,8 @@ Flickable {
SimplifiedControls.Switch { SimplifiedControls.Switch {
id: muteMicrophoneSwitch id: muteMicrophoneSwitch
width: parent.width Layout.preferredHeight: 18
height: 18 Layout.preferredWidth: parent.width
labelTextOn: "Mute Microphone" labelTextOn: "Mute Microphone"
checked: AudioScriptingInterface.mutedDesktop checked: AudioScriptingInterface.mutedDesktop
onClicked: { onClicked: {
@ -180,8 +180,8 @@ Flickable {
SimplifiedControls.Switch { SimplifiedControls.Switch {
id: pushToTalkSwitch id: pushToTalkSwitch
width: parent.width Layout.preferredHeight: 18
height: 18 Layout.preferredWidth: parent.width
labelTextOn: "Push to Talk - Press and Hold \"T\" to Talk" labelTextOn: "Push to Talk - Press and Hold \"T\" to Talk"
checked: AudioScriptingInterface.pushToTalkDesktop checked: AudioScriptingInterface.pushToTalkDesktop
onClicked: { onClicked: {
@ -210,9 +210,9 @@ Flickable {
ListView { ListView {
id: inputDeviceListView id: inputDeviceListView
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false interactive: false
height: contentItem.height
spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
clip: true clip: true
model: AudioScriptingInterface.devices.input model: AudioScriptingInterface.devices.input
@ -305,9 +305,9 @@ Flickable {
ListView { ListView {
id: outputDeviceListView id: outputDeviceListView
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false interactive: false
height: contentItem.height
spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
clip: true clip: true
model: AudioScriptingInterface.devices.output model: AudioScriptingInterface.devices.output

4
interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
View file

@ -199,9 +199,9 @@ Flickable {
ListView { ListView {
id: inputDeviceListView id: inputDeviceListView
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false interactive: false
height: contentItem.height
spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
clip: true clip: true
model: AudioScriptingInterface.devices.input model: AudioScriptingInterface.devices.input
@ -294,9 +294,9 @@ Flickable {
ListView { ListView {
id: outputDeviceListView id: outputDeviceListView
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: contentItem.height
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false interactive: false
height: contentItem.height
spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
clip: true clip: true
model: AudioScriptingInterface.devices.output model: AudioScriptingInterface.devices.output