From a2e1ddc3541ca7233ed05e31d88278805cf088e1 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 20 May 2021 11:25:05 -0700 Subject: [PATCH] AudioPane: Remove main layout vertical stretching --- Source/Core/DolphinQt/Settings/AudioPane.cpp | 18 ++++++++++-------- Source/Core/DolphinQt/Settings/AudioPane.h | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinQt/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp index f616b6bcf5..2cf8ceda86 100644 --- a/Source/Core/DolphinQt/Settings/AudioPane.cpp +++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -155,18 +156,19 @@ void AudioPane::CreateWidgets() stretching_layout->addWidget(m_stretching_buffer_slider, 1, 1); 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); - m_main_layout->addWidget(dsp_box, 0, 0); - m_main_layout->addWidget(volume_box, 0, 1, -1, 1); - m_main_layout->addWidget(backend_box, 1, 0); - m_main_layout->addWidget(stretching_box, 2, 0); + auto* const main_vbox_layout = new QVBoxLayout; + main_vbox_layout->addWidget(dsp_box); + main_vbox_layout->addWidget(backend_box); + 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); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); } void AudioPane::ConnectWidgets() diff --git a/Source/Core/DolphinQt/Settings/AudioPane.h b/Source/Core/DolphinQt/Settings/AudioPane.h index 3348e5e908..33ba33e63f 100644 --- a/Source/Core/DolphinQt/Settings/AudioPane.h +++ b/Source/Core/DolphinQt/Settings/AudioPane.h @@ -13,8 +13,8 @@ enum class DPL2Quality; class QCheckBox; class QComboBox; +class QHBoxLayout; class QLabel; -class QGridLayout; class QRadioButton; class QSlider; class QSpinBox; @@ -45,7 +45,7 @@ private: QString GetDPL2ApproximateLatencyLabel(AudioCommon::DPL2Quality value) const; void EnableDolbyQualityWidgets(bool enabled) const; - QGridLayout* m_main_layout; + QHBoxLayout* m_main_layout; // DSP Engine QRadioButton* m_dsp_hle;