From fc7673bb20131baa9c0737d767de2aebeead5461 Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Fri, 3 Apr 2026 23:37:41 +0700 Subject: [PATCH] Qt: Re-arrange Display Settings layout --- .../Settings/GraphicsDisplaySettingsTab.ui | 789 ++++++++++-------- .../GraphicsHardwareRenderingSettingsTab.ui | 185 ++-- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 4 +- .../GraphicsSoftwareRenderingSettingsTab.ui | 83 +- 4 files changed, 579 insertions(+), 482 deletions(-) diff --git a/pcsx2-qt/Settings/GraphicsDisplaySettingsTab.ui b/pcsx2-qt/Settings/GraphicsDisplaySettingsTab.ui index 8b895d00d0c30..0a2e55b684eb3 100644 --- a/pcsx2-qt/Settings/GraphicsDisplaySettingsTab.ui +++ b/pcsx2-qt/Settings/GraphicsDisplaySettingsTab.ui @@ -7,7 +7,7 @@ 0 0 700 - 500 + 700 @@ -19,278 +19,449 @@ - - - - - Deinterlacing: - - - interlacing + + + + + Display Settings + + + + + + + + Automatic (Default) + + + + + No Deinterlacing + + + + + Weave (Top Field First, Sawtooth) + + + + + Weave (Bottom Field First, Sawtooth) + + + + + Bob (Top Field First, Full Frames) + + + + + Bob (Bottom Field First, Full Frames) + + + + + Blend (Top Field First, Merge 2 Fields) + + + + + Blend (Bottom Field First, Merge 2 Fields) + + + + + Adaptive (Top Field First, Similar to Bob + Weave) + + + + + Adaptive (Bottom Field First, Similar to Bob + Weave) + + + + + + + + Vertical Stretch: + + + stretchY + + + + + + + % + + + 1 + + + 300 + + + + + + + + + + Aspect Ratio: + + + aspectRatio + + + + + + + Fullscreen Mode: + + + fullscreenModes + + + + + + + Bilinear Filtering: + + + bilinearFiltering + + + + + + + + Off (Default) + + + + + Auto Standard (4:3 Interlaced / 3:2 Progressive) + + + + + Standard (4:3) + + + + + Widescreen (16:9) + + + + + Native/Full (10:7) + + + + + + + + + Fit to Window / Fullscreen + + + + + Auto Standard (4:3 Interlaced / 3:2 Progressive) + + + + + Standard (4:3) + + + + + Widescreen (16:9) + + + + + Native/Full (10:7) + + + + + + + + + None + + + + + Bilinear (Smooth) + + + + + Bilinear (Sharp) + + + + + + + + FMV Aspect Ratio Override: + + + fmvAspectRatio + + + + + + + Deinterlacing: + + + interlacing + + + + + + - - - - - - - - - Integer Scaling - - - - - - - Apply Widescreen Patches - - - - - - - Apply No-Interlacing Patches - - - - - - - Anti-Blur - - - Ctrl+S - - - - - - - Disable Interlace Offset + + + + + + + 0 + 0 + - - - - - - Screen Offsets + + Miscellanous + + + + + + + Anti-Blur + + + Ctrl+S + + + + + + + Screen Offsets + + + + + + + Apply Widescreen Patches + + + + + + + Disable Interlace Offset + + + + + + + Integer Scaling + + + + + + + Show Overscan + + + + + + + Apply No-Interlacing Patches + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + - - - - Show Overscan + + + + Crop Settings + + + + + Left + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + px + + + 1000 + + + + + + + + + + Top + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + px + + + 1000 + + + + + + + + + + Bottom + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + px + + + 1000 + + + + + + + + + + Right + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + px + + + 1000 + + + + + + + - - - FMV Aspect Ratio Override: - - - fmvAspectRatio - - - - - - - - Fit to Window / Fullscreen - - - - - Auto Standard (4:3 Interlaced / 3:2 Progressive) - - - - - Standard (4:3) - - - - - Widescreen (16:9) - - - - - Native/Full (10:7) - - - - - - - - - None - - - - - Bilinear (Smooth) - - - - - Bilinear (Sharp) - - - - - - - - Vertical Stretch: - - - stretchY - - - - - - - Fullscreen Mode: - - - fullscreenModes - - - - - - - Bilinear Filtering: - - - bilinearFiltering - - - - - - - - Off (Default) - - - - - Auto Standard (4:3 Interlaced / 3:2 Progressive) - - - - - Standard (4:3) - - - - - Widescreen (16:9) - - - - - Native/Full (10:7) - - - - - - - - Crop: - - - - - - - Aspect Ratio: - - - aspectRatio - - - - - - - - Automatic (Default) - - - - - No Deinterlacing - - - - - Weave (Top Field First, Sawtooth) - - - - - Weave (Bottom Field First, Sawtooth) - - - - - Bob (Top Field First, Full Frames) - - - - - Bob (Bottom Field First, Full Frames) - - - - - Blend (Top Field First, Merge 2 Fields) - - - - - Blend (Bottom Field First, Merge 2 Fields) - - - - - Adaptive (Top Field First, Similar to Bob + Weave) - - - - - Adaptive (Bottom Field First, Similar to Bob + Weave) - - - - - - - - % - - - 1 - - - 300 - - - - Qt::Orientation::Vertical @@ -298,95 +469,11 @@ 20 - 0 + 40 - - - - - - px - - - 1000 - - - - - - - Top: - - - cropTop - - - - - - - Left: - - - cropLeft - - - - - - - px - - - 1000 - - - - - - - Right: - - - cropRight - - - - - - - px - - - 1000 - - - - - - - Bottom: - - - cropBottom - - - - - - - px - - - 1000 - - - - - @@ -396,17 +483,17 @@ interlacing bilinearFiltering stretchY - cropLeft - cropRight - cropTop - cropBottom widescreenPatches noInterlacingPatches PCRTCAntiBlur - integerScaling PCRTCOffsets - disableInterlaceOffset PCRTCOverscan + disableInterlaceOffset + integerScaling + cropTop + cropLeft + cropRight + cropBottom diff --git a/pcsx2-qt/Settings/GraphicsHardwareRenderingSettingsTab.ui b/pcsx2-qt/Settings/GraphicsHardwareRenderingSettingsTab.ui index ca312de58fbb7..150c0ac6419b7 100644 --- a/pcsx2-qt/Settings/GraphicsHardwareRenderingSettingsTab.ui +++ b/pcsx2-qt/Settings/GraphicsHardwareRenderingSettingsTab.ui @@ -13,7 +13,7 @@ - + @@ -24,55 +24,53 @@ - - + + + + + + + Trilinear Filtering: + + + trilinearFiltering + + + + + - Off + Minimum - Scaled + Basic (Recommended) - Unscaled (Default) + Medium - Force 32bit + High + + + + + Full (Slow) + + + + + Maximum (Very Slow) - - - - - - Accurate Alpha Test - - - - - - - Mipmapping - - - - - - - Manual Hardware Renderer Fixes - - - - - @@ -83,46 +81,33 @@ - - - - - - - Internal Resolution: - - - upscaleMultiplier - - - - - - - - + + - Nearest + Off - Bilinear (Forced) + Scaled - Bilinear (PS2) + Unscaled (Default) - Bilinear (Forced excluding sprite) + Force 32bit + + + @@ -133,36 +118,49 @@ - - - - - Minimum - - - - - Basic (Recommended) - - + + + + Internal Resolution: + + + upscaleMultiplier + + + + + + + Qt::Orientation::Vertical + + + + 20 + 0 + + + + + + - Medium + Nearest - High + Bilinear (Forced) - Full (Slow) + Bilinear (PS2) - Maximum (Very Slow) + Bilinear (Forced excluding sprite) @@ -201,29 +199,36 @@ - - - - Trilinear Filtering: - - - trilinearFiltering + + + + Miscellanous + + + + + Mipmapping + + + + + + + Accurate Alpha Test + + + + + + + Manual Hardware Renderer Fixes + + + + - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index 9c2ab3fb5ac64..41f10f8b94d47 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -292,8 +292,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog, // Don't allow setting hardware fixes globally. // Too many stupid YouTube "best settings" guides that break other games. - m_hw.hardwareRenderingOptionsLayout->removeWidget(m_hw.enableHWFixes); - delete m_hw.enableHWFixes; + m_hw.miscGroupBox->layout()->removeWidget(m_hw.enableHWFixes); + m_hw.enableHWFixes->deleteLater(); m_hw.enableHWFixes = nullptr; } #endif diff --git a/pcsx2-qt/Settings/GraphicsSoftwareRenderingSettingsTab.ui b/pcsx2-qt/Settings/GraphicsSoftwareRenderingSettingsTab.ui index 21f3a0bd296db..7b9490322bd15 100644 --- a/pcsx2-qt/Settings/GraphicsSoftwareRenderingSettingsTab.ui +++ b/pcsx2-qt/Settings/GraphicsSoftwareRenderingSettingsTab.ui @@ -13,45 +13,7 @@ - - - - - Software Rendering Threads: - - - extraSWThreads - - - - - - - Texture Filtering: - - - swTextureFiltering - - - - - - - - - Mipmapping - - - - - - - Auto Flush - - - - - + @@ -82,6 +44,26 @@ + + + + Software Rendering Threads: + + + extraSWThreads + + + + + + + Texture Filtering: + + + swTextureFiltering + + + @@ -89,6 +71,29 @@ + + + + Miscellanous + + + + + + Auto Flush + + + + + + + Mipmapping + + + + + +