Merge pull request #2515 from lioncash/narrowing
yuzu/configuration/configure_graphics: Eliminate type narrowing in a connect call
This commit is contained in:
commit
6ce5f3e1bf
|
@ -51,17 +51,15 @@ Resolution FromResolutionFactor(float factor) {
|
||||||
|
|
||||||
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
|
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
|
||||||
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
|
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
this->setConfiguration();
|
setConfiguration();
|
||||||
|
|
||||||
ui->frame_limit->setEnabled(Settings::values.use_frame_limit);
|
connect(ui->toggle_frame_limit, &QCheckBox::toggled, ui->frame_limit, &QSpinBox::setEnabled);
|
||||||
connect(ui->toggle_frame_limit, &QCheckBox::stateChanged, ui->frame_limit,
|
|
||||||
&QSpinBox::setEnabled);
|
|
||||||
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
|
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
|
||||||
const QColor new_bg_color = QColorDialog::getColor(bg_color);
|
const QColor new_bg_color = QColorDialog::getColor(bg_color);
|
||||||
if (!new_bg_color.isValid())
|
if (!new_bg_color.isValid()) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
UpdateBackgroundColorButton(new_bg_color);
|
UpdateBackgroundColorButton(new_bg_color);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -74,6 +72,7 @@ void ConfigureGraphics::setConfiguration() {
|
||||||
ui->resolution_factor_combobox->setCurrentIndex(
|
ui->resolution_factor_combobox->setCurrentIndex(
|
||||||
static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
|
static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
|
||||||
ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit);
|
ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit);
|
||||||
|
ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked());
|
||||||
ui->frame_limit->setValue(Settings::values.frame_limit);
|
ui->frame_limit->setValue(Settings::values.frame_limit);
|
||||||
ui->use_compatibility_profile->setEnabled(runtime_lock);
|
ui->use_compatibility_profile->setEnabled(runtime_lock);
|
||||||
ui->use_compatibility_profile->setChecked(Settings::values.use_compatibility_profile);
|
ui->use_compatibility_profile->setChecked(Settings::values.use_compatibility_profile);
|
||||||
|
|
Reference in New Issue