diff options
| author | 2023-08-22 11:30:25 -0400 | |
|---|---|---|
| committer | 2023-08-22 11:30:25 -0400 | |
| commit | ef61d129d3ce357eeb12bc3ed14a1f5e376f1f95 (patch) | |
| tree | 318a5af7edcf8c38de2d1d8a857fa25ce82cb827 /src/common/settings.cpp | |
| parent | Merge pull request #11316 from FernandoS27/stop-premature-christmas-decorating (diff) | |
| parent | uisettings: Add TODO for stretched aspect being ignored (diff) | |
| download | yuzu-ef61d129d3ce357eeb12bc3ed14a1f5e376f1f95.tar.gz yuzu-ef61d129d3ce357eeb12bc3ed14a1f5e376f1f95.tar.xz yuzu-ef61d129d3ce357eeb12bc3ed14a1f5e376f1f95.zip | |
Merge pull request #11303 from lat9nq/screenshots-configurable
yuzu-qt: Add configuration for screenshot resolution
Diffstat (limited to 'src/common/settings.cpp')
| -rw-r--r-- | src/common/settings.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 15fd2e222..16a58a750 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -207,9 +207,7 @@ const char* TranslateCategory(Category category) { | |||
| 207 | return "Miscellaneous"; | 207 | return "Miscellaneous"; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | void UpdateRescalingInfo() { | 210 | void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info) { |
| 211 | const auto setup = values.resolution_setup.GetValue(); | ||
| 212 | auto& info = values.resolution_info; | ||
| 213 | info.downscale = false; | 211 | info.downscale = false; |
| 214 | switch (setup) { | 212 | switch (setup) { |
| 215 | case ResolutionSetup::Res1_2X: | 213 | case ResolutionSetup::Res1_2X: |
| @@ -269,6 +267,12 @@ void UpdateRescalingInfo() { | |||
| 269 | info.active = info.up_scale != 1 || info.down_shift != 0; | 267 | info.active = info.up_scale != 1 || info.down_shift != 0; |
| 270 | } | 268 | } |
| 271 | 269 | ||
| 270 | void UpdateRescalingInfo() { | ||
| 271 | const auto setup = values.resolution_setup.GetValue(); | ||
| 272 | auto& info = values.resolution_info; | ||
| 273 | TranslateResolutionInfo(setup, info); | ||
| 274 | } | ||
| 275 | |||
| 272 | void RestoreGlobalState(bool is_powered_on) { | 276 | void RestoreGlobalState(bool is_powered_on) { |
| 273 | // If a game is running, DO NOT restore the global settings state | 277 | // If a game is running, DO NOT restore the global settings state |
| 274 | if (is_powered_on) { | 278 | if (is_powered_on) { |