diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2023-08-22 12:03:42 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2023-08-22 12:03:42 +0000 |
| commit | 92d1d7e52b5fbde067ca3eb22b899ca2eb9eb9ea (patch) | |
| tree | be06465023396b63ae1ad29f58f78a1f3f8dd355 /src/common | |
| parent | df00da1760dcf336015c6e18233d293fb1fd6cf4 (diff) | |
"Merge Tagged PR 11303"mainline-0-1534
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 10 | ||||
| -rw-r--r-- | src/common/settings.h | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 15fd2e2227..16a58a7506 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -207,9 +207,7 @@ const char* TranslateCategory(Category category) { return "Miscellaneous"; } -void UpdateRescalingInfo() { - const auto setup = values.resolution_setup.GetValue(); - auto& info = values.resolution_info; +void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info) { info.downscale = false; switch (setup) { case ResolutionSetup::Res1_2X: @@ -269,6 +267,12 @@ void UpdateRescalingInfo() { info.active = info.up_scale != 1 || info.down_shift != 0; } +void UpdateRescalingInfo() { + const auto setup = values.resolution_setup.GetValue(); + auto& info = values.resolution_info; + TranslateResolutionInfo(setup, info); +} + void RestoreGlobalState(bool is_powered_on) { // If a game is running, DO NOT restore the global settings state if (is_powered_on) { diff --git a/src/common/settings.h b/src/common/settings.h index b0bc6519a6..4407c1e6da 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -525,6 +525,7 @@ std::string GetTimeZoneString(TimeZone time_zone); void LogSettings(); +void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info); void UpdateRescalingInfo(); // Restore the global state of all applicable settings in the Values struct |