summaryrefslogtreecommitdiff
path: root/src/citra_qt/config.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2017-01-08 12:25:12 -0500
committerGravatar GitHub2017-01-08 12:25:12 -0500
commit9fc8ead8424a1e9fa46ab9b15777416b256a77d1 (patch)
tree3757cf233b6b57155c287c7f968cad5e41761a05 /src/citra_qt/config.cpp
parentMerge pull request #1951 from wwylele/motion-sensor (diff)
parentconfig: Add option for specifying screen resolution scale factor. (diff)
downloadyuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.tar.gz
yuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.tar.xz
yuzu-9fc8ead8424a1e9fa46ab9b15777416b256a77d1.zip
Merge pull request #2384 from bunnei/internal-res-option
config: Add option for specifying screen resolution scale factor.
Diffstat (limited to 'src/citra_qt/config.cpp')
-rw-r--r--src/citra_qt/config.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index c904c4b00..8021667d0 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -44,8 +44,7 @@ void Config::ReadValues() {
44 qt_config->beginGroup("Renderer"); 44 qt_config->beginGroup("Renderer");
45 Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool(); 45 Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool();
46 Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool(); 46 Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool();
47 Settings::values.use_scaled_resolution = 47 Settings::values.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat();
48 qt_config->value("use_scaled_resolution", false).toBool();
49 Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool(); 48 Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool();
50 Settings::values.toggle_framelimit = qt_config->value("toggle_framelimit", true).toBool(); 49 Settings::values.toggle_framelimit = qt_config->value("toggle_framelimit", true).toBool();
51 50
@@ -152,7 +151,7 @@ void Config::SaveValues() {
152 qt_config->beginGroup("Renderer"); 151 qt_config->beginGroup("Renderer");
153 qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer); 152 qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer);
154 qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit); 153 qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit);
155 qt_config->setValue("use_scaled_resolution", Settings::values.use_scaled_resolution); 154 qt_config->setValue("resolution_factor", (double)Settings::values.resolution_factor);
156 qt_config->setValue("use_vsync", Settings::values.use_vsync); 155 qt_config->setValue("use_vsync", Settings::values.use_vsync);
157 qt_config->setValue("toggle_framelimit", Settings::values.toggle_framelimit); 156 qt_config->setValue("toggle_framelimit", Settings::values.toggle_framelimit);
158 157