From ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Tue, 21 Aug 2018 01:14:06 +0200 Subject: Port #3353 from Citra --- src/yuzu/configuration/configure_graphics.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/yuzu/configuration/configure_graphics.cpp') diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 4afe0f81b..ee1287028 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -12,6 +12,10 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent) ui->setupUi(this); this->setConfiguration(); + + ui->frame_limit->setEnabled(Settings::values.use_frame_limit); + connect(ui->toggle_frame_limit, &QCheckBox::stateChanged, ui->frame_limit, + &QSpinBox::setEnabled); } ConfigureGraphics::~ConfigureGraphics() = default; @@ -58,13 +62,15 @@ Resolution FromResolutionFactor(float factor) { void ConfigureGraphics::setConfiguration() { ui->resolution_factor_combobox->setCurrentIndex( static_cast(FromResolutionFactor(Settings::values.resolution_factor))); - ui->toggle_framelimit->setChecked(Settings::values.toggle_framelimit); + ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); + ui->frame_limit->setValue(Settings::values.frame_limit); ui->use_accurate_framebuffers->setChecked(Settings::values.use_accurate_framebuffers); } void ConfigureGraphics::applyConfiguration() { Settings::values.resolution_factor = ToResolutionFactor(static_cast(ui->resolution_factor_combobox->currentIndex())); - Settings::values.toggle_framelimit = ui->toggle_framelimit->isChecked(); + Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked(); + Settings::values.frame_limit = ui->frame_limit->value(); Settings::values.use_accurate_framebuffers = ui->use_accurate_framebuffers->isChecked(); } -- cgit v1.2.3