dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-07 16:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13893 from TryTwo/PR_Slider_Fixes

Browse Source 
Qt: Prevent QSlider's QLabels from resizing.
This commit is contained in:
Tilka
2025-08-23 12:44:17 +01:00
committed by GitHub
parent 50d3a5510c d69056aab4
commit ab8a02566d
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@@ -6,6 +6,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QDateTimeEdit> #include <QDateTimeEdit>
#include <QFontMetrics>
#include <QFormLayout> #include <QFormLayout>
#include <QGroupBox> #include <QGroupBox>
#include <QHBoxLayout> #include <QHBoxLayout>
@@ -102,6 +103,10 @@ void AdvancedPane::CreateLayout()
"<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>")); "<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>"));
timing_group_layout->addWidget(correct_time_drift); timing_group_layout->addWidget(correct_time_drift);
// Make all labels the same width, so that the sliders are aligned.
const QFontMetrics font_metrics{font()};
const int label_width = font_metrics.boundingRect(QStringLiteral(" 500% (000.00 VPS)")).width();
auto* clock_override = new QGroupBox(tr("Clock Override")); auto* clock_override = new QGroupBox(tr("Clock Override"));
auto* clock_override_layout = new QVBoxLayout(); auto* clock_override_layout = new QVBoxLayout();
clock_override->setLayout(clock_override_layout); clock_override->setLayout(clock_override_layout);
@@ -120,6 +125,8 @@ void AdvancedPane::CreateLayout()
cpu_clock_override_slider_layout->addWidget(m_cpu_clock_override_slider); cpu_clock_override_slider_layout->addWidget(m_cpu_clock_override_slider);
m_cpu_label = new QLabel(); m_cpu_label = new QLabel();
m_cpu_label->setFixedWidth(label_width);
m_cpu_label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
cpu_clock_override_slider_layout->addWidget(m_cpu_label); cpu_clock_override_slider_layout->addWidget(m_cpu_label);
std::function<void()> cpu_text = [this]() { std::function<void()> cpu_text = [this]() {
@@ -163,6 +170,8 @@ void AdvancedPane::CreateLayout()
vi_rate_override_slider_layout->addWidget(m_vi_rate_override_slider); vi_rate_override_slider_layout->addWidget(m_vi_rate_override_slider);
m_vi_label = new QLabel(); m_vi_label = new QLabel();
m_vi_label->setFixedWidth(label_width);
m_vi_label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
vi_rate_override_slider_layout->addWidget(m_vi_label); vi_rate_override_slider_layout->addWidget(m_vi_label);
std::function<void()> vi_text = [this]() { std::function<void()> vi_text = [this]() {
const int percent = const int percent =
@@ -208,6 +217,8 @@ void AdvancedPane::CreateLayout()
m_mem1_label = m_mem1_label =
new QLabel(tr("%1 MB (MEM1)").arg(QString::number(m_mem1_override_slider->value()))); new QLabel(tr("%1 MB (MEM1)").arg(QString::number(m_mem1_override_slider->value())));
m_mem1_label->setFixedWidth(label_width);
m_mem1_label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
mem1_override_slider_layout->addWidget(m_mem1_label); mem1_override_slider_layout->addWidget(m_mem1_label);
connect(m_mem1_override_slider, &QSlider::valueChanged, this, [this](int value) { connect(m_mem1_override_slider, &QSlider::valueChanged, this, [this](int value) {
m_mem1_label->setText(tr("%1 MB (MEM1)").arg(QString::number(value))); m_mem1_label->setText(tr("%1 MB (MEM1)").arg(QString::number(value)));
@@ -222,6 +233,8 @@ void AdvancedPane::CreateLayout()
m_mem2_label = m_mem2_label =
new QLabel(tr("%1 MB (MEM2)").arg(QString::number(m_mem2_override_slider->value()))); new QLabel(tr("%1 MB (MEM2)").arg(QString::number(m_mem2_override_slider->value())));
m_mem2_label->setFixedWidth(label_width);
m_mem2_label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
mem2_override_slider_layout->addWidget(m_mem2_label); mem2_override_slider_layout->addWidget(m_mem2_label);
connect(m_mem2_override_slider, &QSlider::valueChanged, this, [this](int value) { connect(m_mem2_override_slider, &QSlider::valueChanged, this, [this](int value) {
m_mem2_label->setText(tr("%1 MB (MEM2)").arg(QString::number(value))); m_mem2_label->setText(tr("%1 MB (MEM2)").arg(QString::number(value)));

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

@@ -180,6 +180,7 @@ void AudioPane::CreateWidgets()
// Set initial value display // Set initial value display
audio_buffer_size_label->setText(tr("%1 ms").arg(audio_buffer_size->value())); audio_buffer_size_label->setText(tr("%1 ms").arg(audio_buffer_size->value()));
audio_buffer_size_label->setFixedWidth(QFontMetrics(font()).boundingRect(tr(" 000 ms")).width());
m_audio_fill_gaps = new ConfigBool(tr("Fill Audio Gaps"), Config::MAIN_AUDIO_FILL_GAPS); m_audio_fill_gaps = new ConfigBool(tr("Fill Audio Gaps"), Config::MAIN_AUDIO_FILL_GAPS);