ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9730 from Dentomologist/remove_audio_pane_stretching 

AudioPane: Remove main layout vertical stretching
This commit is contained in:
Léo Lam 2021-06-13 10:57:31 +02:00 committed by GitHub
parent a09d9cf608 a2e1ddc354
commit 0a1f58ad77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinQt/Settings/AudioPane.cpp
View File

@ -10,6 +10,7 @@
#include <QFormLayout> #include <QFormLayout>
#include <QGridLayout> #include <QGridLayout>
#include <QGroupBox> #include <QGroupBox>
#include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QRadioButton> #include <QRadioButton>
#include <QSlider> #include <QSlider>
@ -155,18 +156,19 @@ void AudioPane::CreateWidgets()
stretching_layout->addWidget(m_stretching_buffer_slider, 1, 1); stretching_layout->addWidget(m_stretching_buffer_slider, 1, 1);
stretching_layout->addWidget(m_stretching_buffer_indicator, 1, 2); stretching_layout->addWidget(m_stretching_buffer_indicator, 1, 2);
m_main_layout = new QGridLayout;
m_main_layout->setRowStretch(0, 0);
dsp_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); dsp_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_main_layout->addWidget(dsp_box, 0, 0); auto* const main_vbox_layout = new QVBoxLayout;
m_main_layout->addWidget(volume_box, 0, 1, -1, 1); main_vbox_layout->addWidget(dsp_box);
m_main_layout->addWidget(backend_box, 1, 0); main_vbox_layout->addWidget(backend_box);
m_main_layout->addWidget(stretching_box, 2, 0); main_vbox_layout->addWidget(stretching_box);
m_main_layout = new QHBoxLayout;
m_main_layout->addLayout(main_vbox_layout);
m_main_layout->addWidget(volume_box);
setLayout(m_main_layout); setLayout(m_main_layout);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
} }
void AudioPane::ConnectWidgets() void AudioPane::ConnectWidgets()

4
Source/Core/DolphinQt/Settings/AudioPane.h
View File

@ -13,8 +13,8 @@ enum class DPL2Quality;
class QCheckBox; class QCheckBox;
class QComboBox; class QComboBox;
class QHBoxLayout;
class QLabel; class QLabel;
class QGridLayout;
class QRadioButton; class QRadioButton;
class QSlider; class QSlider;
class QSpinBox; class QSpinBox;
@ -45,7 +45,7 @@ private:
QString GetDPL2ApproximateLatencyLabel(AudioCommon::DPL2Quality value) const; QString GetDPL2ApproximateLatencyLabel(AudioCommon::DPL2Quality value) const;
void EnableDolbyQualityWidgets(bool enabled) const; void EnableDolbyQualityWidgets(bool enabled) const;
QGridLayout* m_main_layout; QHBoxLayout* m_main_layout;
// DSP Engine // DSP Engine
QRadioButton* m_dsp_hle; QRadioButton* m_dsp_hle;