summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2023-08-16 06:18:16 +0200
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2023-08-16 06:18:16 +0200
commit76a03e99b68ea691029cf7eef20a55e3cb1837ad (patch)
treeb6cefcb0db9328e07d9d05854ffc0fc0d49dd883
parentconfigure_ui: Update the screenshots data (diff)
downloadyuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar.gz
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar.bz2
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar.lz
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar.xz
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.tar.zst
yuzu-76a03e99b68ea691029cf7eef20a55e3cb1837ad.zip
-rw-r--r--src/yuzu/bootmanager.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index e522845a3..2a9f423a0 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -918,7 +918,6 @@ void GRenderWindow::ReleaseRenderTarget() {
void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
auto& renderer = system.Renderer();
- const f32 res_scale = Settings::values.resolution_info.up_factor;
if (renderer.IsScreenshotPending()) {
LOG_WARNING(Render,
@@ -926,15 +925,11 @@ void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
return;
}
- const Layout::FramebufferLayout layout{[res_scale]() {
- if (UISettings::values.screenshot_height.GetValue() == 0 &&
- UISettings::values.screenshot_aspect_ratio.GetValue() ==
- Settings::ScreenshotAspectRatio::Auto) {
- return Layout::FrameLayoutFromResolutionScale(res_scale);
- }
+ const Layout::FramebufferLayout layout{[]() {
u32 height = UISettings::values.screenshot_height.GetValue();
if (height == 0) {
- height = Settings::values.use_docked_mode.GetValue() ? 1080 : 720;
+ height = Settings::values.use_docked_mode.GetValue() ? Layout::ScreenDocked::Height
+ : Layout::ScreenUndocked::Height;
height *= Settings::values.resolution_info.up_factor;
}
const u32 width = UISettings::CalculateWidth(