GS/HW: Refactor StretchRect() to have single entry to renderer/reduce duplication.

We currently have a barrier so let's do date_one in a single pass, plus this avoids any issues with copies and stencil issues.
On dx copies are slower so we can only use the optimization if we have barriers already present.

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 github: [PCSX2]
+liberapay: PCSX2

.github/labeler.yml

@@ -40,6 +40,13 @@
       - 'pcsx2-qt/**/*'
       - '3rdparty/Qt/*'
       - '3rdparty/Qt/**/*'
+'OSD / ImGui':
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/ImGui/*'
+      - 'pcsx2/ImGui/**/*'
+      - '3rdparty/imgui/*'
+      - '3rdparty/imgui/**/*'
 'GameDB':
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/lint_gamedb.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install Packages
         run: |
           npm install -g ajv-cli prettier
-          sudo apt-get -y install yamllint
+          pip install yamllint
 
       - name: Validate YAML
         run: |

.github/workflows/linux_build_flatpak.yml

@@ -45,7 +45,7 @@ jobs:
     name: ${{ inputs.jobName }}
     runs-on: ${{ inputs.os }}
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9
       options: --privileged
     timeout-minutes: 60
 
@@ -129,7 +129,7 @@ jobs:
 
       - name: Push to Flathub (beta)
         if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
+        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
@@ -138,7 +138,7 @@ jobs:
 
       - name: Push to Flathub (stable)
         if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
+        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: stable
@@ -153,7 +153,7 @@ jobs:
           mv "./${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak" "$GITHUB_WORKSPACE"/ci-artifacts/
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: ci-artifacts

.github/workflows/linux_build_qt.yml

@@ -55,7 +55,7 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 500M
+      CCACHE_MAXSIZE: 100M
 
     steps:
       - name: Checkout Repository
@@ -174,7 +174,7 @@ jobs:
 
       - name: Upload artifact
         if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: ci-artifacts

.github/workflows/macos_build.yml

@@ -12,7 +12,7 @@ on:
       os:
         required: false
         type: string
-        default: macos-15
+        default: macos-26
       patchesUrl:
         required: false
         type: string
@@ -42,7 +42,7 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 500M
+      CCACHE_MAXSIZE: 100M
       # Only way to use a secret in an if statement
       SIGN_KEY: ${{ secrets.APPLE_SIGN_P12_B64 }}
 
@@ -62,8 +62,11 @@ jobs:
           echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
           cat ./pcsx2-qt/DefaultUpdaterChannel.h
 
-      - name: Use Xcode 16.4
-        run: sudo xcode-select -s /Applications/Xcode_16.4.app
+      - name: Use Xcode 26.0.1
+        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
+
+      - name: Install Metal Toolchain
+        run: xcodebuild -downloadComponent MetalToolchain
 
       - name: Prepare Artifact Metadata
         id: artifact-metadata
@@ -91,7 +94,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/deps
-          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh', '.github/workflows/scripts/common/*.patch') }}
+          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/*', '.github/workflows/scripts/common/*.patch') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
@@ -194,7 +197,7 @@ jobs:
           cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: "*.tar.xz"

.github/workflows/release_cut_new.yml

@@ -68,7 +68,7 @@ jobs:
           mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md
 
       - name: Create a GitHub Release (Manual)
-        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe
         if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
         with:
           body_path: ./release-notes.md
@@ -77,7 +77,7 @@ jobs:
           tag_name: ${{ steps.tag_version.outputs.new_tag }}
 
       - name: Create a GitHub Release (Push)
-        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe
         if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
         with:
           body_path: ./release-notes.md
@@ -168,7 +168,7 @@ jobs:
       - name: Prepare Artifact Folder
         run: mkdir ./ci-artifacts/
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         name: Download all Artifacts
         with:
           path: ./ci-artifacts/
@@ -203,7 +203,7 @@ jobs:
           echo "TAG_VAL=${TAG_VAL}"
           gh release edit ${TAG_VAL} --draft=false --repo PCSX2/pcsx2
 
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: 22
 

.github/workflows/scripts/linux/appimage-qt.sh

@@ -50,12 +50,6 @@ declare -a MANUAL_LIBS=(
 	"libfreetype.so.6"
 )
 
-declare -a REMOVE_LIBS=(
-	'libwayland-client.so*'
-	'libwayland-cursor.so*'
-	'libwayland-egl.so*'
-)
-
 set -e
 
 LINUXDEPLOY=./linuxdeploy-x86_64.AppImage
@@ -130,7 +124,7 @@ echo "Running linuxdeploy to create AppDir..."
 # Interestingly, specifying the module doesn't copy the module, only the required plugins for it
 # https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/160#issuecomment-2655543893
 EXTRA_QT_MODULES="core;gui;svg;waylandclient;waylandcompositor;widgets;xcbqpa" \
-EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
+EXTRA_PLATFORM_PLUGINS="libqwayland.so" \
 DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
@@ -140,16 +134,6 @@ $LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt
 echo "Copying resources into AppDir..."
 cp -a "$BUILDDIR/bin/resources" "$OUTDIR/usr/bin"
 
-# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin
-# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the
-# include list...
-for lib in "${REMOVE_LIBS[@]}"; do
-	for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do
-		echo "    Removing problematic library ${libpath}."
-		rm -f "$libpath"
-	done
-done
-
 # Restore unstripped deps (for cache).
 rm -fr "$DEPSDIR"
 mv "$DEPSDIR.bak" "$DEPSDIR"

.github/workflows/scripts/linux/build-dependencies-qt.sh

@@ -20,12 +20,12 @@ LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
 LIBJPEGTURBO=3.1.2
 LIBPNG=1.6.50
 LIBWEBP=1.6.0
-SDL=SDL3-3.2.24
-QT=6.9.2
+SDL=SDL3-3.2.26
+QT=6.10.1
 QTAPNG=1.3.0
 LZ4=1.10.0
 ZSTD=1.5.7
-KDDOCKWIDGETS=2.3.0
+KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
 
@@ -44,22 +44,22 @@ fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.
 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
+dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440  qtbase-everywhere-src-$QT.tar.xz
-8a023f7e2f57dedc02e2ab10c975f7cb3cccac9b8f0823c12fd6824834549139  qtimageformats-everywhere-src-$QT.tar.xz
-d984cab8f26334aa1c15e5b8f0cd9f1b7c0c1289fe0b68c1c84ab469b75605a5  qtsvg-everywhere-src-$QT.tar.xz
-d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489  qttools-everywhere-src-$QT.tar.xz
-c73bb6281ed365c0f954f4b1b6e1b13e1b3fefd94854f46fcd9a412f641f7ed6  qttranslations-everywhere-src-$QT.tar.xz
-cad79806565568f12f9983fed69219416abcee9d5deef4abdfcf94aa2eef7781  qtwayland-everywhere-src-$QT.tar.xz
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
+49bf6db800227a6b2c971f4c5d03dd1e81297e7ffb296ce4a96437304f27cb13  qtwayland-everywhere-src-$QT.tar.xz
 f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
@@ -116,7 +116,9 @@ echo "Building libjpegturbo..."
 rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
 tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
 cd "libjpeg-turbo-$LIBJPEGTURBO"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja
+# On non debian or debian based Linux systems, libjpeg-turbo will set CMAKE_INSTALL_DEFAULT_LIBDIR "lib64" (or libx32)
+# That will prevent CMake from finding the deps libjpeg later on. if we set CMAKE_INSTALL_DEFAULT_LIBDIR, libjpeg-turbo will leave it as is, so set it to "lib"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DCMAKE_INSTALL_DEFAULT_LIBDIR="lib" -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..

.github/workflows/scripts/linux/build-dependencies-runner.sh

@@ -0,0 +1,196 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+NPROCS="$(getconf _NPROCESSORS_ONLN)"
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+        INSTALLDIR="$PWD/$INSTALLDIR"
+fi
+
+FREETYPE=2.14.1
+HARFBUZZ=12.0.0
+LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
+LIBPNG=1.6.50
+LIBWEBP=1.6.0
+SDL=SDL3-3.2.22
+LZ4=1.10.0
+ZSTD=1.5.7
+PLUTOVG=1.3.1
+PLUTOSVG=0.0.7
+
+SHADERC=2025.3
+SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a
+
+mkdir -p deps-build
+cd deps-build
+
+cat > SHASUMS <<EOF
+32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
+c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
+fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
+e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
+f29d00cbcee273c0a54f3f32f86bf5c595e8823a96b1d92a145aac40571ebfcc  $SDL.tar.gz
+687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
+537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
+eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
+a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
+9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
+78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+EOF
+
+curl -L \
+        -o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+        -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
+        -O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
+        -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+        -O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
+        -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+        -O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
+        -O "https://libsdl.org/release/$SDL.tar.gz" \
+        -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+        -o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+        -o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+        -o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+        -o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
+        -o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
+        -o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
+
+shasum -a 256 --check SHASUMS
+
+echo "Building libbacktrace..."
+rm -fr "libbacktrace-$LIBBACKTRACE"
+unzip "$LIBBACKTRACE.zip"
+cd "libbacktrace-$LIBBACKTRACE"
+./configure --prefix="$INSTALLDIR"
+make
+make install
+cd ..
+
+echo "Building libpng..."
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
+cd "libpng-$LIBPNG"
+patch -p1 < "../libpng-$LIBPNG-apng.patch"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "lz4-$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir -G Ninja build/cmake
+cmake --build build-dir --parallel
+ninja -C build-dir install
+cd ..
+
+echo "Building Zstandard..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja \
+  -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+  -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building SDL..."
+rm -fr "$SDL"
+tar xf "$SDL.tar.gz"
+cd "$SDL"
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building PlutoVG..."
+rm -fr "plutovg-$PLUTOVG"
+tar xf "plutovg-$PLUTOVG.tar.gz"
+cd "plutovg-$PLUTOVG"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building PlutoSVG..."
+rm -fr "plutosvg-$PLUTOSVG"
+tar xf "plutosvg-$PLUTOSVG.tar.gz"
+cd "plutosvg-$PLUTOSVG"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Cleaning up..."
+cd ..
+rm -r deps-build

.github/workflows/scripts/linux/flatpak/modules/20-sdl3.json

@@ -14,8 +14,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.2.24.tar.gz",
-      "sha256": "81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76"
+      "url": "https://libsdl.org/release/SDL3-3.2.26.tar.gz",
+      "sha256": "dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2"
     }
   ],
   "cleanup": [

.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

@@ -1,15 +1,15 @@
 {
   "app-id": "net.pcsx2.PCSX2",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.9",
+  "runtime-version": "6.10",
   "sdk": "org.kde.Sdk",
   "sdk-extensions": [
-    "org.freedesktop.Sdk.Extension.llvm18"
+    "org.freedesktop.Sdk.Extension.llvm20"
   ],
   "add-extensions": {
     "org.freedesktop.Platform.ffmpeg-full": {
       "directory": "lib/ffmpeg",
-      "version": "24.08",
+      "version": "25.08",
       "add-ld-path": ".",
       "autodownload": true
     }
@@ -50,8 +50,8 @@
           "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\"",
           "-DCMAKE_BUILD_TYPE=Release",
           "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
-          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang",
-          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++",
+          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm20/bin/clang",
+          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm20/bin/clang++",
           "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld",
           "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld",
           "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld",

.github/workflows/scripts/macos/build-dependencies-universal.sh

@@ -40,17 +40,17 @@ fi
 
 FREETYPE=2.14.1
 HARFBUZZ=12.0.0
-SDL=SDL3-3.2.24
+SDL=SDL3-3.2.26
 ZSTD=1.5.7
 LZ4=1.10.0
 LIBPNG=1.6.50
 LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
-FFMPEG=6.0
+FFMPEG=8.0
 MOLTENVK=1.2.9
-QT=6.7.3
+QT=6.10.1
 QTAPNG=1.3.0
-KDDOCKWIDGETS=2.3.0
+KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
 
@@ -80,26 +80,26 @@ CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
 cat > SHASUMS <<EOF
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
-81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
+dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
-8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
-9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
-40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
-f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
-dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
 f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
@@ -285,6 +285,10 @@ echo "Installing Qt Base..."
 rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
+
+# Patch Qt to support macOS 11
+patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
+
 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
 # We could run macdeployqt twice, but that's even more janky than patching it.
@@ -320,7 +324,7 @@ tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -331,7 +335,7 @@ tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_system_webp=ON
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_system_webp=ON
 make "-j$NPROCS"
 make install
 cd ../..
@@ -342,7 +346,7 @@ tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -371,7 +375,7 @@ tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -391,8 +395,8 @@ rm -fr "KDDockWidgets-$KDDOCKWIDGETS"
 tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build
-cmake --build build --parallel
-cmake --install build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
 echo "Building PlutoVG..."

.github/workflows/scripts/macos/build-dependencies.sh

@@ -22,17 +22,17 @@ fi
 
 FREETYPE=2.14.1
 HARFBUZZ=12.0.0
-SDL=SDL3-3.2.24
+SDL=SDL3-3.2.26
 ZSTD=1.5.7
 LZ4=1.10.0
 LIBPNG=1.6.50
 LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
-FFMPEG=6.0
+FFMPEG=8.0
 MOLTENVK=1.2.9
-QT=6.7.3
+QT=6.10.1
 QTAPNG=1.3.0
-KDDOCKWIDGETS=2.3.0
+KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
 
@@ -54,32 +54,33 @@ CMAKE_COMMON=(
 	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
 	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
 	-DCMAKE_OSX_ARCHITECTURES="x86_64"
+	-DCMAKE_APPLE_SILICON_PROCESSOR="x86_64"
 	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
 )
 
 cat > SHASUMS <<EOF
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
-81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
+dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
-8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
-9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
-40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
-f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
-dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
 f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
 9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
 bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF
@@ -233,26 +234,15 @@ rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 
+# Patch Qt to support macOS 11
+patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
+
 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
 # We could run macdeployqt twice, but that's even more janky than patching it.
-
-# https://github.com/qt/qtbase/commit/7b018629c3c3ab23665bf1da00c43c1546042035
-# The QProcess default wait time of 30s may be too short in e.g. CI environments where processes may be blocked
-# for a longer time waiting for CPU or IO.
-
 patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
 --- shared.cpp
 +++ shared.cpp
-@@ -152,7 +152,7 @@
-     LogDebug() << " inspecting" << binaryPath;
-     QProcess otool;
-     otool.start("otool", QStringList() << "-L" << binaryPath);
--    otool.waitForFinished();
-+    otool.waitForFinished(-1);
- 
-     if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
-         LogError() << otool.readAllStandardError();
 @@ -1122,14 +1122,8 @@
          addPlugins(QStringLiteral("networkinformation"));
      }
@@ -271,7 +261,7 @@ patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
  
      // Platforminputcontext plugins if QtGui is in use
 EOF
-cmake -B build "${CMAKE_COMMON[@]}" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+cmake -B build "${CMAKE_COMMON[@]}" -DCMAKE_BUILD_TYPE=MinSizeRel -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -282,7 +272,7 @@ tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -293,7 +283,7 @@ tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_system_webp=ON
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF -DFEATURE_system_webp=ON
 make "-j$NPROCS"
 make install
 cd ../..
@@ -304,7 +294,7 @@ tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -333,7 +323,7 @@ tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF
 make "-j$NPROCS"
 make install
 cd ../..

.github/workflows/scripts/macos/qt-macos11compat.patch

@@ -0,0 +1,116 @@
+diff --git a/.cmake.conf b/.cmake.conf
+--- a/.cmake.conf
++++ b/.cmake.conf
+@@ -51,7 +51,7 @@ set(QT_MAX_NEW_POLICY_CMAKE_VERSION_QT_APPLE "3.21")
+ set(QT_SUPPORTED_MIN_MACOS_SDK_VERSION "14")
+ set(QT_SUPPORTED_MAX_MACOS_SDK_VERSION "26")
+ set(QT_SUPPORTED_MIN_MACOS_XCODE_VERSION "15")
+-set(QT_SUPPORTED_MIN_MACOS_VERSION "13")
++set(QT_SUPPORTED_MIN_MACOS_VERSION "11")
+ set(QT_SUPPORTED_MAX_MACOS_VERSION_TESTED "26")
+ 
+ set(QT_SUPPORTED_MIN_IOS_SDK_VERSION "17")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,6 +12,10 @@ cmake_minimum_required(VERSION 3.16)
+ # Get the repo version and CMake policy details
+ include(.cmake.conf)
+ 
++if(APPLE)
++  add_compile_options(-Werror=unguarded-availability-new)
++endif()
++
+ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBaseHelpers.cmake)
+ 
+ qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}")
+diff --git a/src/corelib/global/qsysinfo.cpp b/src/corelib/global/qsysinfo.cpp
+--- a/src/corelib/global/qsysinfo.cpp
++++ b/src/corelib/global/qsysinfo.cpp
+@@ -1027,7 +1027,7 @@ QByteArray QSysInfo::machineUniqueId()
+ {
+ #if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
+     char uuid[UuidStringLen + 1];
+-    io_service_t service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
++    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
+     QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
+     CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
+     return QByteArray(uuid);
+diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
+--- a/src/corelib/kernel/qcore_mac.mm
++++ b/src/corelib/kernel/qcore_mac.mm
+@@ -367,7 +367,7 @@ bool qt_apple_runningWithLiquidGlass()
+             return config;
+ #endif
+ 
+-        QIOType<io_registry_entry_t> nvram = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options");
++        QIOType<io_registry_entry_t> nvram = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/options");
+         if (!nvram) {
+             qWarning("Failed to locate NVRAM entry in IO registry");
+             return {};
+diff --git a/src/gui/platform/darwin/qappleiconengine.mm b/src/gui/platform/darwin/qappleiconengine.mm
+--- a/src/gui/platform/darwin/qappleiconengine.mm
++++ b/src/gui/platform/darwin/qappleiconengine.mm
+@@ -366,12 +366,16 @@
+                                                weight:NSFontWeightRegular
+                                                scale:NSImageSymbolScaleLarge];
+ 
++    auto *primaryColor = [NSColor colorWithSRGBRed:color.redF()
++                                             green:color.greenF()
++                                              blue:color.blueF()
++                                             alpha:color.alphaF()];
++
++    if (@available(macOS 13, *)) {
++
+     // Apply tint color first, which switches the configuration to palette mode
+     config = [config configurationByApplyingConfiguration:
+-        [NSImageSymbolConfiguration configurationWithPaletteColors:@[
+-            [NSColor colorWithSRGBRed:color.redF() green:color.greenF()
+-                blue:color.blueF() alpha:color.alphaF()]
+-        ]]];
++        [NSImageSymbolConfiguration configurationWithPaletteColors:@[primaryColor]]];
+ 
+     // Then switch back to monochrome, as palette mode gives a different look
+     // than monochrome, even with a single color.
+@@ -379,6 +383,18 @@
+         [NSImageSymbolConfiguration configurationPreferringMonochrome]];
+ 
+     return [image imageWithSymbolConfiguration:config];
++
++    } else {
++    NSImage *configuredImage = [image imageWithSymbolConfiguration:config];
++    return [NSImage imageWithSize:configuredImage.size flipped:NO
++        drawingHandler:^BOOL(NSRect) {
++            [primaryColor set];
++            NSRect imageRect = {NSZeroPoint, configuredImage.size};
++            [configuredImage drawInRect:imageRect];
++            NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn);
++            return YES;
++        }];
++    }
+ }
+ #elif defined(QT_PLATFORM_UIKIT)
+ auto *configuredImage(const UIImage *image, const QColor &color)
+diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
+--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
+@@ -323,6 +323,8 @@ a normal (not maximized or full screen) top-level window.
+         m_view.safeAreaInsets.bottom
+     };
+ 
++    if (@available(macOS 12, *)) {
++
+     // The screen's safe area insets represent the distances from the screen's
+     // edges at which content isn't obscured. The view's safe area margins do
+     // not include the screen's insets automatically, so we need to manually
+@@ -355,6 +357,10 @@ a normal (not maximized or full screen) top-level window.
+     };
+ 
+     return (screenSafeAreaMargins | viewSafeAreaMargins).toMargins();
++
++    } else {
++        return viewSafeAreaMargins.toMargins();
++    }
+ }
+ 
+ void QCocoaWindow::updateSafeAreaMarginsIfNeeded()

.github/workflows/scripts/windows/build-dependencies-arm64.bat

@@ -46,17 +46,17 @@ set FREETYPE=2.14.1
 set HARFBUZZ=12.0.0
 set LIBJPEGTURBO=3.1.2
 set LIBPNG=1650
-set SDL=SDL3-3.2.24
-set QT=6.9.2
 set LIBPNGLONG=1.6.50
-set QTMINOR=6.9
+set SDL=SDL3-3.2.26
+set QT=6.10.1
+set QTMINOR=6.10
 set QTAPNG=1.3.0
 set LZ4=1.10.0
 set WEBP=1.6.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.3.0
+set KDDOCKWIDGETS=2.4.0
 set PLUTOVG=1.3.1
 set PLUTOSVG=0.0.7
 
@@ -71,17 +71,17 @@ call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lp
 call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95 || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 97d59c78e40b4ddd018738d285a12afc320b57f8265a3f760353739a3619ccdb || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" f2fc6ff382c6f3af79493d0709dbd64847d0356313518f094f9096315f2fdb30 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" af80bb671ea0f66c0036ce7041a56b0e550fc94fb88d2c77b5b6a3e33e42139b || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" d2f4c7a4a12630e879702353f944f96a5d8e764771b5a5f04163334ad61b39db || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 3e168d1b081ee3a2175fe1bd97ad03bb40fe7ce38a37e99923a19f0e7ec4d81c || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 739356eef1192fff9d641c320a8f5ef4a10506b8927def4b9ceb764c7e947369 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
 call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
-call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
 call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
 
@@ -96,7 +96,7 @@ if %DEBUG%==1 (
   echo Building release libraries...
 )
 
-set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG"
 set ARM64TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE="%SCRIPTDIR%\cmake-toolchain-windows-arm64.cmake"
 
 echo Building Zlib...
@@ -197,7 +197,7 @@ cd .. || goto error
 if %DEBUG%==1 (
   set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
 ) else (
-  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=MinSizeRel -G Ninja
 )
 
 echo Building Qt base...

.github/workflows/scripts/windows/build-dependencies.bat

@@ -44,17 +44,17 @@ set FREETYPE=2.14.1
 set HARFBUZZ=12.0.0
 set LIBJPEGTURBO=3.1.2
 set LIBPNG=1650
-set SDL=SDL3-3.2.24
+set SDL=SDL3-3.2.26
 set LIBPNGLONG=1.6.50
-set QT=6.9.2
-set QTMINOR=6.9
+set QT=6.10.1
+set QTMINOR=6.10
 set QTAPNG=1.3.0
 set LZ4=1.10.0
 set WEBP=1.6.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.3.0
+set KDDOCKWIDGETS=2.4.0
 set PLUTOVG=1.3.1
 set PLUTOSVG=0.0.7
 
@@ -69,17 +69,17 @@ call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lp
 call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95 || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 97d59c78e40b4ddd018738d285a12afc320b57f8265a3f760353739a3619ccdb || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" f2fc6ff382c6f3af79493d0709dbd64847d0356313518f094f9096315f2fdb30 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" af80bb671ea0f66c0036ce7041a56b0e550fc94fb88d2c77b5b6a3e33e42139b || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" d2f4c7a4a12630e879702353f944f96a5d8e764771b5a5f04163334ad61b39db || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 3e168d1b081ee3a2175fe1bd97ad03bb40fe7ce38a37e99923a19f0e7ec4d81c || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 739356eef1192fff9d641c320a8f5ef4a10506b8927def4b9ceb764c7e947369 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
 call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
-call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
 call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || goto error
 call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
 
@@ -94,7 +94,7 @@ if %DEBUG%==1 (
   echo Building release libraries...
 )
 
-set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG"
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_MINSIZEREL="/DEBUG"
 
 echo Building Zlib...
 rmdir /S /Q "zlib-%ZLIB%"
@@ -194,7 +194,7 @@ cd .. || goto error
 if %DEBUG%==1 (
   set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
 ) else (
-  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=MinSizeRel -G Ninja
 )
 
 echo Building Qt base...
@@ -233,7 +233,7 @@ ninja install || goto error
 cd ..\.. || goto error
 
 echo Building Qt Tools...
-rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
+rmdir /S /Q "qttools-everywhere-src-%QT%"
 %SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
 cd "qttools-everywhere-src-%QT%" || goto error
 mkdir build || goto error

.github/workflows/windows_build_qt.yml

@@ -154,7 +154,7 @@ jobs:
           cmake --build build --config Release --target unittests
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: |
@@ -186,7 +186,7 @@ jobs:
           }
 
       - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
           path: |

3rdparty/rcheevos/CHANGELOG.md

@@ -1,3 +1,19 @@
+# v12.1.0
+* add rc_client_get_user_subset_summary
+* add validation warning for using MeasuredIf without Measured
+* add validation warning for using ResetIf without hit targets
+* add rapi function for update_rich_presence
+* add gap to RC_CONSOLE_WII memory map to make it easier to convert pointers
+* improve range validation logic
+* fix error Remembering float value
+* fix MeasuredIf evaluation in rich presence
+* fix parsing of code notes with addresses above 0x7FFFFFFF
+* fix double evaluation of rich presence parameters
+* fix validation of SubSource chain
+* fix error if rc_client_allow_background_memory_reads called before calling rc_client_begin_load_raintegration
+* fix memory corruption when mixing legacy and new-format macros in rich presence
+* fix invalid pointer reference when iterator gets cloned
+
 # v12.0.0
 * rc_client changes
   * add RC_CLIENT_EVENT_SUBSET_COMPLETED event

3rdparty/rcheevos/src/rc_client.c

@@ -5880,7 +5880,7 @@ void rc_client_do_frame(rc_client_t* client)
 
     richpresence = client->game->runtime.richpresence;
     if (richpresence && richpresence->richpresence)
-      rc_update_richpresence(richpresence->richpresence, client->state.legacy_peek, client, NULL);
+      rc_update_richpresence_internal(richpresence->richpresence, client->state.legacy_peek, client);
 
     rc_mutex_unlock(&client->state.mutex);
 

3rdparty/rcheevos/src/rc_client_raintegration.c

@@ -223,6 +223,8 @@ static void rc_client_init_raintegration(rc_client_t* client,
         external_client->set_encore_mode_enabled(rc_client_get_encore_mode_enabled(client));
       if (external_client->set_spectator_mode_enabled)
         external_client->set_spectator_mode_enabled(rc_client_get_spectator_mode_enabled(client));
+      if (external_client->set_allow_background_memory_reads)
+        external_client->set_allow_background_memory_reads(client->state.allow_background_memory_reads);
 
       /* attach the external client and call the callback */
       client->state.external_client = external_client;

3rdparty/rcheevos/src/rc_version.h

@@ -8,7 +8,7 @@
 RC_BEGIN_C_DECLS
 
 #define RCHEEVOS_VERSION_MAJOR 12
-#define RCHEEVOS_VERSION_MINOR 0
+#define RCHEEVOS_VERSION_MINOR 1
 #define RCHEEVOS_VERSION_PATCH 0
 
 #define RCHEEVOS_MAKE_VERSION(major, minor, patch) (major * 1000000 + minor * 1000 + patch)

3rdparty/rcheevos/src/rcheevos/condset.c

@@ -607,8 +607,8 @@ static void rc_condset_evaluate_or_next(rc_condition_t* condition, rc_eval_state
   eval_state->or_next = rc_condset_evaluate_condition_no_add_hits(condition, eval_state);
 }
 
-static void rc_test_condset_internal(rc_condition_t* condition, uint32_t num_conditions,
-                                     rc_eval_state_t* eval_state, int can_short_circuit) {
+void rc_test_condset_internal(rc_condition_t* condition, uint32_t num_conditions,
+                              rc_eval_state_t* eval_state, int can_short_circuit) {
   const rc_condition_t* condition_end = condition + num_conditions;
   for (; condition < condition_end; ++condition) {
     switch (condition->type) {

3rdparty/rcheevos/src/rcheevos/rc_internal.h

@@ -311,6 +311,7 @@ rc_condset_t* rc_parse_condset(const char** memaddr, rc_parse_state_t* parse);
 int rc_test_condset(rc_condset_t* self, rc_eval_state_t* eval_state);
 void rc_reset_condset(rc_condset_t* self);
 rc_condition_t* rc_condset_get_conditions(rc_condset_t* self);
+void rc_test_condset_internal(rc_condition_t* condition, uint32_t num_conditions, rc_eval_state_t* eval_state, int can_short_circuit);
 
 enum {
   RC_PROCESSING_COMPARE_DEFAULT = 0,
@@ -379,6 +380,7 @@ int rc_lboard_state_active(int state);
 void rc_parse_richpresence_internal(rc_richpresence_t* self, const char* script, rc_parse_state_t* parse);
 rc_memrefs_t* rc_richpresence_get_memrefs(rc_richpresence_t* self);
 void rc_reset_richpresence_triggers(rc_richpresence_t* self);
+void rc_update_richpresence_internal(rc_richpresence_t* richpresence, rc_peek_t peek, void* peek_ud);
 
 int rc_validate_memrefs(const rc_memrefs_t* memrefs, char result[], const size_t result_size, uint32_t max_address);
 int rc_validate_memrefs_for_console(const rc_memrefs_t* memrefs, char result[], const size_t result_size, uint32_t console_id);

3rdparty/rcheevos/src/rcheevos/rc_validate.c

@@ -133,79 +133,93 @@ static uint32_t rc_max_value(const rc_operand_t* operand)
   }
 }
 
-static uint32_t rc_scale_value(uint32_t value, uint8_t oper, const rc_operand_t* operand)
+static void rc_combine_ranges(uint32_t* min_val, uint32_t* max_val, uint8_t oper, uint32_t oper_min_val, uint32_t oper_max_val)
 {
   switch (oper) {
     case RC_OPERATOR_MULT:
     {
-      unsigned long long scaled = ((unsigned long long)value) * rc_max_value(operand);
-      if (scaled > 0xFFFFFFFF)
-        return 0xFFFFFFFF;
+      unsigned long long scaled = ((unsigned long long)*min_val) * oper_min_val;
+      *min_val = (scaled > 0xFFFFFFFF) ? 0xFFFFFFFF : (uint32_t)scaled;
 
-      return (uint32_t)scaled;
+      scaled = ((unsigned long long)*max_val) * oper_max_val;
+      *max_val = (scaled > 0xFFFFFFFF) ? 0xFFFFFFFF : (uint32_t)scaled;
+      break;
     }
 
     case RC_OPERATOR_DIV:
-    {
-      const uint32_t min_val = (operand->type == RC_OPERAND_CONST) ? operand->value.num : 1;
-      return value / min_val;
-    }
+      *min_val = (oper_max_val == 0) ? *min_val : (*min_val / oper_max_val);
+      *max_val = (oper_min_val == 0) ? *max_val : (*max_val / oper_min_val);
+      break;
 
     case RC_OPERATOR_AND:
-      return rc_max_value(operand);
+      *min_val = 0;
+      *max_val &= oper_max_val;
+      break;
 
     case RC_OPERATOR_XOR:
-      return value | rc_max_value(operand);
+      *min_val = 0;
+      *max_val |= oper_max_val;
+      break;
 
     case RC_OPERATOR_MOD:
-    {
-      const uint32_t divisor = (operand->type == RC_OPERAND_CONST) ? operand->value.num : 1;
-      return (divisor >= value) ? (divisor - 1) : value;
-    }
+      *min_val = 0;
+      *max_val = (*max_val >= oper_max_val) ? oper_max_val - 1 : *max_val;
+      break;
 
     case RC_OPERATOR_ADD:
-    {
-      unsigned long scaled = ((unsigned long)value) + rc_max_value(operand);
-      if (scaled > 0xFFFFFFFF)
-        return 0xFFFFFFFF;
+      if (*min_val > *max_val) { /* underflow occurred */
+        *max_val += oper_max_val;
+      }
+      else {
+        unsigned long scaled = ((unsigned long)*max_val) + oper_max_val;
+        *max_val = (scaled > 0xFFFFFFFF) ? 0xFFFFFFFF : (uint32_t)scaled;
+      }
 
-      return (uint32_t)scaled;
-    }
+      *min_val += oper_min_val;
+      break;
 
     case RC_OPERATOR_SUB:
-    {
-      const uint32_t op_max = (operand->type == RC_OPERAND_CONST) ? operand->value.num : 0;
-      if (value >= op_max)
-        return value - op_max;
-
-      return 0xFFFFFFFF;
-    }
+      *min_val -= oper_max_val;
+      *max_val -= oper_min_val;
+      break;
 
     case RC_OPERATOR_SUB_PARENT:
     {
-      const uint32_t op_max = (operand->type == RC_OPERAND_CONST) ? operand->value.num : rc_max_value(operand);
-      if (op_max > value)
-        return op_max - value;
-
-      return 0xFFFFFFFF;
+      uint32_t temp = oper_min_val - *max_val;
+      *max_val = oper_max_val - *min_val;
+      *min_val = temp;
+      break;
     }
 
     default:
-      return value;
+      break;
   }
 }
 
-static uint32_t rc_max_chain_value(const rc_operand_t* operand)
+static void rc_chain_get_value_range(const rc_operand_t* operand, uint32_t* min_val, uint32_t* max_val)
 {
   if (rc_operand_is_memref(operand) && operand->value.memref->value.memref_type == RC_MEMREF_TYPE_MODIFIED_MEMREF) {
     const rc_modified_memref_t* modified_memref = (const rc_modified_memref_t*)operand->value.memref;
     if (modified_memref->modifier_type != RC_OPERATOR_INDIRECT_READ) {
-      const uint32_t op_max = rc_max_chain_value(&modified_memref->parent);
-      return rc_scale_value(op_max, modified_memref->modifier_type, &modified_memref->modifier);
+      if (modified_memref->modifier_type == RC_OPERATOR_DIV &&
+          rc_operand_is_memref(&modified_memref->modifier) &&
+          rc_operands_are_equal(&modified_memref->modifier, &modified_memref->parent)) {
+        /* division by self can only return 0 or 1. */
+        *min_val = 0;
+        *max_val = 1;
+      }
+      else {
+        uint32_t modifier_min_val, modifier_max_val;
+        rc_chain_get_value_range(&modified_memref->parent, min_val, max_val);
+        rc_chain_get_value_range(&modified_memref->modifier, &modifier_min_val, &modifier_max_val);
+        rc_combine_ranges(min_val, max_val, modified_memref->modifier_type, modifier_min_val, modifier_max_val);
+      }
+      return;
     }
   }
 
-  return rc_max_value(operand);
+  *min_val = (operand->type == RC_OPERAND_CONST) ? operand->value.num : 0;
+  *max_val = rc_max_value(operand);
 }
 
 static int rc_validate_get_condition_index(const rc_condset_t* condset, const rc_condition_t* condition)
@@ -291,7 +305,7 @@ static int rc_validate_range(uint32_t min_val, uint32_t max_val, char oper, uint
   return 1;
 }
 
-static int rc_validate_condset_internal(const rc_condset_t* condset, char result[], const size_t result_size, uint32_t console_id, uint32_t max_address)
+static int rc_validate_condset_internal(const rc_condset_t* condset, char result[], const size_t result_size, uint32_t console_id, uint32_t max_address, int has_hits)
 {
   const rc_condition_t* cond;
   char buffer[128];
@@ -299,6 +313,8 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
   int in_add_hits = 0;
   int in_add_address = 0;
   int is_combining = 0;
+  int has_measured = 0;
+  int measuredif_index = -1;
 
   if (!condset) {
     *result = '\0';
@@ -383,6 +399,10 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
           is_combining = 0;
           break;
         }
+        if (!has_hits) {
+          snprintf(result, result_size, "Condition %d: No captured hits to reset", index);
+          return 0;
+        }
         if (cond->required_hits == 1) {
           snprintf(result, result_size, "Condition %d: Hit target of 1 is redundant on ResetIf", index);
           return 0;
@@ -398,6 +418,10 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
           in_add_hits = 0;
         }
 
+        has_measured |= (cond->type == RC_CONDITION_MEASURED);
+        if (cond->type == RC_CONDITION_MEASURED_IF && measuredif_index == -1)
+          measuredif_index = index;
+
         is_combining = 0;
         break;
     }
@@ -424,10 +448,16 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
       const size_t prefix_length = snprintf(result, result_size, "Condition %d: ", index);
       const rc_operand_t* operand2 = &cond->operand2;
       uint8_t oper = cond->oper;
-      uint32_t max = rc_max_chain_value(operand1);
+      uint32_t min, max;
       uint32_t max_val = rc_max_value(operand2);
       uint32_t min_val;
 
+      rc_chain_get_value_range(operand1, &min, &max);
+      if (min > max) { /* underflow */
+        min = 0;
+        max = 0xFFFFFFFF;
+      }
+
       if (!is_memref1) {
         /* pretend constant was on right side */
         operand2 = operand1;
@@ -477,6 +507,7 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
           break;
       }
 
+      /* min_val and max_val are the range allowed by operand2. max is the upper value from operand1. */
       if (!rc_validate_range(min_val, max_val, oper, max, result + prefix_length, result_size - prefix_length))
         return 0;
     }
@@ -487,19 +518,48 @@ static int rc_validate_condset_internal(const rc_condset_t* condset, char result
     return 0;
   }
 
+  if (measuredif_index != -1 && !has_measured) {
+    snprintf(result, result_size, "Condition %d: MeasuredIf without Measured", measuredif_index);
+    return 0;
+  }
+
   *result = '\0';
   return 1;
 }
 
+static int rc_condset_has_hittargets(const rc_condset_t* condset)
+{
+  if (condset->num_hittarget_conditions > 0)
+    return 1;
+
+  /* pause and reset conditions may have hittargets and won't be classified as hittarget conditions.
+   * measured conditions may also have hittargets.
+   */
+  if (condset->num_pause_conditions || condset->num_reset_conditions || condset->num_measured_conditions) {
+    const rc_condition_t* condition = rc_condset_get_conditions((rc_condset_t*)condset);
+    /* ASSERT: don't need to add num_hittarget_conditions because it must be 0 per earlier check */
+    const rc_condition_t* stop = condition + condset->num_pause_conditions
+        + condset->num_reset_conditions + condset->num_measured_conditions;
+    for (; condition < stop; ++condition) {
+      if (condition->required_hits)
+        return 1;
+    }
+  }
+
+  return 0;
+}
+
 int rc_validate_condset(const rc_condset_t* condset, char result[], const size_t result_size, uint32_t max_address)
 {
-  return rc_validate_condset_internal(condset, result, result_size, 0, max_address);
+  int has_hits = rc_condset_has_hittargets(condset);
+  return rc_validate_condset_internal(condset, result, result_size, 0, max_address, has_hits);
 }
 
 int rc_validate_condset_for_console(const rc_condset_t* condset, char result[], const size_t result_size, uint32_t console_id)
 {
   const uint32_t max_address = rc_console_max_address(console_id);
-  return rc_validate_condset_internal(condset, result, result_size, console_id, max_address);
+  int has_hits = rc_condset_has_hittargets(condset);
+  return rc_validate_condset_internal(condset, result, result_size, console_id, max_address, has_hits);
 }
 
 static int rc_validate_is_combining_condition(const rc_condition_t* condition)
@@ -845,7 +905,7 @@ static int rc_validate_conflicting_conditions(const rc_condset_t* conditions, co
       switch (compare_condition->type)
       {
         case RC_CONDITION_PAUSE_IF:
-          if (conditions != compare_conditions)
+          if (conditions != compare_conditions) /* PauseIf only affects conditions in same group */
             break;
           /* fallthrough */
         case RC_CONDITION_RESET_IF:
@@ -955,10 +1015,10 @@ static int rc_validate_trigger_internal(const rc_trigger_t* trigger, char result
 {
   const rc_condset_t* alt;
   int index;
-  int has_hits = (trigger->requirement && trigger->requirement->num_hittarget_conditions > 0);
+  int has_hits = trigger->requirement && rc_condset_has_hittargets(trigger->requirement);
   if (!has_hits) {
     for (alt = trigger->alternative; alt; alt = alt->next) {
-      if (alt->num_hittarget_conditions > 0) {
+      if (rc_condset_has_hittargets(alt)) {
         has_hits = 1;
         break;
       }
@@ -966,14 +1026,14 @@ static int rc_validate_trigger_internal(const rc_trigger_t* trigger, char result
   }
 
   if (!trigger->alternative) {
-    if (!rc_validate_condset_internal(trigger->requirement, result, result_size, console_id, max_address))
+    if (!rc_validate_condset_internal(trigger->requirement, result, result_size, console_id, max_address, has_hits))
       return 0;
 
     return rc_validate_conflicting_conditions(trigger->requirement, trigger->requirement, has_hits, "", "", result, result_size);
   }
 
   snprintf(result, result_size, "Core ");
-  if (!rc_validate_condset_internal(trigger->requirement, result + 5, result_size - 5, console_id, max_address))
+  if (!rc_validate_condset_internal(trigger->requirement, result + 5, result_size - 5, console_id, max_address, has_hits))
     return 0;
 
   /* compare core to itself */
@@ -984,7 +1044,7 @@ static int rc_validate_trigger_internal(const rc_trigger_t* trigger, char result
   for (alt = trigger->alternative; alt; alt = alt->next, ++index) {
     char altname[16];
     const size_t prefix_length = snprintf(result, result_size, "Alt%d ", index);
-    if (!rc_validate_condset_internal(alt, result + prefix_length, result_size - prefix_length, console_id, max_address))
+    if (!rc_validate_condset_internal(alt, result + prefix_length, result_size - prefix_length, console_id, max_address, has_hits))
       return 0;
 
     /* compare alt to itself */

3rdparty/rcheevos/src/rcheevos/richpresence.c

@@ -723,14 +723,19 @@ rc_memrefs_t* rc_richpresence_get_memrefs(rc_richpresence_t* self) {
 }
 
 void rc_update_richpresence(rc_richpresence_t* richpresence, rc_peek_t peek, void* peek_ud, void* unused_L) {
-  rc_richpresence_display_t* display;
+  (void)unused_L;
 
   rc_update_richpresence_memrefs(richpresence, peek, peek_ud);
   rc_update_values(richpresence->values, peek, peek_ud);
+  rc_update_richpresence_internal(richpresence, peek, peek_ud);
+}
+
+void rc_update_richpresence_internal(rc_richpresence_t* richpresence, rc_peek_t peek, void* peek_ud) {
+  rc_richpresence_display_t* display;
 
   for (display = richpresence->first_display; display; display = display->next) {
     if (display->has_required_hits)
-      rc_test_trigger(&display->trigger, peek, peek_ud, unused_L);
+      rc_test_trigger(&display->trigger, peek, peek_ud, NULL);
   }
 }
 

3rdparty/soundtouch/CMakeLists.txt

@@ -38,7 +38,7 @@ if(NOT "${CMAKE_BUILD_TYPE}" MATCHES "Debug")
 	if(MSVC)
 		target_compile_options(pcsx2-soundtouch PRIVATE /O2 /fp:fast)
 	else()
-		target_compile_options(pcsx2-soundtouch PRIVATE -Ofast)
+		target_compile_options(pcsx2-soundtouch PRIVATE -O3 -ffast-math)
 	endif()
 endif()
 

CMakeLists.txt

@@ -47,7 +47,10 @@ add_subdirectory(common)
 
 # make pcsx2
 add_subdirectory(pcsx2)
-add_subdirectory(pcsx2-qt)
+
+if(ENABLE_QT_UI)
+	add_subdirectory(pcsx2-qt)
+endif()
 
 # Updater is Windows only for now.
 if (WIN32)
@@ -62,9 +65,6 @@ endif()
 
 # gsrunner
 if(ENABLE_GSRUNNER)
-	if (NOT WIN32 AND NOT APPLE)
-		message(WARNING "GSRunner is only supported on Windows and macOS and may not build on your system")
-	endif()
 	add_subdirectory(pcsx2-gsrunner)
 else()
 	add_subdirectory(pcsx2-gsrunner EXCLUDE_FROM_ALL)

bin/docs/debugger.txt

@@ -1,58 +0,0 @@
-
-†---------------------†
-
-Disassembly view:
-
-†---------------------†
-
-  Ctrl + G             Goto
-  Ctrl + E             Edit Breakpoint
-  Ctrl + D             Enable/disable breakpoint
-  Ctrl + B             Add breakpoint
-  Left                 Go back one branch level/goto pc
-  Right                Follow branch/position memory view to accessed address
-  Up                   Move cursor up one line
-  Down                 Move cursor down one line
-  Page Up              Move visible area up one page
-  Page Down            Move visible area down one page
-  F10                  Step over
-  F11                  Step into
-  Tab                  Toggle display symbols
-  Left Click           Select line/toggle breakpoint if line is already highlighted
-  Right Click          Open context menu
-
-†---------------------†
-
-Memory View:
-
-†---------------------†
-
-  Ctrl + G             Goto
-  Ctrl + B             Add breakpoint
-  Left                 Move cursor back one byte/nibble
-  Right                Move cursor ahead one byte/nibble
-  Up                   Move cursor up one line
-  Down                 Move cursor down one line
-  Page Up              Move cursor up one page
-  Page Down            Move cursor down one page
-  0-9,A-F              Overwrite hex nibble
-  Any                  Overwrite ansi byte
-  Left Click           Select byte/nibble
-  Right Click          Open context menu
-  Ctrl+Wheel           Zoom memory view
-  Esc                  Return to previous goto address
-  Ctrl+V               Paste a hex string into memory
-
-†---------------------†
-
-Breakpoint List:
-
-†---------------------†
-
-    Up                Select previous item
-    Down              Select next item
-    Delete            Remove selected breakpoint
-    Return            Edit selected breakpoint
-    Space             Toggle enable state of selected breakpoint
-
-†---------------------†

bin/resources/game_controller_db.txt

@@ -1,5 +1,5 @@
 # Game Controller DB for SDL in 2.0.16 format
-# Source: https://github.com/gabomdq/SDL_GameControllerDB
+# Source: https://github.com/mdqinc/SDL_GameControllerDB
 
 # Windows
 03000000300f00000a01000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
@@ -175,7 +175,6 @@
 030000001a1c00000001000000000000,Datel Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 03000000451300000830000000000000,Defender Game Racer X7,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 03000000791d00000103000000000000,Dual Box Wii,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000c0160000e105000000000000,Dual Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
 030000004f040000070f000000000000,Dual Power,a:b8,b:b9,back:b4,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,leftshoulder:b13,leftstick:b6,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b12,rightstick:b7,righttrigger:b15,start:b5,x:b10,y:b11,platform:Windows,
 030000004f04000012b3000000000000,Dual Power 3,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
 030000004f04000020b3000000000000,Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
@@ -253,7 +252,6 @@
 03000000300f00000b01000000000000,GGE909 Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
 03000000f0250000c283000000000000,Gioteck PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f025000021c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
-03000000f025000021c1000010010000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000f025000031c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f0250000c383000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000f0250000c483000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
@@ -840,6 +838,7 @@
 03000000172700004431000000000000,Xiaomi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a7,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000172700003350000000000000,Xiaomi XMGP01YM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000bc2000005060000000000000,Xiaomi XMGP01YM,+lefty:+a2,+righty:+a5,-lefty:-a1,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000c0160000e105000000000000,XinMo Dual Arcade,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 030000007d0400000340000000000000,Xterminator Digital Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:-a4,lefttrigger:+a4,leftx:a0,lefty:a1,paddle1:b7,paddle2:b6,rightshoulder:b5,rightstick:b9,righttrigger:b2,rightx:a3,righty:a5,start:b8,x:b3,y:b4,platform:Windows,
 030000002c3600000100000000000000,Yawman Arrow,+rightx:h0.2,+righty:h0.4,-rightx:h0.8,-righty:h0.1,a:b4,b:b5,back:b6,dpdown:b15,dpleft:b14,dpright:b16,dpup:b13,leftshoulder:b10,leftstick:b0,lefttrigger:-a4,leftx:a0,lefty:a1,paddle1:b11,paddle2:b12,rightshoulder:b8,rightstick:b9,righttrigger:+a4,start:b3,x:b1,y:b2,platform:Windows,
@@ -1120,6 +1119,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005f140000c501000000020000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
 03000000100800000100000000000000,Twin USB Joystick,a:b4,b:b2,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b12,leftstick:b20,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b14,rightstick:b22,righttrigger:b10,rightx:a6,righty:a4,start:b18,x:b6,y:b0,platform:Mac OS X,
 03000000632500002605000000010000,Uberwith Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c0160000e105000000040000,Ultimate Atari Fight Stick,a:b2,b:b4,back:b18,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,rightshoulder:b8,righttrigger:b10,start:b16,x:b0,y:b6,platform:Mac OS X,
 03000000151900005678000010010000,Uniplay U6,a:b3,b:b6,back:b25,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,leftstick:b31,lefttrigger:b21,leftx:a1,lefty:a3,rightshoulder:b19,rightstick:b33,righttrigger:b23,rightx:a4,righty:a5,start:b27,x:b11,y:b13,platform:Mac OS X,
 030000006f0e00000302000025040000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
 030000006f0e00000702000003060000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
@@ -1197,6 +1197,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000020000000000000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 06000000c82d00000020000006010000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000960000011010000,8BitDo Pro 3,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000131000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000231000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00000331000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
@@ -1331,6 +1332,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006f0e00000104000000010000,Gamestop Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000008f0e00000800000010010000,Gasia PlayStation Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000451300000010000010010000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000f025000021c1000010010000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000f0250000c283000010010000,Gioteck VX2 PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 190000004b4800000010000000010000,GO-Advance Controller,a:b1,b:b0,back:b10,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,leftshoulder:b4,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b13,start:b15,x:b2,y:b3,platform:Linux,
 190000004b4800000010000001010000,GO-Advance Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b13,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b16,righttrigger:b15,start:b17,x:b2,y:b3,platform:Linux,
@@ -1773,6 +1775,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005f140000c501000010010000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 06000000f51000000870000003010000,Turtle Beach Recon,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000100800000100000010010000,Twin PS2 Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000c0160000e105000010010000,Ultimate Atari Fight Stick,a:b1,b:b2,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b4,righttrigger:b5,start:b8,x:b0,y:b3,platform:Linux,
 03000000151900005678000010010000,Uniplay U6,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000100800000300000010010000,USB Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
 03000000790000000600000007010000,USB gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Linux,

bin/resources/shaders/dx11/convert.fx

@@ -80,6 +80,7 @@ PS_OUTPUT ps_downsample_copy(PS_INPUT input)
 	int DownsampleFactor = DOFFSET;
 	int2 ClampMin = int2(EMODA, EMODC);
 	float Weight = BGColor.x;
+	float step_multiplier = BGColor.y;
 
 	int2 coord = max(int2(input.p.xy) * DownsampleFactor, ClampMin);
 
@@ -88,7 +89,7 @@ PS_OUTPUT ps_downsample_copy(PS_INPUT input)
 	for (int yoff = 0; yoff < DownsampleFactor; yoff++)
 	{
 		for (int xoff = 0; xoff < DownsampleFactor; xoff++)
-			output.c += Texture.Load(int3(coord + int2(xoff, yoff), 0));
+			output.c += Texture.Load(int3(coord + int2(xoff * step_multiplier, yoff * step_multiplier), 0));
 	}
 	output.c /= Weight;
 	return output;

bin/resources/shaders/dx11/interlace.fx

@@ -175,8 +175,32 @@ float4 ps_main4(PS_INPUT input) : SV_Target0
 			// high motion -> interpolate pixels above and below
 			return (hn + ln) / 2.0f;
 		else
-			// low motion -> weave
-			return cn;
+		{
+			// Check if it's completely static first, we don't need to mess with any of that.
+			if((mh_max != -motion_thr.x) || (ml_max != -motion_thr.x) || (mc_max != -motion_thr.x))
+			{
+				// Check the diff with the above and below lines, if the difference is smaller between the new high and low lines
+				// compared to the new centre line and the high line (with some threshold of about 25 color steps), then reconstruct.
+				float3 mhln = hn.rgb - ln.rgb;
+				float3 mchn = hn.rgb - cn.rgb;
+				
+				mhln = max(mhln, -mhln) - motion_thr;
+				mchn = max(mchn, -mchn) - motion_thr;
+				
+				float mhln_max = max(max(mhln.x, mhln.y), mhln.z);
+				float mchn_max = max(max(mchn.x, mchn.y), mchn.z);
+
+				// The new centre line is a fair chunk different from those surrounding it, so quite likely incorrect.
+				if (mhln_max < 0.0f && mchn_max >= (mhln_max * 0.90f))
+					return (hn + ln) / 2.0f;
+				else
+					// low motion -> weave
+					return cn;
+			}
+			else
+				// low motion -> weave
+				return cn;
+		}
 	}
 
 	return float4(0.0f, 0.0f, 0.0f, 0.0f);

bin/resources/shaders/dx11/tfx.fx

@@ -1197,7 +1197,7 @@ PS_OUTPUT ps_main(PS_INPUT input)
 #if !PS_NO_COLOR1
 	output.c1 = alpha_blend;
 #endif
-#if PS_AFAIL == 3 && !PS_NO_COLOR1 // RGB_ONLY, no dual src blend
+#if PS_AFAIL == 3 && PS_NO_COLOR1 // RGB_ONLY, no dual src blend
 	if (!atst_pass)
 	{
 		float RTa = NEEDS_RT_FOR_AFAIL ? RtTexture.Load(int3(input.p.xy, 0)).a : 0.0f;

bin/resources/shaders/opengl/convert.glsl

@@ -70,6 +70,7 @@ void ps_depth_copy()
 uniform ivec2 ClampMin;
 uniform int DownsampleFactor;
 uniform float Weight;
+uniform float StepMultiplier;
 
 void ps_downsample_copy()
 {
@@ -78,7 +79,7 @@ void ps_downsample_copy()
 	for (int yoff = 0; yoff < DownsampleFactor; yoff++)
 	{
 		for (int xoff = 0; xoff < DownsampleFactor; xoff++)
-			result += texelFetch(TextureSampler, coord + ivec2(xoff, yoff), 0);
+			result += texelFetch(TextureSampler, coord + ivec2(xoff * StepMultiplier, yoff * StepMultiplier), 0);
 	}
 	SV_Target0 = result / Weight;
 }

bin/resources/shaders/opengl/interlace.glsl

@@ -173,8 +173,32 @@ void ps_main4()
 			// high motion -> interpolate pixels above and below
 			SV_Target0 = (hn + ln) / 2.0f;
 		else
-			// low motion -> weave
-			SV_Target0 = cn;
+		{
+			// Check if it's completely static first, we don't need to mess with any of that.
+			if((mh_max != -motion_thr.x) || (ml_max != -motion_thr.x) || (mc_max != -motion_thr.x))
+			{
+				// Check the diff with the above and below lines, if the difference is smaller between the new high and low lines
+				// compared to the new centre line and the high line (with some threshold of about 25 color steps), then reconstruct.
+				vec3 mhln = hn.rgb - ln.rgb;
+				vec3 mchn = hn.rgb - cn.rgb;
+				
+				mhln = max(mhln, -mhln) - motion_thr;
+				mchn = max(mchn, -mchn) - motion_thr;
+				
+				float mhln_max = max(max(mhln.x, mhln.y), mhln.z);
+				float mchn_max = max(max(mchn.x, mchn.y), mchn.z);
+
+				// The new centre line is a fair chunk different from those surrounding it, so quite likely incorrect.
+				if (mhln_max < 0.0f && mchn_max >= (mhln_max * 0.90f))
+					SV_Target0 = (hn + ln) / 2.0f;
+				else
+					// low motion -> weave
+					SV_Target0 = cn;
+			}
+			else
+				// low motion -> weave
+				SV_Target0 = cn;
+		}
 	}
 }
 

bin/resources/shaders/opengl/tfx_fs.glsl

@@ -1134,7 +1134,7 @@ void ps_main()
 	#else
 		SV_Target0.rgb = C.rgb / 255.0f;
 	#endif
-	#if PS_AFAIL == 3 && !PS_NO_COLOR1 // RGB_ONLY, no dual src blend
+	#if PS_AFAIL == 3 && PS_NO_COLOR1 // RGB_ONLY, no dual src blend
 		if (!atst_pass)
 			SV_Target0.a = sample_from_rt().a;
 	#endif

bin/resources/shaders/vulkan/convert.glsl

@@ -66,7 +66,8 @@ layout(push_constant) uniform cb10
 	int DownsampleFactor;
 	int pad0;
 	float Weight;
-	vec3 pad1;
+	float step_multiplier;
+	vec2 pad1;
 };
 void ps_downsample_copy()
 {
@@ -75,7 +76,9 @@ void ps_downsample_copy()
 	for (int yoff = 0; yoff < DownsampleFactor; yoff++)
 	{
 		for (int xoff = 0; xoff < DownsampleFactor; xoff++)
-			result += texelFetch(samp0, coord + ivec2(xoff, yoff), 0);
+		{
+			result += texelFetch(samp0, coord + ivec2(xoff * step_multiplier, yoff * step_multiplier), 0);
+		}
 	}
 	o_col0 = result / Weight;
 }

bin/resources/shaders/vulkan/interlace.glsl

@@ -194,8 +194,32 @@ void ps_main4()
 			// high motion -> interpolate pixels above and below
 			o_col0 = (hn + ln) / 2.0f;
 		else
-			// low motion -> weave
-			o_col0 = cn;
+		{
+			// Check if it's completely static first, we don't need to mess with any of that.
+			if((mh_max != -motion_thr.x) || (ml_max != -motion_thr.x) || (mc_max != -motion_thr.x))
+			{
+				// Check the diff with the above and below lines, if the difference is smaller between the new high and low lines
+				// compared to the new centre line and the high line (with some threshold of about 25 color steps), then reconstruct.
+				vec3 mhln = hn.rgb - ln.rgb;
+				vec3 mchn = hn.rgb - cn.rgb;
+				
+				mhln = max(mhln, -mhln) - motion_thr;
+				mchn = max(mchn, -mchn) - motion_thr;
+				
+				float mhln_max = max(max(mhln.x, mhln.y), mhln.z);
+				float mchn_max = max(max(mchn.x, mchn.y), mchn.z);
+
+				// The new centre line is a fair chunk different from those surrounding it, so quite likely incorrect.
+				if (mhln_max < 0.0f && mchn_max >= (mhln_max * 0.90f))
+					o_col0 = (hn + ln) / 2.0f;
+				else
+					// low motion -> weave
+					o_col0 = cn;
+			}
+			else
+				// low motion -> weave
+				o_col0 = cn;
+		}
 	}
 }
 #endif

cmake/BuildParameters.cmake

@@ -7,6 +7,7 @@ include(GNUInstallDirs)
 # Misc option
 #-------------------------------------------------------------------------------
 option(ENABLE_TESTS "Enables building the unit tests" ON)
+option(ENABLE_QT_UI "Enables building the PCSX2 Qt interface." ON)
 option(ENABLE_GSRUNNER "Enables building the GSRunner by default.  It can still be built with `make pcsx2-gsrunner` otherwise." OFF)
 option(LTO_PCSX2_CORE "Enable LTO/IPO/LTCG on the subset of pcsx2 that benefits most from it but not anything else")
 option(USE_VTUNE "Plug VTUNE to profile GS JIT.")

cmake/SearchForStuff.cmake

@@ -107,10 +107,19 @@ disable_compiler_warnings_for_target(cubeb)
 disable_compiler_warnings_for_target(speex)
 
 # Find the Qt components that we need.
-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+if(ENABLE_QT_UI)
+	find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+endif()
+
+if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
+	find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
+endif()
+
+# The docking system for the debugger.
+	find_package(KDDockWidgets-qt6 2.3.0 REQUIRED)
 
 if(WIN32)
-  add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
+	add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
 endif()
 
 # Demangler for the debugger.
@@ -119,15 +128,6 @@ add_subdirectory(3rdparty/demangler EXCLUDE_FROM_ALL)
 # Symbol table parser.
 add_subdirectory(3rdparty/ccc EXCLUDE_FROM_ALL)
 
-# The docking system for the debugger.
-find_package(KDDockWidgets-qt6 2.0.0 REQUIRED)
-# Add an extra include path to work around a broken include directive.
-# TODO: Remove this the next time we update KDDockWidgets.
-get_target_property(KDDOCKWIDGETS_INCLUDE_DIRECTORY KDAB::kddockwidgets INTERFACE_INCLUDE_DIRECTORIES)
-target_include_directories(KDAB::kddockwidgets INTERFACE
-	${KDDOCKWIDGETS_INCLUDE_DIRECTORY}/kddockwidgets
-)
-
 # Architecture-specific.
 if(_M_X86)
 	add_subdirectory(3rdparty/zydis EXCLUDE_FROM_ALL)

common/CMakeLists.txt

@@ -7,7 +7,6 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
 
 add_library(common)
 
-# x86emitter sources
 target_sources(common PRIVATE
 	AlignedMalloc.cpp
 	Assertions.cpp
@@ -34,9 +33,9 @@ target_sources(common PRIVATE
 	Timer.cpp
 	WAVWriter.cpp
 	WindowInfo.cpp
+	YAML.cpp
 )
 
-# x86emitter headers
 target_sources(common PRIVATE
 	AlignedMalloc.h
 	Assertions.h
@@ -81,6 +80,7 @@ target_sources(common PRIVATE
 	WAVWriter.h
 	WindowInfo.h
 	WrappedMemCopy.h
+	YAML.h
 )
 
 if(_M_X86)
@@ -208,6 +208,7 @@ target_link_libraries(common PRIVATE
 target_link_libraries(common PUBLIC
 	fmt::fmt
 	fast_float
+	rapidyaml::rapidyaml
 )
 
 fixup_file_properties(common)

common/CocoaTools.h

@@ -15,10 +15,6 @@ namespace CocoaTools
 	void DestroyMetalLayer(WindowInfo* wi);
 	std::optional<float> GetViewRefreshRate(const WindowInfo& wi);
 
-	/// Add a handler to be run when macOS changes between dark and light themes
-	void AddThemeChangeHandler(void* ctx, void(handler)(void* ctx));
-	/// Remove a handler previously added using AddThemeChangeHandler with the given context
-	void RemoveThemeChangeHandler(void* ctx);
 	/// Mark an NSMenu as the help menu
 	void MarkHelpMenu(void* menu);
 	/// Returns the bundle path.
@@ -44,6 +40,6 @@ namespace CocoaTools
 	void RunCocoaEventLoop(bool wait_forever = false);
 	/// Posts an event to the main telling `RunCocoaEventLoop(true)` to exit
 	void StopMainThreadEventLoop();
-}
+} // namespace CocoaTools
 
 #endif // __APPLE__

common/CocoaTools.mm

@@ -85,63 +85,7 @@ std::optional<float> CocoaTools::GetViewRefreshRate(const WindowInfo& wi)
 	return ret;
 }
 
-// MARK: - Theme Change Handlers
-
-@interface PCSX2KVOHelper : NSObject
-
-- (void)addCallback:(void*)ctx run:(void(*)(void*))callback;
-- (void)removeCallback:(void*)ctx;
-
-@end
-
-@implementation PCSX2KVOHelper
-{
-	std::vector<std::pair<void*, void(*)(void*)>> _callbacks;
-}
-
-- (void)addCallback:(void*)ctx run:(void(*)(void*))callback
-{
-	_callbacks.push_back(std::make_pair(ctx, callback));
-}
-
-- (void)removeCallback:(void*)ctx
-{
-	auto new_end = std::remove_if(_callbacks.begin(), _callbacks.end(), [ctx](const auto& entry){
-		return ctx == entry.first;
-	});
-	_callbacks.erase(new_end, _callbacks.end());
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
-{
-	for (const auto& callback : _callbacks)
-		callback.second(callback.first);
-}
-
-@end
-
-static PCSX2KVOHelper* s_themeChangeHandler;
-
-void CocoaTools::AddThemeChangeHandler(void* ctx, void(handler)(void* ctx))
-{
-	assert([NSThread isMainThread]);
-	if (!s_themeChangeHandler)
-	{
-		s_themeChangeHandler = [[PCSX2KVOHelper alloc] init];
-		NSApplication* app = [NSApplication sharedApplication];
-		[app addObserver:s_themeChangeHandler
-		      forKeyPath:@"effectiveAppearance"
-		         options:0
-		         context:nil];
-	}
-	[s_themeChangeHandler addCallback:ctx run:handler];
-}
-
-void CocoaTools::RemoveThemeChangeHandler(void* ctx)
-{
-	assert([NSThread isMainThread]);
-	[s_themeChangeHandler removeCallback:ctx];
-}
+// MARK: - Help menu
 
 void CocoaTools::MarkHelpMenu(void* menu)
 {

common/Console.cpp

@@ -99,7 +99,7 @@ __ri void Log::WriteToConsole(LOGLEVEL level, ConsoleColors color, std::string_v
 	static constexpr size_t BUFFER_SIZE = 512;
 
 	SmallStackString<BUFFER_SIZE> buffer;
-	buffer.reserve(32 + message.length());
+	buffer.reserve(static_cast<u32>(32 + message.length()));
 	buffer.append(s_ansi_color_codes[color]);
 
 	if (s_log_timestamps)

common/FileSystem.cpp

@@ -85,7 +85,7 @@ static inline bool FileSystemCharacterIsSane(char32_t c, bool strip_slashes)
 	if (c == '*')
 		return false;
 
-		// macos doesn't allow colons, apparently
+	// macos doesn't allow colons, apparently
 #ifdef __APPLE__
 	if (c == U':')
 		return false;
@@ -2490,6 +2490,21 @@ bool FileSystem::DeleteDirectory(const char* path)
 	return (rmdir(path) == 0);
 }
 
+std::string FileSystem::GetPackagePath()
+{
+	// NOTE: The reason this function is separated from FileSystem::GetProgramPath() is because
+	// This path check breaks other usages of FileSystem::GetProgramPath for the AppImage.
+	// Notably the CI-generated AppImage fails to start because PCSX2 can't find its resources
+	// since it tries to look for them relative to the .AppImage file instead of relative to the actual executable.
+
+	// Check if we are running inside appimage. If so, return the path to the appimage instead.
+	if (const char* appimage_path = getenv("APPIMAGE"))
+		return std::string(appimage_path);
+
+	// Otherwise, find the executable file directly
+	return GetProgramPath();
+}
+
 std::string FileSystem::GetProgramPath()
 {
 #if defined(__linux__)

common/FileSystem.h

@@ -166,6 +166,9 @@ namespace FileSystem
 	/// Copies one file to another, optionally replacing it if it already exists.
 	bool CopyFilePath(const char* source, const char* destination, bool replace);
 
+	/// Returns the path to the current package (AppImage).
+	std::string GetPackagePath();
+
 	/// Returns the path to the current executable.
 	std::string GetProgramPath();
 

common/Image.cpp

@@ -14,9 +14,6 @@
 #include <webp/decode.h>
 #include <webp/encode.h>
 
-// Compute the address of a base type given a field offset.
-#define BASE_FROM_RECORD_FIELD(ptr, base_type, field) ((base_type*)(((char*)ptr) - offsetof(base_type, field)))
-
 static bool PNGBufferLoader(RGBA8Image* image, const void* buffer, size_t buffer_size);
 static bool PNGBufferSaver(const RGBA8Image& image, std::vector<u8>* buffer, u8 quality);
 static bool PNGFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp);
@@ -32,6 +29,11 @@ static bool WebPBufferSaver(const RGBA8Image& image, std::vector<u8>* buffer, u8
 static bool WebPFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp);
 static bool WebPFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp, u8 quality);
 
+static bool BMPBufferLoader(RGBA8Image* image, const void* buffer, size_t buffer_size);
+static bool BMPBufferSaver(const RGBA8Image& image, std::vector<u8>* buffer, u8 quality);
+static bool BMPFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp);
+static bool BMPFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp, u8 quality);
+
 struct FormatHandler
 {
 	const char* extension;
@@ -46,6 +48,7 @@ static constexpr FormatHandler s_format_handlers[] = {
 	{"jpg", JPEGBufferLoader, JPEGBufferSaver, JPEGFileLoader, JPEGFileSaver},
 	{"jpeg", JPEGBufferLoader, JPEGBufferSaver, JPEGFileLoader, JPEGFileSaver},
 	{"webp", WebPBufferLoader, WebPBufferSaver, WebPFileLoader, WebPFileSaver},
+	{"bmp", BMPBufferLoader, BMPBufferSaver, BMPFileLoader, BMPFileSaver},
 };
 
 static const FormatHandler* GetFormatHandler(const std::string_view extension)
@@ -485,6 +488,8 @@ bool JPEGFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp)
 
 	struct FileCallback
 	{
+		// Must be the first member (&this == &mgr)
+		// We pass a pointer of mgr to libjpeg, and we need to be able to cast it back to FileCallback.
 		jpeg_source_mgr mgr;
 
 		std::FILE* fp;
@@ -496,7 +501,7 @@ bool JPEGFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp)
 		.mgr = {
 			.init_source = [](j_decompress_ptr cinfo) {},
 			.fill_input_buffer = [](j_decompress_ptr cinfo) -> boolean {
-				FileCallback* cb = BASE_FROM_RECORD_FIELD(cinfo->src, FileCallback, mgr);
+				FileCallback* cb = reinterpret_cast<FileCallback*>(cinfo->src);
 				cb->mgr.next_input_byte = cb->buffer.get();
 				if (cb->end_of_file)
 				{
@@ -513,7 +518,7 @@ bool JPEGFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp)
 			},
 			.skip_input_data =
 				[](j_decompress_ptr cinfo, long num_bytes) {
-					FileCallback* cb = BASE_FROM_RECORD_FIELD(cinfo->src, FileCallback, mgr);
+					FileCallback* cb = reinterpret_cast<FileCallback*>(cinfo->src);
 					const size_t skip_in_buffer = std::min<size_t>(cb->mgr.bytes_in_buffer, static_cast<size_t>(num_bytes));
 					cb->mgr.next_input_byte += skip_in_buffer;
 					cb->mgr.bytes_in_buffer -= skip_in_buffer;
@@ -650,12 +655,12 @@ bool JPEGFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp,
 		.mgr = {
 			.init_destination =
 				[](j_compress_ptr cinfo) {
-					FileCallback* cb = BASE_FROM_RECORD_FIELD(cinfo->dest, FileCallback, mgr);
+					FileCallback* cb = reinterpret_cast<FileCallback*>(cinfo->dest);
 					cb->mgr.next_output_byte = cb->buffer.get();
 					cb->mgr.free_in_buffer = BUFFER_SIZE;
 				},
 			.empty_output_buffer = [](j_compress_ptr cinfo) -> boolean {
-				FileCallback* cb = BASE_FROM_RECORD_FIELD(cinfo->dest, FileCallback, mgr);
+				FileCallback* cb = reinterpret_cast<FileCallback*>(cinfo->dest);
 				if (!cb->write_error)
 					cb->write_error |= (std::fwrite(cb->buffer.get(), 1, BUFFER_SIZE, cb->fp) != BUFFER_SIZE);
 
@@ -665,7 +670,7 @@ bool JPEGFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp,
 			},
 			.term_destination =
 				[](j_compress_ptr cinfo) {
-					FileCallback* cb = BASE_FROM_RECORD_FIELD(cinfo->dest, FileCallback, mgr);
+					FileCallback* cb = reinterpret_cast<FileCallback*>(cinfo->dest);
 					const size_t left = BUFFER_SIZE - cb->mgr.free_in_buffer;
 					if (left > 0 && !cb->write_error)
 						cb->write_error |= (std::fwrite(cb->buffer.get(), 1, left, cb->fp) != left);
@@ -734,3 +739,617 @@ bool WebPFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp,
 
 	return (std::fwrite(buffer.data(), buffer.size(), 1, fp) == 1);
 }
+
+// Some of this code is adapted from Qt's BMP handler (https://github.com/qt/qtbase/blob/dev/src/gui/image/qbmphandler.cpp)
+#pragma pack(push, 1)
+struct BMPFileHeader
+{
+	u16 type;
+	u32 size;
+	u16 reserved1;
+	u16 reserved2;
+	u32 offset;
+};
+
+struct BMPInfoHeader
+{
+	u32 size;
+	s32 width;
+	s32 height;
+	u16 planes;
+	u16 bit_count;
+	u32 compression;
+	u32 size_image;
+	s32 x_pels_per_meter;
+	s32 y_pels_per_meter;
+	u32 clr_used;
+	u32 clr_important;
+};
+#pragma pack(pop)
+
+bool IsSupportedBMPFormat(u32 compression, u16 bit_count)
+{
+	if (compression == 0)
+		return (bit_count == 1 || bit_count == 4 || bit_count == 8 || bit_count == 16 || bit_count == 24 || bit_count == 32);
+
+	if (compression == 1)
+		return (bit_count == 8);
+
+	if (compression == 2)
+		return (bit_count == 4);
+
+	if (compression == 3 || compression == 4) // BMP_BITFIELDS or BMP_ALPHABITFIELDS
+		return (bit_count == 16 || bit_count == 32);
+
+	return false;
+}
+
+bool LoadBMPPalette(std::vector<u32>& palette, const u8* data, u32 palette_offset, const BMPInfoHeader& info_header)
+{
+	// 1 bit format doesn't use a palette in the traditional sense
+	if (info_header.bit_count == 1)
+	{
+		palette = {0xFFFFFFFF, 0xFF000000};
+		return true;
+	}
+
+	const u32 num_colors = (info_header.clr_used > 0) ? info_header.clr_used : (1u << info_header.bit_count);
+
+	// Make sure that we don't have an unreasonably large palette
+	if (num_colors > 256)
+	{
+		Console.Error("Invalid palette size: %u", num_colors);
+		return false;
+	}
+
+	palette.clear();
+	palette.reserve(num_colors);
+
+	const u8* palette_data = data + sizeof(BMPFileHeader) + info_header.size;
+
+	for (u32 i = 0; i < num_colors; i++)
+	{
+		const u8* color = palette_data + (i * 4);
+		const u8 b = color[0];
+		const u8 g = color[1];
+		const u8 r = color[2];
+		palette.push_back(r | (g << 8) | (b << 16) | 0xFF000000u);
+	}
+
+	return true;
+}
+
+bool LoadUncompressedBMP(u32* pixels, const u8* src, const u8* data, u32 width, u32 height, const BMPInfoHeader& info_header, const std::vector<u32>& palette, bool flip_vertical, u32 red_mask = 0, u32 green_mask = 0, u32 blue_mask = 0, u32 alpha_mask = 0, bool use_alpha = false)
+{
+	const u32 row_size = ((width * info_header.bit_count + 31) / 32) * 4;
+
+	for (u32 y = 0; y < height; y++)
+	{
+		u32 dst_y = flip_vertical ? (height - 1 - y) : y;
+		const u8* row_src = src + (y * row_size);
+		u32* row_dst = pixels + (dst_y * width);
+
+		u32 bit_offset = 0;
+
+		for (u32 x = 0; x < width; x++)
+		{
+			u32 pixel_value = 0;
+
+			switch (info_header.bit_count)
+			{
+				case 1:
+				{
+					const u32 byte_index = bit_offset / 8;
+					const u32 bit_index = 7 - (bit_offset % 8);
+					pixel_value = (row_src[byte_index] >> bit_index) & 1;
+					bit_offset += 1;
+					break;
+				}
+				case 4:
+				{
+					const u32 byte_index = bit_offset / 8;
+					const u32 nibble_index = (bit_offset % 8) / 4;
+					pixel_value = (row_src[byte_index] >> (nibble_index * 4)) & 0xF;
+					bit_offset += 4;
+					break;
+				}
+				case 8:
+				{
+					pixel_value = row_src[bit_offset / 8];
+					bit_offset += 8;
+					break;
+				}
+				case 16:
+				{
+					const u32 byte_index = bit_offset / 8;
+					pixel_value = row_src[byte_index] | (row_src[byte_index + 1] << 8);
+					bit_offset += 16;
+
+					if (info_header.compression == 3)
+					{
+						const u8* bitfields = data + sizeof(BMPFileHeader) + info_header.size;
+						const u32 r_mask = *reinterpret_cast<const u32*>(bitfields);
+						const u32 g_mask = *reinterpret_cast<const u32*>(bitfields + 4);
+						const u32 b_mask = *reinterpret_cast<const u32*>(bitfields + 8);
+
+						u32 r_shift = 0, g_shift = 0, b_shift = 0;
+						u32 temp = r_mask;
+						while (temp >>= 1)
+							r_shift++;
+						temp = g_mask;
+						while (temp >>= 1)
+							g_shift++;
+						temp = b_mask;
+						while (temp >>= 1)
+							b_shift++;
+
+						const u8 r = static_cast<u8>((pixel_value & r_mask) >> r_shift);
+						const u8 g = static_cast<u8>((pixel_value & g_mask) >> g_shift);
+						const u8 b = static_cast<u8>((pixel_value & b_mask) >> b_shift);
+
+						const u8 r_max = static_cast<u8>(r_mask >> r_shift);
+						const u8 g_max = static_cast<u8>(g_mask >> g_shift);
+						const u8 b_max = static_cast<u8>(b_mask >> b_shift);
+
+						const u8 r_scaled = (r_max > 0) ? static_cast<u8>((r * 255) / r_max) : 0;
+						const u8 g_scaled = (g_max > 0) ? static_cast<u8>((g * 255) / g_max) : 0;
+						const u8 b_scaled = (b_max > 0) ? static_cast<u8>((b * 255) / b_max) : 0;
+
+						row_dst[x] = r_scaled | (g_scaled << 8) | (b_scaled << 16) | 0xFF000000u;
+					}
+					else
+					{
+						const u8 r = (pixel_value >> 10) & 0x1F;
+						const u8 g = (pixel_value >> 5) & 0x1F;
+						const u8 b = pixel_value & 0x1F;
+						row_dst[x] = (r << 3) | (g << 11) | (b << 19) | 0xFF000000u;
+					}
+					continue;
+				}
+				case 24:
+				{
+					const u32 byte_index = bit_offset / 8;
+					const u8 b = row_src[byte_index + 0];
+					const u8 g = row_src[byte_index + 1];
+					const u8 r = row_src[byte_index + 2];
+					row_dst[x] = r | (g << 8) | (b << 16) | 0xFF000000u;
+					bit_offset += 24;
+					continue;
+				}
+				case 32:
+				{
+					const u32 byte_index = bit_offset / 8;
+					u32 pixel_value = row_src[byte_index] | (row_src[byte_index + 1] << 8) | (row_src[byte_index + 2] << 16) | (row_src[byte_index + 3] << 24);
+					bit_offset += 32;
+
+					if (info_header.compression == 3 || info_header.compression == 4) // BITFIELDS or ALPHABITFIELDS
+					{
+						// Calculate shifts
+						auto calc_shift = [](u32 mask) -> u32 {
+							u32 result = 0;
+							while ((mask >= 0x100) || (!(mask & 1) && mask))
+							{
+								result++;
+								mask >>= 1;
+							}
+							return result;
+						};
+
+						// Calculate scales
+						auto calc_scale = [](u32 low_mask) -> u32 {
+							u32 result = 8;
+							while (low_mask && result)
+							{
+								result--;
+								low_mask >>= 1;
+							}
+							return result;
+						};
+
+						// Apply scale
+						auto apply_scale = [](u32 value, u32 scale) -> u8 {
+							if (!(scale & 0x07)) // scale == 8 or 0
+								return static_cast<u8>(value);
+							u32 filled = 8 - scale;
+							u32 result = value << scale;
+							do
+							{
+								result |= result >> filled;
+								filled <<= 1;
+							} while (filled < 8);
+							return static_cast<u8>(result);
+						};
+
+						const u32 r_shift = calc_shift(red_mask);
+						const u32 g_shift = calc_shift(green_mask);
+						const u32 b_shift = calc_shift(blue_mask);
+						const u32 a_shift = (alpha_mask != 0) ? calc_shift(alpha_mask) : 0;
+
+						const u32 r_scale = calc_scale(red_mask >> r_shift);
+						const u32 g_scale = calc_scale(green_mask >> g_shift);
+						const u32 b_scale = calc_scale(blue_mask >> b_shift);
+						const u32 a_scale = (alpha_mask != 0) ? calc_scale(alpha_mask >> a_shift) : 0;
+
+						const u8 r = apply_scale((pixel_value & red_mask) >> r_shift, r_scale);
+						const u8 g = apply_scale((pixel_value & green_mask) >> g_shift, g_scale);
+						const u8 b = apply_scale((pixel_value & blue_mask) >> b_shift, b_scale);
+						const u8 a = (use_alpha && alpha_mask != 0) ? apply_scale((pixel_value & alpha_mask) >> a_shift, a_scale) : 0xFF;
+
+						row_dst[x] = r | (g << 8) | (b << 16) | (a << 24);
+					}
+					else
+					{
+						// Uncompressed 32-bit BGRA order
+						const u8 b = row_src[byte_index + 0];
+						const u8 g = row_src[byte_index + 1];
+						const u8 r = row_src[byte_index + 2];
+						const u8 a = row_src[byte_index + 3];
+						row_dst[x] = r | (g << 8) | (b << 16) | (a << 24);
+					}
+					continue;
+				}
+			}
+			if (info_header.bit_count <= 8)
+			{
+				if (pixel_value < palette.size())
+					row_dst[x] = palette[pixel_value];
+				else
+				{
+					Console.Error("Invalid palette index: %u (palette size: %zu)", pixel_value, palette.size());
+					return false;
+				}
+			}
+		}
+	}
+	return true;
+}
+
+bool LoadCompressedBMP(u32* pixels, const u8* src, u32 src_size, u32 width, u32 height, const BMPInfoHeader& info_header, const std::vector<u32>& palette, bool flip_vertical)
+{
+	u32 src_pos = 0;
+	const u32 pixel_size = (info_header.bit_count == 8) ? 1 : 2;
+
+	for (u32 y = 0; y < height; y++)
+	{
+		u32 dst_y = flip_vertical ? (height - 1 - y) : y;
+		u32* row_dst = pixels + (dst_y * width);
+		u32 x = 0;
+
+		while (x < width)
+		{
+			// Check bounds before reading
+			if (src_pos + 2 > src_size)
+				return false;
+
+			const u8 count = src[src_pos++];
+			const u8 value = src[src_pos++];
+
+			if (count == 0)
+			{
+				if (value == 0)
+				{
+					break;
+				}
+				else if (value == 1)
+				{
+					return true;
+				}
+				else if (value == 2)
+				{
+					// Delta (jump) need 2 more bytes
+					if (src_pos + 2 > src_size)
+						return false;
+					const u8 dx = src[src_pos++];
+					const u8 dy = src[src_pos++];
+					x += dx;
+					y += dy;
+					if (y >= height || x >= width)
+						return false;
+					const u32 new_dst_y = flip_vertical ? (height - 1 - y) : y;
+					row_dst = pixels + (new_dst_y * width);
+				}
+				else
+				{
+					// Absolute mode need "value" bytes of pixel data
+					const u32 run_length = value;
+					const u32 bytes_needed = run_length * pixel_size;
+					if (src_pos + bytes_needed > src_size)
+						return false;
+
+					for (u32 i = 0; i < run_length; i++)
+					{
+						if (x >= width)
+							break;
+
+						u8 pixel_value = 0;
+						if (info_header.bit_count == 8)
+						{
+							pixel_value = src[src_pos++];
+						}
+						else
+						{
+							const u8 byte_val = src[src_pos++];
+							pixel_value = (i % 2 == 0) ? (byte_val >> 4) : (byte_val & 0x0F);
+						}
+
+						row_dst[x++] = (pixel_value < palette.size()) ? palette[pixel_value] : 0;
+					}
+
+					if ((run_length * pixel_size) % 2 == 1)
+						src_pos++;
+				}
+			}
+			else
+			{
+				u8 pixel_value = value;
+
+				for (u32 i = 0; i < count; i++)
+				{
+					if (x >= width)
+						break;
+					row_dst[x++] = (pixel_value < palette.size()) ? palette[pixel_value] : 0;
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+bool BMPBufferLoader(RGBA8Image* image, const void* buffer, size_t buffer_size)
+{
+	if (buffer_size < sizeof(BMPFileHeader) + sizeof(BMPInfoHeader))
+	{
+		Console.Error("BMP file too small");
+		return false;
+	}
+
+	const u8* data = static_cast<const u8*>(buffer);
+	BMPFileHeader file_header;
+	BMPInfoHeader info_header;
+
+	std::memcpy(&file_header, data, sizeof(BMPFileHeader));
+	std::memcpy(&info_header, data + sizeof(BMPFileHeader), sizeof(BMPInfoHeader));
+
+	if (file_header.type != 0x4D42)
+	{
+		Console.Error("Invalid BMP signature");
+		return false;
+	}
+
+	// Check for extended header versions (V4=108 bytes, V5=124 bytes)
+	// We read as BITMAPINFOHEADER (40 bytes) regardless, since extended headers just add fields at the end
+	if (info_header.size == 108)
+	{
+		Console.Warning("BITMAPV4HEADER detected, reading as BITMAPINFOHEADER");
+	}
+	else if (info_header.size == 124)
+	{
+		Console.Warning("BITMAPV5HEADER detected, reading as BITMAPINFOHEADER");
+	}
+	else if (info_header.size != 40)
+	{
+		Console.Warning("Unknown BMP header size: %u, attempting to read as BITMAPINFOHEADER", info_header.size);
+	}
+
+	if (!IsSupportedBMPFormat(info_header.compression, info_header.bit_count))
+	{
+		Console.Error("Unsupported BMP format: compression=%u, bit_count=%u", info_header.compression, info_header.bit_count);
+		return false;
+	}
+
+	const u32 width = static_cast<u32>(std::abs(info_header.width));
+	const u32 height = static_cast<u32>(std::abs(info_header.height));
+	const bool flip_vertical = (info_header.height > 0);
+
+	if (width == 0 || height == 0)
+	{
+		Console.Error("Invalid BMP dimensions: %ux%u", width, height);
+		return false;
+	}
+
+	if (width > 65536 || height > 65536)
+	{
+		Console.Error("BMP dimensions too large: %ux%u", width, height);
+		return false;
+	}
+
+	Console.WriteLn("BMP: %ux%u, %u-bit, compression=%u", width, height, info_header.bit_count, info_header.compression);
+
+	// Read color masks from header or bitfields
+	u32 red_mask = 0;
+	u32 green_mask = 0;
+	u32 blue_mask = 0;
+	u32 alpha_mask = 0;
+	const bool bitfields = (info_header.compression == 3 || info_header.compression == 4); // BMP_BITFIELDS or BMP_ALPHABITFIELDS
+	const u8* header_start = data + sizeof(BMPFileHeader);
+	const u32 header_base_offset = sizeof(BMPFileHeader) + 40; // Base header is 40 bytes
+
+	if (info_header.size >= 108) // BMP_WIN4 (108) or BMP_WIN5 (124)
+	{
+		// V4/V5 headers masks come right after the 40-byte base header
+		// Masks are at offsets from header_start: red=40, green=44, blue=48, alpha=52
+		if (buffer_size >= header_base_offset + 16) // Need space for 4 masks
+		{
+			red_mask = *reinterpret_cast<const u32*>(header_start + 40);
+			green_mask = *reinterpret_cast<const u32*>(header_start + 44);
+			blue_mask = *reinterpret_cast<const u32*>(header_start + 48);
+			alpha_mask = *reinterpret_cast<const u32*>(header_start + 52);
+		}
+	}
+	else if (bitfields && (info_header.bit_count == 16 || info_header.bit_count == 32))
+	{
+		const u32 bitfields_offset = sizeof(BMPFileHeader) + info_header.size;
+		if (buffer_size >= bitfields_offset + 12) // Need space for at least r/g/b masks
+		{
+			red_mask = *reinterpret_cast<const u32*>(data + bitfields_offset);
+			green_mask = *reinterpret_cast<const u32*>(data + bitfields_offset + 4);
+			blue_mask = *reinterpret_cast<const u32*>(data + bitfields_offset + 8);
+			if (info_header.compression == 4) // BMP_ALPHABITFIELDS
+			{
+				// Read alpha mask: r, g, b, a
+				if (buffer_size >= bitfields_offset + 16)
+					alpha_mask = *reinterpret_cast<const u32*>(data + bitfields_offset + 12);
+			}
+			// For BMP_BITFIELDS (3), alpha_mask stays 0
+		}
+	}
+
+	bool use_alpha = bitfields || (info_header.compression == 0 && info_header.bit_count == 32 && alpha_mask == 0xff000000);
+	use_alpha = use_alpha && (alpha_mask != 0);
+
+	const u32 bytes_per_pixel = info_header.bit_count / 8;
+	const u32 row_size = ((width * bytes_per_pixel + 3) / 4) * 4;
+
+	// For uncompressed BMPs, verify we have enough data
+	// For RLE-compressed BMPs, size is variable so we check differently
+	if (info_header.compression == 0)
+	{
+		if (file_header.offset + (row_size * height) > buffer_size)
+		{
+			Console.Error("BMP file data incomplete");
+			return false;
+		}
+	}
+	else
+	{
+		// For RLE-compressed BMPs, check that we have at least the offset and some data
+		// Use biSizeImage if available, otherwise just verify offset is valid
+		if (file_header.offset >= buffer_size)
+		{
+			Console.Error("BMP file data incomplete");
+			return false;
+		}
+		if (info_header.size_image > 0)
+		{
+			if (file_header.offset + info_header.size_image > buffer_size)
+			{
+				Console.Error("BMP file data incomplete");
+				return false;
+			}
+		}
+	}
+
+	std::vector<u32> pixels;
+	pixels.resize(width * height);
+
+	const u8* src = data + file_header.offset;
+	const u32 src_size = buffer_size - file_header.offset;
+
+	std::vector<u32> palette;
+	if (info_header.bit_count <= 8)
+	{
+		if (!LoadBMPPalette(palette, data, file_header.offset, info_header))
+		{
+			Console.Error("Failed to load BMP palette");
+			return false;
+		}
+	}
+
+	if (info_header.compression == 0 || info_header.compression == 3 || info_header.compression == 4)
+	{
+		if (!LoadUncompressedBMP(pixels.data(), src, data, width, height, info_header, palette, flip_vertical, red_mask, green_mask, blue_mask, alpha_mask, use_alpha))
+		{
+			Console.Error("Failed to load uncompressed BMP data");
+			return false;
+		}
+	}
+	else
+	{
+		if (!LoadCompressedBMP(pixels.data(), src, src_size, width, height, info_header, palette, flip_vertical))
+		{
+			Console.Error("Failed to load compressed BMP data");
+			return false;
+		}
+	}
+
+	// Handle alpha channel for 32-bit BMPs
+	// Only use alpha if alpha_mask is explicitly set in header/bitfields
+	if (info_header.bit_count == 32 && !use_alpha)
+	{
+		// Alpha mask not set or zero - set all pixels to fully opaque
+		for (u32& pixel : pixels)
+			pixel |= 0xFF000000u;
+	}
+
+	image->SetPixels(width, height, std::move(pixels));
+	return true;
+}
+
+bool BMPFileLoader(RGBA8Image* image, const char* filename, std::FILE* fp)
+{
+	std::optional<std::vector<u8>> data = FileSystem::ReadBinaryFile(fp);
+	if (!data.has_value())
+		return false;
+
+	return BMPBufferLoader(image, data->data(), data->size());
+}
+
+bool BMPBufferSaver(const RGBA8Image& image, std::vector<u8>* buffer, u8 quality)
+{
+	const u32 width = image.GetWidth();
+	const u32 height = image.GetHeight();
+
+	// Check dimensions
+	if (width == 0 || height == 0)
+	{
+		Console.Error("Invalid BMP dimensions: %ux%u", width, height);
+		return false;
+	}
+
+	const u32 row_size = ((width * 3 + 3) / 4) * 4;
+	const u32 image_size = row_size * height;
+	const u32 file_size = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader) + image_size;
+
+	buffer->resize(file_size);
+	u8* data = buffer->data();
+
+	BMPFileHeader file_header = {};
+	file_header.type = 0x4D42;
+	file_header.size = file_size;
+	file_header.reserved1 = 0;
+	file_header.reserved2 = 0;
+	file_header.offset = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader);
+	std::memcpy(data, &file_header, sizeof(BMPFileHeader));
+
+	BMPInfoHeader info_header = {};
+	info_header.size = sizeof(BMPInfoHeader);
+	info_header.width = static_cast<s32>(width);
+	info_header.height = static_cast<s32>(height);
+	info_header.planes = 1;
+	info_header.bit_count = 24;
+	info_header.compression = 0;
+	info_header.size_image = image_size;
+	info_header.x_pels_per_meter = 0;
+	info_header.y_pels_per_meter = 0;
+	info_header.clr_used = 0;
+	info_header.clr_important = 0;
+	std::memcpy(data + sizeof(BMPFileHeader), &info_header, sizeof(BMPInfoHeader));
+
+	u8* pixel_data = data + file_header.offset;
+	for (u32 y = 0; y < height; y++)
+	{
+		const u32 src_y = height - 1 - y;
+		const u32* row_src = image.GetRowPixels(src_y);
+		u8* row_dst = pixel_data + (y * row_size);
+
+		for (u32 x = 0; x < width; x++)
+		{
+			const u32 rgba = row_src[x];
+			row_dst[x * 3 + 0] = static_cast<u8>((rgba >> 16) & 0xFF);
+			row_dst[x * 3 + 1] = static_cast<u8>((rgba >> 8) & 0xFF);
+			row_dst[x * 3 + 2] = static_cast<u8>(rgba & 0xFF);
+		}
+	}
+
+	return true;
+}
+
+bool BMPFileSaver(const RGBA8Image& image, const char* filename, std::FILE* fp, u8 quality)
+{
+	std::vector<u8> buffer;
+	if (!BMPBufferSaver(image, &buffer, quality))
+		return false;
+
+	return (std::fwrite(buffer.data(), buffer.size(), 1, fp) == 1);
+}

common/Timer.cpp

@@ -106,6 +106,11 @@ namespace Common
 		Reset();
 	}
 
+	Timer::Timer(Value start_value)
+	{
+		m_tvStartValue = start_value;
+	}
+
 	void Timer::Reset()
 	{
 		m_tvStartValue = GetCurrentValue();

common/Timer.h

@@ -12,6 +12,7 @@ namespace Common
 		using Value = std::uint64_t;
 
 		Timer();
+		Timer (Value start_value);
 
 		static Value GetCurrentValue();
 		static double ConvertValueToSeconds(Value value);

common/Windows/WinMisc.cpp

@@ -100,54 +100,16 @@ void Common::SetMousePosition(int x, int y)
 	SetCursorPos(x, y);
 }
 
-/*
-static HHOOK mouseHook = nullptr;
-static std::function<void(int, int)> fnMouseMoveCb;
-LRESULT CALLBACK Mousecb(int nCode, WPARAM wParam, LPARAM lParam)
-{
-	if (nCode >= 0 && wParam == WM_MOUSEMOVE)
-	{
-		MSLLHOOKSTRUCT* mouse = (MSLLHOOKSTRUCT*)lParam;
-		fnMouseMoveCb(mouse->pt.x, mouse->pt.y);
-	}
-	return CallNextHookEx(mouseHook, nCode, wParam, lParam);
-}
-*/
-
-// This (and the above) works, but is not recommended on Windows and is only here for consistency.
-// Defer to using raw input instead.
 bool Common::AttachMousePositionCb(std::function<void(int, int)> cb)
 {
-	/*
-		if (mouseHook)
-			Common::DetachMousePositionCb();
-
-		fnMouseMoveCb = cb;
-		mouseHook = SetWindowsHookEx(WH_MOUSE_LL, Mousecb, GetModuleHandle(NULL), 0);
-		if (!mouseHook)
-		{
-			Console.Warning("Failed to set mouse hook: %d", GetLastError());
-			return false;
-		}
-
-		#if defined(PCSX2_DEBUG) || defined(PCSX2_DEVBUILD)
-			static bool warned = false;
-			if (!warned)
-			{
-				Console.Warning("Mouse hooks are enabled, and this isn't a release build! Using a debugger, or loading symbols, _will_ stall the hook and cause global mouse lag.");
-				warned = true;
-			}
-		#endif
-	*/
+	// We use raw input messages which are handled by the windows message loop.
+	// The alternative is to use a low-level mouse hook, but this passes Windows all mouse messages to PCSX2.
+	// If PCSX2 hangs, or you attach a debugger, the mouse will stop working system-wide.
 	return true;
 }
 
 void Common::DetachMousePositionCb()
 {
-	/*
-		UnhookWindowsHookEx(mouseHook);
-		mouseHook = nullptr;
-	*/
 }
 
 bool Common::PlaySoundAsync(const char* path)

common/YAML.cpp

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
+// SPDX-License-Identifier: GPL-3.0+
+
+#include "YAML.h"
+
+#include <csetjmp>
+#include <cstdlib>
+
+struct RapidYAMLContext
+{
+	std::jmp_buf env;
+	Error* error = nullptr;
+};
+
+std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr file_name, Error* error)
+{
+	RapidYAMLContext context;
+	context.error = error;
+
+	ryml::Callbacks callbacks;
+	callbacks.m_user_data = static_cast<void*>(&context);
+	callbacks.m_error = [](const char* msg, size_t msg_len, ryml::Location location, void* user_data) {
+		RapidYAMLContext* context = static_cast<RapidYAMLContext*>(user_data);
+
+		Error::SetString(context->error, std::string(msg, msg_len));
+		std::longjmp(context->env, 1);
+	};
+
+	ryml::EventHandlerTree event_handler(callbacks);
+	ryml::Parser parser(&event_handler);
+
+	ryml::Tree tree;
+
+	// The only options RapidYAML provides for recovering from errors are
+	// throwing an exception or using setjmp/longjmp. Since we have exceptions
+	// disabled we have to use the latter option.
+	if (setjmp(context.env))
+		return std::nullopt;
+
+	ryml::parse_in_arena(&parser, file_name, yaml, &tree);
+
+	return tree;
+}

common/YAML.h

@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
+// SPDX-License-Identifier: GPL-3.0+
+
+#pragma once
+
+#include "Error.h"
+
+#include "ryml_std.hpp"
+#include "ryml.hpp"
+#include "ryml.hpp"
+
+#include <optional>
+
+/// Parse a YAML file with RapidYAML, and use setjmp/longjmp to recover from
+/// parsing errors (as is recommended by the documentation for cases where
+/// exceptions are disabled). The file_name parameter is only used for error
+/// messages, which are returned via the error parameter.
+std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr file_name, Error* error);

common/common.vcxproj

@@ -36,10 +36,12 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fast_float\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\fmt\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\jpgd</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\include</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>PrecompiledHeader.h</ForcedIncludeFiles>
       <PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
+      <PreprocessorDefinitions>C4_NO_DEBUG_BREAK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -71,6 +73,7 @@
     <ClCompile Include="Timer.cpp" />
     <ClCompile Include="WAVWriter.cpp" />
     <ClCompile Include="WindowInfo.cpp" />
+    <ClCompile Include="YAML.cpp" />
     <ClCompile Include="Perf.cpp" />
     <ClCompile Include="PrecompiledHeader.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -157,6 +160,7 @@
     <ClInclude Include="Timer.h" />
     <ClInclude Include="WAVWriter.h" />
     <ClInclude Include="WindowInfo.h" />
+    <ClInclude Include="YAML.h" />
     <ClInclude Include="Threading.h" />
     <ClInclude Include="emitter\implement\avx.h" />
     <ClInclude Include="emitter\implement\bmi.h" />

common/common.vcxproj.filters

@@ -127,6 +127,9 @@
     <ClCompile Include="SmallString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="YAML.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AlignedMalloc.h">
@@ -335,6 +338,9 @@
     </ClInclude>
     <ClInclude Include="SingleRegisterTypes.h" />
     <ClInclude Include="FPControl.h" />
+    <ClInclude Include="YAML.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -349,4 +355,4 @@
       <Filter>Source Files</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>

pcsx2-gsrunner/Main.cpp

@@ -47,10 +47,19 @@
 
 #include "svnrev.h"
 
+// Down here because X11 has a lot of defines that can conflict
+#if defined(__linux__)
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <sys/select.h>
+#include <unistd.h>
+#endif
+
 namespace GSRunner
 {
 	static void InitializeConsole();
 	static bool InitializeConfig();
+	static void SettingsOverride();
 	static bool ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& params);
 	static void DumpStats();
 
@@ -111,42 +120,6 @@ bool GSRunner::InitializeConfig()
 
 	VMManager::SetDefaultSettings(si, true, true, true, true, true);
 
-	// complete as quickly as possible
-	si.SetBoolValue("EmuCore/GS", "FrameLimitEnable", false);
-	si.SetIntValue("EmuCore/GS", "VsyncEnable", false);
-
-	// Force screenshot quality settings to something more performant, overriding any defaults good for users.
-	si.SetIntValue("EmuCore/GS", "ScreenshotFormat", static_cast<int>(GSScreenshotFormat::PNG));
-	si.SetIntValue("EmuCore/GS", "ScreenshotQuality", 10);
-
-	// ensure all input sources are disabled, we're not using them
-	si.SetBoolValue("InputSources", "SDL", false);
-	si.SetBoolValue("InputSources", "XInput", false);
-
-	// we don't need any sound output
-	si.SetStringValue("SPU2/Output", "OutputModule", "nullout");
-
-	// none of the bindings are going to resolve to anything
-	Pad::ClearPortBindings(si, 0);
-	si.ClearSection("Hotkeys");
-
-	// force logging
-	si.SetBoolValue("Logging", "EnableSystemConsole", !s_no_console);
-	si.SetBoolValue("Logging", "EnableTimestamps", true);
-	si.SetBoolValue("Logging", "EnableVerbose", true);
-
-	// and show some stats :)
-	si.SetBoolValue("EmuCore/GS", "OsdShowFPS", true);
-	si.SetBoolValue("EmuCore/GS", "OsdShowResolution", true);
-	si.SetBoolValue("EmuCore/GS", "OsdShowGSStats", true);
-
-	// remove memory cards, so we don't have sharing violations
-	for (u32 i = 0; i < 2; i++)
-	{
-		si.SetBoolValue("MemoryCards", fmt::format("Slot{}_Enable", i + 1).c_str(), false);
-		si.SetStringValue("MemoryCards", fmt::format("Slot{}_Filename", i + 1).c_str(), "");
-	}
-
 	VMManager::Internal::LoadStartupSettings();
 	return true;
 }
@@ -473,8 +446,8 @@ static void PrintCommandLineHelp(const char* progname)
 	std::fprintf(stderr, "  -help: Displays this information and exits.\n");
 	std::fprintf(stderr, "  -version: Displays version information and exits.\n");
 	std::fprintf(stderr, "  -dumpdir <dir>: Frame dump directory (will be dumped as filename_frameN.png).\n");
-	std::fprintf(stderr, "  -dump [rt|tex|z|f|a|i|tr]: Enabling dumping of render target, texture, z buffer, frame, "
-		"alphas, and info (context, vertices, transfers (list)), transfers (images), respectively, per draw. Generates lots of data.\n");
+	std::fprintf(stderr, "  -dump [rt|tex|z|f|a|i|tr|ds|fs]: Enabling dumping of render target, texture, z buffer, frame, "
+		"alphas, and info (context, vertices, list of transfers), transfers images, draw stats, frame stats, respectively, per draw. Generates lots of data.\n");
 	std::fprintf(stderr, "  -dumprange N[,L,B]: Start dumping from draw N (base 0), stops after L draws, and only "
 		"those draws that are multiples of B (intersection of -dumprange and -dumprangef used)."
 		"Defaults to 0,-1,1 (all draws). Only used if -dump used.\n");
@@ -560,6 +533,10 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
 					s_settings_interface.SetBoolValue("EmuCore/GS", "SaveInfo", true);
 				if (str.find("tr") != std::string::npos)
 					s_settings_interface.SetBoolValue("EmuCore/GS", "SaveTransferImages", true);
+				if (str.find("ds") != std::string::npos)
+					s_settings_interface.SetBoolValue("EmuCore/GS", "SaveDrawStats", true);
+				if (str.find("fs") != std::string::npos)
+					s_settings_interface.SetBoolValue("EmuCore/GS", "SaveFrameStats", true);
 				continue;
 			}
 			else if (CHECK_ARG_PARAM("-dumprange"))
@@ -701,6 +678,28 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
 
 				continue;
 			}
+			else if (CHECK_ARG_PARAM("-ini"))
+			{
+				std::string path = std::string(StringUtil::StripWhitespace(argv[++i]));
+				if (!FileSystem::FileExists(path.c_str()))
+				{
+					Console.ErrorFmt("INI file {} does not exit.", path);
+					return false;
+				}
+
+				INISettingsInterface si_ini(path);
+
+				if (!si_ini.Load())
+				{
+					Console.ErrorFmt("Unable to load INI settings from {}.", path);
+					return false;
+				}
+
+				for (const auto& [key, value] : si_ini.GetKeyValueList("EmuCore/GS"))
+					s_settings_interface.SetStringValue("EmuCore/GS", key.c_str(), value.c_str());
+
+				continue;
+			}
 			else if (CHECK_ARG_PARAM("-upscale"))
 			{
 				const float upscale = StringUtil::FromChars<float>(argv[++i]).value_or(0.0f);
@@ -731,7 +730,7 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
 			else if (CHECK_ARG("-noshadercache"))
 			{
 				Console.WriteLn("Disabling shader cache");
-				s_settings_interface.SetBoolValue("EmuCore/GS", "disable_shader_cache", true);
+				s_settings_interface.SetBoolValue("EmuCore/GS", "DisableShaderCache", true);
 				continue;
 			}
 			else if (CHECK_ARG("-window"))
@@ -805,6 +804,45 @@ bool GSRunner::ParseCommandLineArgs(int argc, char* argv[], VMBootParameters& pa
 	return true;
 }
 
+void GSRunner::SettingsOverride()
+{
+	// complete as quickly as possible
+	s_settings_interface.SetBoolValue("EmuCore/GS", "FrameLimitEnable", false);
+	s_settings_interface.SetIntValue("EmuCore/GS", "VsyncEnable", false);
+
+	// Force screenshot quality settings to something more performant, overriding any defaults good for users.
+	s_settings_interface.SetIntValue("EmuCore/GS", "ScreenshotFormat", static_cast<int>(GSScreenshotFormat::PNG));
+	s_settings_interface.SetIntValue("EmuCore/GS", "ScreenshotQuality", 10);
+
+	// ensure all input sources are disabled, we're not using them
+	s_settings_interface.SetBoolValue("InputSources", "SDL", false);
+	s_settings_interface.SetBoolValue("InputSources", "XInput", false);
+
+	// we don't need any sound output
+	s_settings_interface.SetStringValue("SPU2/Output", "OutputModule", "nullout");
+
+	// none of the bindings are going to resolve to anything
+	Pad::ClearPortBindings(s_settings_interface, 0);
+	s_settings_interface.ClearSection("Hotkeys");
+
+	// force logging
+	s_settings_interface.SetBoolValue("Logging", "EnableSystemConsole", !s_no_console);
+	s_settings_interface.SetBoolValue("Logging", "EnableTimestamps", true);
+	s_settings_interface.SetBoolValue("Logging", "EnableVerbose", true);
+
+	// and show some stats :)
+	s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowFPS", true);
+	s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowResolution", true);
+	s_settings_interface.SetBoolValue("EmuCore/GS", "OsdShowGSStats", true);
+
+	// remove memory cards, so we don't have sharing violations
+	for (u32 i = 0; i < 2; i++)
+	{
+		s_settings_interface.SetBoolValue("MemoryCards", fmt::format("Slot{}_Enable", i + 1).c_str(), false);
+		s_settings_interface.SetStringValue("MemoryCards", fmt::format("Slot{}_Filename", i + 1).c_str(), "");
+	}
+}
+
 void GSRunner::DumpStats()
 {
 	std::atomic_thread_fence(std::memory_order_acquire);
@@ -823,16 +861,27 @@ void GSRunner::DumpStats()
 #define main real_main
 #endif
 
-static void CPUThreadMain(VMBootParameters* params) {
-	if (VMManager::Initialize(*params))
+static void CPUThreadMain(VMBootParameters* params, std::atomic<int>* ret)
+{
+	ret->store(EXIT_FAILURE);
+
+	if (VMManager::Internal::CPUThreadInitialize())
 	{
-		// run until end
-		GSDumpReplayer::SetLoopCount(s_loop_count);
-		VMManager::SetState(VMState::Running);
-		while (VMManager::GetState() == VMState::Running)
-			VMManager::Execute();
-		VMManager::Shutdown(false);
-		GSRunner::DumpStats();
+		// apply new settings (e.g. pick up renderer change)
+		VMManager::ApplySettings();
+		GSDumpReplayer::SetIsDumpRunner(true);
+
+		if (VMManager::Initialize(*params))
+		{
+			// run until end
+			GSDumpReplayer::SetLoopCount(s_loop_count);
+			VMManager::SetState(VMState::Running);
+			while (VMManager::GetState() == VMState::Running)
+				VMManager::Execute();
+			VMManager::Shutdown(false);
+			GSRunner::DumpStats();
+			ret->store(EXIT_SUCCESS);
+		}
 	}
 
 	VMManager::Internal::CPUThreadShutdown();
@@ -854,27 +903,23 @@ int main(int argc, char* argv[])
 	if (!GSRunner::ParseCommandLineArgs(argc, argv, params))
 		return EXIT_FAILURE;
 
-	if (!VMManager::Internal::CPUThreadInitialize())
-		return EXIT_FAILURE;
-
 	if (s_use_window.value_or(true) && !GSRunner::CreatePlatformWindow())
 	{
 		Console.Error("Failed to create window.");
 		return EXIT_FAILURE;
 	}
 
-	// apply new settings (e.g. pick up renderer change)
-	VMManager::ApplySettings();
-	GSDumpReplayer::SetIsDumpRunner(true);
+	// Override settings that shouldn't be picked up from defaults or INIs.
+	GSRunner::SettingsOverride();
 
-	std::thread cputhread(CPUThreadMain, &params);
+	std::atomic<int> thread_ret;
+	std::thread cputhread(CPUThreadMain, &params, &thread_ret);
 	GSRunner::PumpPlatformMessages(/*forever=*/true);
 	cputhread.join();
 
-	VMManager::Internal::CPUThreadShutdown();
 	GSRunner::DestroyPlatformWindow();
 
-	return EXIT_SUCCESS;
+	return thread_ret.load();
 }
 
 void Host::PumpMessagesOnCPUThread()
@@ -1086,4 +1131,118 @@ void GSRunner::StopPlatformMessagePump()
 	CocoaTools::StopMainThreadEventLoop();
 }
 
+#elif defined(__linux__)
+static Display* s_display = nullptr;
+static Window s_window = None;
+static WindowInfo s_wi;
+static std::atomic<bool> s_shutdown_requested{false};
+
+bool GSRunner::CreatePlatformWindow()
+{
+	pxAssertRel(!s_display && s_window == None, "Tried to create window when there already was one!");
+
+	s_display = XOpenDisplay(nullptr);
+	if (!s_display)
+	{
+		Console.Error("Failed to open X11 display");
+		return false;
+	}
+
+	int screen = DefaultScreen(s_display);
+	Window root = RootWindow(s_display, screen);
+
+	s_window = XCreateSimpleWindow(s_display, root, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, 1,
+		BlackPixel(s_display, screen), WhitePixel(s_display, screen));
+
+	if (s_window == None)
+	{
+		Console.Error("Failed to create X11 window");
+		XCloseDisplay(s_display);
+		s_display = nullptr;
+		return false;
+	}
+
+	XStoreName(s_display, s_window, "PCSX2 GS Runner");
+	XSelectInput(s_display, s_window, StructureNotifyMask);
+	XMapWindow(s_display, s_window);
+
+	s_wi.type = WindowInfo::Type::X11;
+	s_wi.display_connection = s_display;
+	s_wi.window_handle = reinterpret_cast<void*>(s_window);
+	s_wi.surface_width = WINDOW_WIDTH;
+	s_wi.surface_height = WINDOW_HEIGHT;
+	s_wi.surface_scale = 1.0f;
+
+	XFlush(s_display);
+	PumpPlatformMessages();
+	return true;
+}
+
+void GSRunner::DestroyPlatformWindow()
+{
+	if (s_display && s_window != None)
+	{
+		XDestroyWindow(s_display, s_window);
+		s_window = None;
+	}
+
+	if (s_display)
+	{
+		XCloseDisplay(s_display);
+		s_display = nullptr;
+	}
+}
+
+std::optional<WindowInfo> GSRunner::GetPlatformWindowInfo()
+{
+	WindowInfo wi;
+	if (s_display && s_window != None)
+		wi = s_wi;
+	else
+		wi.type = WindowInfo::Type::Surfaceless;
+	return wi;
+}
+
+void GSRunner::PumpPlatformMessages(bool forever)
+{
+	if (!s_display)
+		return;
+
+	do
+	{
+		while (XPending(s_display) > 0)
+		{
+			XEvent event;
+			XNextEvent(s_display, &event);
+
+			switch (event.type)
+			{
+				case ConfigureNotify:
+				{
+					const XConfigureEvent& configure = event.xconfigure;
+					s_wi.surface_width = static_cast<u32>(configure.width);
+					s_wi.surface_height = static_cast<u32>(configure.height);
+					break;
+				}
+				case DestroyNotify:
+					return;
+				default:
+					break;
+			}
+		}
+
+		if (s_shutdown_requested.load())
+			return;
+
+		if (forever)
+		{
+			std::this_thread::sleep_for(std::chrono::milliseconds(1));
+		}
+	} while (forever && !s_shutdown_requested.load());
+}
+
+void GSRunner::StopPlatformMessagePump()
+{
+	s_shutdown_requested.store(true);
+}
 #endif // _WIN32 / __APPLE__

pcsx2-gsrunner/test_run_dumps.py

@@ -73,7 +73,6 @@ def run_regression_test(runner, dumpdir, renderer, upscale, renderhacks, paralle
     #print("Running '%s'" % (" ".join(args)))
     subprocess.run(args, env=environ, stdin=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL, creationflags=creationflags)
 
-
 def run_regression_tests(runner, gsdir, dumpdir, renderer, upscale, renderhacks, parallel=1):
     paths = glob.glob(gsdir + "/*.*", recursive=True)
     gamepaths = list(filter(lambda x: get_gs_name(x) is not None, paths))
@@ -104,12 +103,12 @@ def run_regression_tests(runner, gsdir, dumpdir, renderer, upscale, renderhacks,
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Generate frame dump images for regression tests")
-    parser.add_argument("-runner", action="store", required=True, help="Path to PCSX2 GS runner")
-    parser.add_argument("-gsdir", action="store", required=True, help="Directory containing GS dumps")
-    parser.add_argument("-dumpdir", action="store", required=True, help="Base directory to dump frames to")
-    parser.add_argument("-renderer", action="store", required=False, help="Renderer to use")
+    parser.add_argument("-runner", action="store", required=True, type=str.strip, help="Path to PCSX2 GS runner")
+    parser.add_argument("-gsdir", action="store", required=True, type=str.strip, help="Directory containing GS dumps")
+    parser.add_argument("-dumpdir", action="store", required=True, type=str.strip, help="Base directory to dump frames to")
+    parser.add_argument("-renderer", action="store", required=False, type=str.strip, help="Renderer to use")
     parser.add_argument("-upscale", action="store", type=float, default=1, help="Upscaling multiplier to use")
-    parser.add_argument("-renderhacks", action="store", required=False, help="Enable HW Rendering hacks")
+    parser.add_argument("-renderhacks", action="store", required=False, type=str.strip, help="Enable HW Rendering hacks")
     parser.add_argument("-parallel", action="store", type=int, default=1, help="Number of processes to run")
 
     args = parser.parse_args()

pcsx2-qt/AboutDialog.cpp

@@ -12,6 +12,7 @@
 #include "common/SmallString.h"
 
 #include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 #include <QtCore/QString>
 #include <QtGui/QDesktopServices>
 #include <QtWidgets/QDialog>
@@ -134,12 +135,16 @@ void AboutDialog::showHTMLDialog(QWidget* parent, const QString& title, const QS
 	tb->setOpenExternalLinks(true);
 
 	QFile file(path);
-	file.open(QIODevice::ReadOnly);
-	if (const QByteArray data = file.readAll(); !data.isEmpty())
-		tb->setText(QString::fromUtf8(data));
-	else
+	QFileInfo fi(path);
+	if (!fi.exists() || !fi.isReadable())
+	{
 		tb->setText(tr("File not found: %1").arg(path));
-
+	}
+	else
+	{
+		tb->setSource(QUrl::fromLocalFile(path));
+	}
+	
 	layout->addWidget(tb, 1);
 
 	QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dialog);

pcsx2-qt/AboutDialog.ui

@@ -81,6 +81,9 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextBrowserInteraction</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -115,6 +118,9 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextBrowserInteraction</set>
+     </property>
     </widget>
    </item>
    <item>

pcsx2-qt/AutoUpdaterDialog.ui

@@ -3,7 +3,7 @@
  <class>AutoUpdaterDialog</class>
  <widget class="QDialog" name="AutoUpdaterDialog">
   <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
+   <enum>Qt::WindowModality::ApplicationModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -91,7 +91,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -132,6 +132,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>updateNotes</tabstop>
+  <tabstop>downloadAndInstall</tabstop>
+  <tabstop>skipThisUpdate</tabstop>
+  <tabstop>remindMeLater</tabstop>
+ </tabstops>
  <resources>
   <include location="resources/resources.qrc"/>
  </resources>

pcsx2-qt/CMakeLists.txt

@@ -264,6 +264,14 @@ target_sources(pcsx2-qt PRIVATE
 	resources/resources.qrc
 )
 
+if (NOT APPLE)
+    target_sources(pcsx2-qt PRIVATE
+        ShortcutCreationDialog.cpp
+        ShortcutCreationDialog.h
+        ShortcutCreationDialog.ui
+    )
+endif()
+
 file(GLOB TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Translations/*.ts)
 
 target_precompile_headers(pcsx2-qt PRIVATE PrecompiledHeader.h)
@@ -281,6 +289,7 @@ target_link_libraries(pcsx2-qt PRIVATE
 	PCSX2
 	Qt6::Core
 	Qt6::Gui
+	Qt6::GuiPrivate
 	Qt6::Widgets
 	KDAB::kddockwidgets
 )

pcsx2-qt/CoverDownloadDialog.ui

@@ -28,7 +28,7 @@
         <pixmap resource="resources/resources.qrc">:/icons/black/svg/artboard-2-line.svg</pixmap>
        </property>
        <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
        </property>
       </widget>
      </item>
@@ -40,6 +40,12 @@
        <property name="wordWrap">
         <bool>true</bool>
        </property>
+       <property name="buddy">
+        <cstring>label</cstring>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::TextBrowserInteraction</set>
+       </property>
       </widget>
      </item>
     </layout>
@@ -52,6 +58,12 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="buddy">
+      <cstring>urls</cstring>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextBrowserInteraction</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -65,6 +77,12 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="buddy">
+      <cstring>useTitleFileNames</cstring>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextBrowserInteraction</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -110,6 +128,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>urls</tabstop>
+  <tabstop>useTitleFileNames</tabstop>
+  <tabstop>start</tabstop>
+  <tabstop>close</tabstop>
+ </tabstops>
  <resources>
   <include location="resources/resources.qrc"/>
  </resources>

pcsx2-qt/Debugger/AnalysisOptionsDialog.ui

@@ -34,6 +34,9 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextBrowserInteraction</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -45,10 +48,10 @@
       </sizepolicy>
      </property>
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Shape::NoFrame</enum>
      </property>
      <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
+      <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
@@ -80,7 +83,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -108,6 +111,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>closeCheckBox</tabstop>
+  <tabstop>analyseButton</tabstop>
+  <tabstop>closeButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui

@@ -3,7 +3,7 @@
  <class>BreakpointDialog</class>
  <widget class="QDialog" name="BreakpointDialog">
   <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
+   <enum>Qt::WindowModality::ApplicationModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -56,10 +56,10 @@
     </sizepolicy>
    </property>
    <property name="orientation">
-    <enum>Qt::Horizontal</enum>
+    <enum>Qt::Orientation::Horizontal</enum>
    </property>
    <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+    <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
    </property>
   </widget>
   <widget class="QGroupBox" name="grpType">
@@ -111,13 +111,16 @@
    </property>
    <layout class="QFormLayout" name="formLayout">
     <property name="formAlignment">
-     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
     </property>
     <item row="0" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
        <string>Address</string>
       </property>
+      <property name="buddy">
+       <cstring>txtAddress</cstring>
+      </property>
      </widget>
     </item>
     <item row="0" column="1">
@@ -147,6 +150,9 @@
       <property name="text">
        <string>Description</string>
       </property>
+      <property name="buddy">
+       <cstring>txtDescription</cstring>
+      </property>
      </widget>
     </item>
     <item row="1" column="1">
@@ -221,6 +227,9 @@
         <property name="text">
          <string>Size</string>
         </property>
+        <property name="buddy">
+         <cstring>txtSize</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -264,6 +273,9 @@
       <property name="text">
        <string>Condition</string>
       </property>
+      <property name="buddy">
+       <cstring>txtCondition</cstring>
+      </property>
      </widget>
     </item>
     <item row="0" column="1">
@@ -310,6 +322,19 @@
    </layout>
   </widget>
  </widget>
+ <tabstops>
+  <tabstop>rdoMemory</tabstop>
+  <tabstop>rdoExecute</tabstop>
+  <tabstop>txtAddress</tabstop>
+  <tabstop>txtDescription</tabstop>
+  <tabstop>chkLog</tabstop>
+  <tabstop>chkEnable</tabstop>
+  <tabstop>chkRead</tabstop>
+  <tabstop>chkWrite</tabstop>
+  <tabstop>chkChange</tabstop>
+  <tabstop>txtSize</tabstop>
+  <tabstop>txtCondition</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

pcsx2-qt/Debugger/DebuggerSettingsManager.cpp

@@ -153,7 +153,7 @@ void DebuggerSettingsManager::saveGameSettings(QAbstractTableModel* abstractTabl
 	if (path.empty())
 		return;
 
-	const std::lock_guard<std::mutex> lock(writeLock);
+	std::lock_guard<std::mutex> lock(writeLock);
 	QJsonObject loadedSettings = loadGameSettingsJSON();
 	QJsonArray rowsArray;
 	QStringList keys;

pcsx2-qt/Debugger/DebuggerWindow.cpp

@@ -238,6 +238,12 @@ int DebuggerWindow::fontSize()
 
 void DebuggerWindow::updateTheme()
 {
+	// Detect recursive StyleChange events caused by updating the stylesheet.
+	if (m_is_updating_theme)
+		return;
+
+	m_is_updating_theme = true;
+
 	// TODO: Migrate away from stylesheets to improve performance.
 	setStyleSheet(QString("font-size: %1pt;").arg(m_font_size));
 
@@ -248,6 +254,8 @@ void DebuggerWindow::updateTheme()
 		setStyleSheet(QString());
 
 	dockManager().updateTheme();
+
+	m_is_updating_theme = false;
 }
 
 void DebuggerWindow::saveWindowGeometry()
@@ -535,6 +543,12 @@ void DebuggerWindow::onStepOut()
 	this->repaint();
 }
 
+void DebuggerWindow::changeEvent(QEvent* event)
+{
+	if (event->type() == QEvent::PaletteChange || event->type() == QEvent::StyleChange)
+		updateTheme();
+}
+
 void DebuggerWindow::closeEvent(QCloseEvent* event)
 {
 	dockManager().saveCurrentLayout();

pcsx2-qt/Debugger/DebuggerWindow.h

@@ -60,7 +60,8 @@ Q_SIGNALS:
 	void onVMActuallyPaused();
 
 protected:
-	void closeEvent(QCloseEvent* event);
+	void changeEvent(QEvent* event) override;
+	void closeEvent(QCloseEvent* event) override;
 
 private:
 	DebugInterface* currentCPU();
@@ -75,6 +76,8 @@ private:
 	int m_font_size;
 	static const constexpr int MINIMUM_FONT_SIZE = 5;
 	static const constexpr int MAXIMUM_FONT_SIZE = 30;
+
+	bool m_is_updating_theme = false;
 };
 
 extern DebuggerWindow* g_debugger_window;

pcsx2-qt/Debugger/DisassemblyView.cpp

@@ -118,11 +118,11 @@ void DisassemblyView::contextPasteInstructionText()
 	// split text in clipboard by new lines
 	QString clipboardText = QApplication::clipboard()->text();
 	std::vector<std::string> newInstructions = StringUtil::splitOnNewLine(clipboardText.toLocal8Bit().constData());
-	int newInstructionsSize = newInstructions.size();
+	u32 newInstructionsSize = static_cast<u32>(newInstructions.size());
 
 	// validate new instructions before pasting them
 	std::vector<u32> encodedInstructions;
-	for (int instructionIdx = 0; instructionIdx < newInstructionsSize; instructionIdx++)
+	for (u32 instructionIdx = 0; instructionIdx < newInstructionsSize; instructionIdx++)
 	{
 		u32 replaceAddress = m_selectedAddressStart + instructionIdx * 4;
 		u32 encodedInstruction;
@@ -137,7 +137,7 @@ void DisassemblyView::contextPasteInstructionText()
 	}
 
 	// paste validated instructions
-	for (int instructionIdx = 0; instructionIdx < newInstructionsSize; instructionIdx++)
+	for (u32 instructionIdx = 0; instructionIdx < newInstructionsSize; instructionIdx++)
 	{
 		u32 replaceAddress = m_selectedAddressStart + instructionIdx * 4;
 		setInstructions(replaceAddress, replaceAddress, encodedInstructions[instructionIdx]);
@@ -424,7 +424,7 @@ void DisassemblyView::paintEvent(QPaintEvent* event)
 	bool alternate = m_visibleStart % 8;
 
 	// Draw visible disassembly rows
-	for (u32 i = 0; i <= m_visibleRows; i++)
+	for (u32 i = 0; i < m_visibleRows + 1; i++)
 	{
 		// Address of instruction being displayed on row
 		const u32 rowAddress = (i * 4) + m_visibleStart;
@@ -939,7 +939,7 @@ inline QString DisassemblyView::DisassemblyStringFromAddress(u32 address, QFont
 QColor DisassemblyView::GetAddressFunctionColor(u32 address)
 {
 	std::array<QColor, 6> colors;
-	if (QtUtils::IsLightTheme(palette()))
+	if (!QtHost::IsDarkApplicationTheme())
 	{
 		colors = {
 			QColor::fromRgba(0xFFFA3434),
@@ -977,18 +977,18 @@ QColor DisassemblyView::GetAddressFunctionColor(u32 address)
 QString DisassemblyView::FetchSelectionInfo(SelectionInfo selInfo)
 {
 	QString infoBlock;
-	for (u32 i = m_selectedAddressStart; i <= m_selectedAddressEnd; i += 4)
+	for (u64 i = m_selectedAddressStart; i <= m_selectedAddressEnd; i += 4)
 	{
 		if (i != m_selectedAddressStart)
 			infoBlock += '\n';
 		if (selInfo == SelectionInfo::ADDRESS)
 		{
-			infoBlock += FilledQStringFromValue(i, 16);
+			infoBlock += FilledQStringFromValue(static_cast<u32>(i), 16);
 		}
 		else if (selInfo == SelectionInfo::INSTRUCTIONTEXT)
 		{
 			DisassemblyLineInfo line;
-			m_disassemblyManager.getLine(i, true, line);
+			m_disassemblyManager.getLine(static_cast<u32>(i), true, line);
 			infoBlock += QString("%1 %2").arg(line.name.c_str()).arg(line.params.c_str());
 		}
 		else // INSTRUCTIONHEX
@@ -1075,9 +1075,9 @@ void DisassemblyView::setInstructions(u32 start, u32 end, u32 value)
 
 bool DisassemblyView::AddressCanRestore(u32 start, u32 end)
 {
-	for (u32 i = start; i <= end; i += 4)
+	for (u64 i = start; i <= end; i += 4)
 	{
-		if (this->m_nopedInstructions.find(i) != this->m_nopedInstructions.end())
+		if (this->m_nopedInstructions.find(static_cast<u32>(i)) != this->m_nopedInstructions.end())
 		{
 			return true;
 		}

pcsx2-qt/Debugger/Docking/DockMenuBar.cpp

@@ -6,39 +6,36 @@
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
-#include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QStyleOption>
 
-static const int OUTER_MENU_MARGIN = 2;
-static const int INNER_MENU_MARGIN = 4;
+static constexpr int TAB_BAR_TOP_MARGIN = 2;
+static constexpr int RIGHT_MARGIN = 2;
 
 DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent)
 	: QWidget(parent)
 	, m_original_menu_bar(original_menu_bar)
 {
-	QHBoxLayout* layout = new QHBoxLayout;
-	layout->setContentsMargins(0, OUTER_MENU_MARGIN, OUTER_MENU_MARGIN, 0);
-	setLayout(layout);
+	QHBoxLayout* layout = new QHBoxLayout(this);
+	layout->setContentsMargins(0, 0, RIGHT_MARGIN, 0);
 
-	QWidget* menu_wrapper = new QWidget;
-	menu_wrapper->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-	layout->addWidget(menu_wrapper);
+	QWidget* menu_bar_wrapper = new QWidget;
+	layout->addWidget(menu_bar_wrapper);
 
-	QHBoxLayout* menu_layout = new QHBoxLayout;
-	menu_layout->setContentsMargins(0, INNER_MENU_MARGIN, 0, INNER_MENU_MARGIN);
-	menu_wrapper->setLayout(menu_layout);
+	QVBoxLayout* menu_bar_layout = new QVBoxLayout(menu_bar_wrapper);
+	menu_bar_layout->setContentsMargins(0, 0, 0, 0);
+	menu_bar_layout->addWidget(original_menu_bar, 0, Qt::AlignVCenter);
 
-	menu_layout->addWidget(original_menu_bar);
+	QWidget* layout_switcher_wrapper = new QWidget;
+	layout->addWidget(layout_switcher_wrapper);
+
+	m_layout_switcher_layout = new QVBoxLayout(layout_switcher_wrapper);
 
 	m_layout_switcher = new QTabBar;
-	m_layout_switcher->setContentsMargins(0, 0, 0, 0);
-	m_layout_switcher->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 	m_layout_switcher->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_layout_switcher->setDrawBase(false);
 	m_layout_switcher->setExpanding(false);
 	m_layout_switcher->setMovable(true);
-	layout->addWidget(m_layout_switcher);
 
 	connect(m_layout_switcher, &QTabBar::tabMoved, this, [this](int from, int to) {
 		DockLayout::Index from_index = static_cast<DockLayout::Index>(from);
@@ -63,6 +60,10 @@ DockMenuBar::DockMenuBar(QWidget* original_menu_bar, QWidget* parent)
 	});
 	layout->addWidget(m_layout_locked_toggle);
 
+	layout->setStretchFactor(menu_bar_wrapper, 0);
+	layout->setStretchFactor(layout_switcher_wrapper, 1);
+	layout->setStretchFactor(m_layout_locked_toggle, 0);
+
 	updateTheme();
 }
 
@@ -75,6 +76,19 @@ void DockMenuBar::updateTheme()
 
 	delete m_style;
 	m_style = style;
+
+	// Vertically centre the layout switcher tabs for the Windows 11 style
+	// because I think it looks better. Do the same for macOS too.
+	if (style->baseStyle()->name() == "windows11" || style->baseStyle()->name() == "macOS")
+	{
+		m_layout_switcher_layout->setContentsMargins(0, 0, 0, 0);
+		m_layout_switcher_layout->addWidget(m_layout_switcher, 0, Qt::AlignVCenter);
+	}
+	else
+	{
+		m_layout_switcher_layout->setContentsMargins(0, TAB_BAR_TOP_MARGIN, 0, 0);
+		m_layout_switcher_layout->addWidget(m_layout_switcher, 0, Qt::AlignBottom);
+	}
 }
 
 void DockMenuBar::updateLayoutSwitcher(DockLayout::Index current_index, const std::vector<DockLayout>& layouts)
@@ -182,11 +196,6 @@ void DockMenuBar::stopBlink()
 	}
 }
 
-int DockMenuBar::innerHeight() const
-{
-	return m_original_menu_bar->sizeHint().height() + INNER_MENU_MARGIN * 2;
-}
-
 void DockMenuBar::paintEvent(QPaintEvent* event)
 {
 	QPainter painter(this);
@@ -236,39 +245,6 @@ void DockMenuBarStyle::drawControl(
 {
 	switch (element)
 	{
-		case CE_MenuBarItem:
-		{
-			const QStyleOptionMenuItem* opt = qstyleoption_cast<const QStyleOptionMenuItem*>(option);
-			if (!opt)
-				break;
-
-			QWidget* menu_wrapper = widget->parentWidget();
-			if (!menu_wrapper)
-				break;
-
-			const DockMenuBar* menu_bar = qobject_cast<const DockMenuBar*>(menu_wrapper->parentWidget());
-			if (!menu_bar)
-				break;
-
-			if (baseStyle()->name() != "fusion")
-				break;
-
-			// This mirrors a check in QFusionStyle::drawControl. If act is
-			// false, QFusionStyle will try to draw a border along the bottom.
-			bool act = opt->state & State_Selected && opt->state & State_Sunken;
-			if (act)
-				break;
-
-			// Extend the menu item to the bottom of the menu bar to fix the
-			// position in which it draws its bottom border. We also need to
-			// extend it up by the same amount so that the text isn't moved.
-			QStyleOptionMenuItem menu_opt = *opt;
-			int difference = (menu_bar->innerHeight() - option->rect.top()) - menu_opt.rect.height();
-			menu_opt.rect.adjust(0, -difference, 0, difference);
-			QProxyStyle::drawControl(element, &menu_opt, painter, widget);
-
-			return;
-		}
 		case CE_TabBarTab:
 		{
 			QProxyStyle::drawControl(element, option, painter, widget);
@@ -286,6 +262,25 @@ void DockMenuBarStyle::drawControl(
 
 			return;
 		}
+		case CE_MenuBarItem:
+		{
+			const QStyleOptionMenuItem* opt = qstyleoption_cast<const QStyleOptionMenuItem*>(option);
+			if (!opt)
+				break;
+
+			if (baseStyle()->name() != "fusion")
+				break;
+
+			// This mirrors a check in QFusionStyle::drawControl. If act is
+			// false, QFusionStyle will try to draw a border along the bottom.
+			bool act = opt->state & State_Selected && opt->state & State_Sunken;
+			if (act)
+				break;
+
+			QCommonStyle::drawControl(element, option, painter, widget);
+
+			return;
+		}
 		case CE_MenuBarEmptyArea:
 		{
 			// Prevent it from drawing a border in the wrong position.
@@ -301,11 +296,13 @@ void DockMenuBarStyle::drawControl(
 }
 
 QSize DockMenuBarStyle::sizeFromContents(
-	QStyle::ContentsType type, const QStyleOption* option, const QSize& contents_size, const QWidget* widget) const
+	QStyle::ContentsType type,
+	const QStyleOption* option,
+	const QSize& contents_size,
+	const QWidget* widget) const
 {
 	QSize size = QProxyStyle::sizeFromContents(type, option, contents_size, widget);
 
-#ifdef Q_OS_WIN32
 	// Adjust the sizes of the layout switcher tabs depending on the theme.
 	if (type == CT_TabBarTab)
 	{
@@ -313,30 +310,12 @@ QSize DockMenuBarStyle::sizeFromContents(
 		if (!opt)
 			return size;
 
-		const QTabBar* tab_bar = qobject_cast<const QTabBar*>(widget);
-		if (!tab_bar)
-			return size;
-
-		const DockMenuBar* menu_bar = qobject_cast<const DockMenuBar*>(tab_bar->parentWidget());
-		if (!menu_bar)
-			return size;
-
-		if (baseStyle()->name() == "fusion" || baseStyle()->name() == "windowsvista")
+		if (baseStyle()->name() == "windows11")
 		{
-			// Make sure the tab extends to the bottom of the widget.
-			size.setHeight(menu_bar->innerHeight() - opt->rect.top());
-		}
-		else if (baseStyle()->name() == "windows11")
-		{
-			// Adjust the size of the tab such that it is vertically centred.
-			size.setHeight(menu_bar->innerHeight() - opt->rect.top() * 2 - OUTER_MENU_MARGIN);
-
-			// Make the plus button square.
-			if (opt->tabIndex + 1 == tab_bar->count())
-				size.setWidth(size.height());
+			// Make the tabs a bit taller, otherwise there's an awkward margin.
+			size.setHeight(size.height() + 4);
 		}
 	}
-#endif
 
 	return size;
 }

pcsx2-qt/Debugger/Docking/DockMenuBar.h

@@ -9,6 +9,7 @@
 #include <QtWidgets/QProxyStyle>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QTabBar>
+#include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QWidget>
 
 class DockMenuBarStyle;
@@ -36,8 +37,6 @@ public:
 	void updateBlink();
 	void stopBlink();
 
-	int innerHeight() const;
-
 Q_SIGNALS:
 	void currentLayoutChanged(DockLayout::Index layout_index);
 	void newButtonClicked();
@@ -54,6 +53,7 @@ private:
 
 	QWidget* m_original_menu_bar;
 
+	QVBoxLayout* m_layout_switcher_layout;
 	QTabBar* m_layout_switcher;
 	QMetaObject::Connection m_tab_connection;
 	int m_plus_tab_index = -1;
@@ -70,8 +70,7 @@ private:
 	DockMenuBarStyle* m_style = nullptr;
 };
 
-// Fixes some theming issues relating to the menu bar, the layout switcher and
-// the layout locked/unlocked toggle button.
+// Fixes some theming issues relating to the menu bar and the layout switcher.
 class DockMenuBarStyle : public QProxyStyle
 {
 	Q_OBJECT
@@ -83,11 +82,11 @@ public:
 		ControlElement element,
 		const QStyleOption* option,
 		QPainter* painter,
-		const QWidget* widget = nullptr) const override;
+		const QWidget* widget) const override;
 
 	QSize sizeFromContents(
 		QStyle::ContentsType type,
 		const QStyleOption* option,
 		const QSize& contents_size,
-		const QWidget* widget = nullptr) const override;
+		const QWidget* widget) const override;
 };

pcsx2-qt/Debugger/Docking/DockViews.cpp

@@ -145,15 +145,8 @@ DockTabBar::DockTabBar(KDDockWidgets::Core::TabBar* controller, QWidget* parent)
 	setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(this, &DockTabBar::customContextMenuRequested, this, &DockTabBar::openContextMenu);
 
-	// The constructor of KDDockWidgets::QtWidgets::TabBar makes a QProxyStyle
-	// that ends up taking ownerhsip of the style for the entire application!
 	if (QProxyStyle* proxy_style = qobject_cast<QProxyStyle*>(style()))
-	{
-		if (proxy_style->baseStyle() == qApp->style())
-			proxy_style->baseStyle()->setParent(qApp);
-
 		proxy_style->setBaseStyle(QStyleFactory::create(qApp->style()->name()));
-	}
 }
 
 void DockTabBar::openContextMenu(QPoint pos)

pcsx2-qt/Debugger/Docking/DropIndicators.cpp

@@ -3,6 +3,7 @@
 
 #include "DropIndicators.h"
 
+#include "QtHost.h"
 #include "QtUtils.h"
 #include "Debugger/Docking/DockViews.h"
 
@@ -21,7 +22,7 @@ static std::pair<QColor, QColor> pickNiceColours(const QPalette& palette, bool h
 	QColor fill = palette.highlight().color();
 	QColor outline = palette.highlight().color();
 
-	if (QtUtils::IsLightTheme(palette))
+	if (!QtHost::IsDarkApplicationTheme())
 	{
 		fill = fill.darker(200);
 		outline = outline.darker(200);
@@ -197,7 +198,7 @@ static const constexpr int INDICATOR_MARGIN = 10;
 static bool isWayland()
 {
 	return KDDockWidgets::Core::Platform::instance()->displayType() ==
-		   KDDockWidgets::Core::Platform::DisplayType::Wayland;
+	       KDDockWidgets::Core::Platform::DisplayType::Wayland;
 }
 
 static QWidget* parentForIndicatorWindow(KDDockWidgets::Core::ClassicDropIndicatorOverlay* classic_indicators)

pcsx2-qt/Debugger/Docking/LayoutEditorDialog.ui

@@ -21,6 +21,9 @@
        <property name="text">
         <string>Name</string>
        </property>
+       <property name="buddy">
+        <cstring>nameEditor</cstring>
+       </property>
       </widget>
      </item>
      <item row="1" column="0">
@@ -28,6 +31,9 @@
        <property name="text">
         <string>Target</string>
        </property>
+       <property name="buddy">
+        <cstring>cpuEditor</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="0">
@@ -35,6 +41,9 @@
        <property name="text">
         <string>Initial State</string>
        </property>
+       <property name="buddy">
+        <cstring>initialStateEditor</cstring>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -66,10 +75,10 @@
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
        </property>
       </widget>
      </item>
@@ -77,6 +86,11 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>nameEditor</tabstop>
+  <tabstop>cpuEditor</tabstop>
+  <tabstop>initialStateEditor</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

pcsx2-qt/Debugger/Docking/NoLayoutsWidget.ui

@@ -20,7 +20,7 @@
    <item>
     <spacer name="topSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -36,7 +36,10 @@
       <string>There are no layouts.</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignmentFlag::AlignCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>createDefaultLayoutsButton</cstring>
      </property>
     </widget>
    </item>
@@ -45,7 +48,7 @@
      <item>
       <spacer name="leftSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -65,7 +68,7 @@
      <item>
       <spacer name="rightSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -80,7 +83,7 @@
    <item>
     <spacer name="bottomSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -92,6 +95,9 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>createDefaultLayoutsButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

pcsx2-qt/Debugger/Memory/MemorySearchView.ui

@@ -21,6 +21,9 @@
        <property name="text">
         <string>Value</string>
        </property>
+       <property name="buddy">
+        <cstring>txtSearchValue</cstring>
+       </property>
       </widget>
      </item>
      <item row="0" column="1">
@@ -31,6 +34,9 @@
        <property name="text">
         <string>Type</string>
        </property>
+       <property name="buddy">
+        <cstring>cmbSearchType</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
@@ -82,6 +88,9 @@
        <property name="text">
         <string>Hex</string>
        </property>
+       <property name="buddy">
+        <cstring>chkSearchHex</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="3">
@@ -155,20 +164,26 @@
        <property name="text">
         <string>Comparison</string>
        </property>
+       <property name="buddy">
+        <cstring>cmbSearchComparison</cstring>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="0" alignment="Qt::AlignLeft">
+     <item row="0" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
       <widget class="QLabel" name="startLabel">
        <property name="text">
         <string>Start</string>
        </property>
+       <property name="buddy">
+        <cstring>txtSearchStart</cstring>
+       </property>
       </widget>
      </item>
-     <item row="0" column="1" alignment="Qt::AlignLeft">
+     <item row="0" column="1" alignment="Qt::AlignmentFlag::AlignLeft">
       <widget class="QLineEdit" name="txtSearchStart">
        <property name="text">
         <string notr="true">0x00</string>
@@ -180,6 +195,9 @@
        <property name="text">
         <string>End</string>
        </property>
+       <property name="buddy">
+        <cstring>txtSearchEnd</cstring>
+       </property>
       </widget>
      </item>
      <item row="0" column="3">
@@ -206,6 +224,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>txtSearchValue</tabstop>
+  <tabstop>cmbSearchComparison</tabstop>
+  <tabstop>cmbSearchType</tabstop>
+  <tabstop>chkSearchHex</tabstop>
+  <tabstop>txtSearchStart</tabstop>
+  <tabstop>txtSearchEnd</tabstop>
+  <tabstop>btnSearch</tabstop>
+  <tabstop>btnFilterSearch</tabstop>
+  <tabstop>listSearchResults</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

pcsx2-qt/Debugger/Memory/MemoryView.cpp

@@ -50,6 +50,8 @@ void MemoryViewTable::DrawTable(QPainter& painter, const QPalette& palette, s32
 	const s32 charWidth = painter.fontMetrics().averageCharWidth();
 	const s32 x = charWidth; // Left padding
 	const s32 y = rowHeight;
+	const s32 displayTypeWidth = MemoryViewTypeWidth[static_cast<s32>(displayType)];
+	const s32 displayTypeVisualWidth = MemoryViewTypeVisualWidth[static_cast<s32>(displayType)];
 	rowVisible = (height / rowHeight);
 	rowCount = rowVisible + 1;
 
@@ -69,23 +71,32 @@ void MemoryViewTable::DrawTable(QPainter& painter, const QPalette& palette, s32
 		const u32 currentRowAddress = startAddress + (i * 0x10);
 		s32 valX = valuexAxis;
 		segmentXAxis[0] = valX;
-		for (int j = 0; j < 16 / static_cast<s32>(displayType); j++)
+		for (int j = 0; j < 16 / displayTypeWidth; j++)
 		{
 			valX += charWidth;
-			const u32 thisSegmentsStart = currentRowAddress + (j * static_cast<s32>(displayType));
+			const u32 thisSegmentsStart = currentRowAddress + (j * displayTypeWidth);
 
 			segmentXAxis[j] = valX;
 
 			bool penDefault = false;
 			if ((selectedAddress & ~0xF) == currentRowAddress)
 			{
-				if (selectedAddress >= thisSegmentsStart && selectedAddress < (thisSegmentsStart + static_cast<s32>(displayType)))
+				if (selectedAddress >= thisSegmentsStart && selectedAddress < (thisSegmentsStart + displayTypeWidth))
 				{ // If the current byte and row we are drawing is selected
 					if (!selectedText)
 					{
-						s32 charsIntoSegment = ((selectedAddress - thisSegmentsStart) * 2) + ((selectedNibbleHI ? 0 : 1) ^ littleEndian);
+						s32 charsIntoSegment = 0;
+						if (displayType == MemoryViewType::FLOAT)
+						{
+							charsIntoSegment = selectedIndex;
+						}
+						else
+						{
+							charsIntoSegment = ((selectedAddress - thisSegmentsStart) * 2) + ((selectedNibbleHI ? 0 : 1) ^ littleEndian);
+						}
+
 						if (littleEndian)
-							charsIntoSegment = (static_cast<s32>(displayType) * 2) - charsIntoSegment - 1;
+							charsIntoSegment = displayTypeVisualWidth - charsIntoSegment - 1;
 						painter.setPen(QColor::fromRgb(205, 165, 0)); // SELECTED NIBBLE LINE COLOUR
 						const QPoint lineStart(valX + (charsIntoSegment * charWidth) + 1, y + (rowHeight * i));
 						painter.drawLine(lineStart, lineStart + QPoint(charWidth - 3, 0));
@@ -139,8 +150,19 @@ void MemoryViewTable::DrawTable(QPainter& painter, const QPalette& palette, s32
 					painter.drawText(valX, y + (rowHeight * i), valid ? FilledQStringFromValue(val, 16) : "????????????????");
 					break;
 				}
+				case MemoryViewType::FLOAT:
+				{
+					const u32 intVal = convertEndian<u32>(cpu.read32(thisSegmentsStart, valid));
+					float val = 0.0;
+					std::memcpy(&val, &intVal, sizeof(val));
+					if (penDefault && val == 0.0)
+						painter.setPen(QColor::fromRgb(145, 145, 155)); // ZERO BYTE COLOUR
+					QString floatStr = QString::number(val, 'g');
+					painter.drawText(valX, y + (rowHeight * i), valid ? QString("%1").arg(floatStr, displayTypeVisualWidth) : "??????????????");
+					break;
+				}
 			}
-			valX += charWidth * 2 * static_cast<s32>(displayType);
+			valX += charWidth * displayTypeVisualWidth;
 		}
 
 		// valX is our new X position after the hex values
@@ -183,7 +205,9 @@ void MemoryViewTable::SelectAt(QPoint pos)
 	const u32 selectedRow = (pos.y() - 2) / (rowHeight);
 	const s32 x = pos.x();
 	const s32 avgSegmentWidth = segmentXAxis[1] - segmentXAxis[0];
-	const u32 nibbleWidth = (avgSegmentWidth / (2 * (s32)displayType));
+	const s32 displayTypeWidth = MemoryViewTypeWidth[static_cast<s32>(displayType)];
+	const s32 displayTypeVisualWidth = MemoryViewTypeVisualWidth[static_cast<s32>(displayType)];
+	const u32 nibbleWidth = (avgSegmentWidth / displayTypeVisualWidth);
 	selectedAddress = (selectedRow * 0x10) + startAddress;
 
 	if (x <= segmentXAxis[0])
@@ -191,7 +215,7 @@ void MemoryViewTable::SelectAt(QPoint pos)
 		// The user clicked before the first segment
 		selectedText = false;
 		if (littleEndian)
-			selectedAddress += static_cast<s32>(displayType) - 1;
+			selectedAddress += displayTypeWidth - 1;
 		selectedNibbleHI = true;
 	}
 	else if (x > valuexAxis && x < textXAxis)
@@ -200,13 +224,23 @@ void MemoryViewTable::SelectAt(QPoint pos)
 		// The user clicked inside of the hexadecimal area
 		for (s32 i = 0; i < 16; i++)
 		{
-			if (i == ((16 / static_cast<s32>(displayType)) - 1) || (x >= segmentXAxis[i] && x < (segmentXAxis[i + 1])))
+			if (i == ((16 / displayTypeWidth) - 1) || (x >= segmentXAxis[i] && x < (segmentXAxis[i + 1])))
 			{
 				u32 indexInSegment = (x - segmentXAxis[i]) / nibbleWidth;
 				if (littleEndian)
-					indexInSegment = (static_cast<s32>(displayType) * 2) - indexInSegment - 1;
-				selectedAddress = selectedAddress + i * static_cast<s32>(displayType) + (indexInSegment / 2);
-				selectedNibbleHI = littleEndian ? indexInSegment & 1 : !(indexInSegment & 1);
+					indexInSegment = displayTypeVisualWidth - indexInSegment - 1;
+				selectedIndex = indexInSegment;
+				if (displayType == MemoryViewType::FLOAT)
+				{
+					// Selecting float always points to starting address of float
+					selectedAddress = selectedAddress + i * displayTypeWidth;
+					selectedNibbleHI = false;
+				}
+				else
+				{
+					selectedAddress = selectedAddress + i * displayTypeWidth + (indexInSegment / 2);
+					selectedNibbleHI = littleEndian ? indexInSegment & 1 : !(indexInSegment & 1);
+				}
 				break;
 			}
 		}
@@ -236,6 +270,9 @@ u128 MemoryViewTable::GetSelectedSegment(DebugInterface& cpu)
 		case MemoryViewType::DWORD:
 			val._u64[0] = convertEndian(cpu.read64(selectedAddress & ~7));
 			break;
+		case MemoryViewType::FLOAT:
+			val.lo = convertEndian(cpu.read32(selectedAddress & ~3));
+			break;
 	}
 	return val;
 }
@@ -260,36 +297,111 @@ void MemoryViewTable::InsertIntoSelectedHexView(u8 value, DebugInterface& cpu)
 	});
 }
 
+bool MemoryViewTable::InsertFloatIntoSelectedHexView(DebugInterface& cpu)
+{
+	// Get currently selected float as string
+	const u32 currentIntVal = GetSelectedSegment(cpu).lo;
+	float currentFloatVal = 0;
+	std::memcpy(&currentFloatVal, &currentIntVal, sizeof(currentFloatVal));
+	const QString currentfloatStr = QString("%1").arg(QString::number(currentFloatVal, 'g'), 14).trimmed();
+
+	// Prompt user to enter a new float value
+	bool isValidInput = false;
+	QString newFloatStr = QInputDialog::getText(parent, tr("Input New Float"), "",
+		QLineEdit::Normal, currentfloatStr, &isValidInput);
+	if (!isValidInput)
+		return false;
+
+	// Convert string into float value
+	bool isValidFloat = false;
+	const float newFloatVal = newFloatStr.toFloat(&isValidFloat);
+	if (!isValidFloat)
+	{
+		QMessageBox::warning(parent, tr("Input Error"), tr("Invalid float value"));
+		return false;
+	}
+
+	// Write new float value back to memory
+	u32 newIntVal = 0;
+	std::memcpy(&newIntVal, &newFloatVal, sizeof(newIntVal));
+	newIntVal = convertEndian(newIntVal);
+
+	const QPointer<MemoryViewTable> table(this);
+	Host::RunOnCPUThread([table, address = selectedAddress, &cpu, val = newIntVal] {
+		cpu.write32(address, val);
+
+		QtHost::RunOnUIThread([table] {
+			if (!table)
+				return;
+
+			table->parent->update();
+		});
+	});
+
+	return true;
+}
+
 void MemoryViewTable::InsertAtCurrentSelection(const QString& text, DebugInterface& cpu)
 {
 	if (!cpu.isValidAddress(selectedAddress))
 		return;
 
-	// If pasting into the hex view, also decode the input as hex bytes.
-	// This approach prevents one from pasting on a nibble boundary, but that is almost always
-	// user error, and we don't have an undo function in this view, so best to stay conservative.
-	QByteArray input = selectedText ? text.toUtf8() : QByteArray::fromHex(text.toUtf8());
-
-	const QPointer<MemoryViewTable> table(this);
-	const MemoryViewType display_type = displayType;
-	const bool little_endian = littleEndian;
-	Host::RunOnCPUThread([table, address = selectedAddress, &cpu, input, display_type, little_endian] {
-		u32 currAddr = address;
-		for (int i = 0; i < input.size(); i++)
+	if (displayType == MemoryViewType::FLOAT)
+	{
+		// Convert string into float value
+		bool isValidFloat = false;
+		const float newFloatVal = text.toFloat(&isValidFloat);
+		if (!isValidFloat)
 		{
-			cpu.write8(currAddr, input[i]);
-			currAddr = nextAddress(currAddr, address, display_type, little_endian);
+			QMessageBox::warning(parent, tr("Input Error"), tr("Invalid float value"));
+			return;
 		}
 
-		u32 end_address = address + input.size();
-		QtHost::RunOnUIThread([table, end_address] {
-			if (!table)
-				return;
+		// Write new float value back to memory
+		u32 newIntVal = 0;
+		std::memcpy(&newIntVal, &newFloatVal, sizeof(newIntVal));
+		newIntVal = convertEndian(newIntVal);
 
-			table->UpdateSelectedAddress(end_address);
-			table->parent->update();
+		const QPointer<MemoryViewTable> table(this);
+		Host::RunOnCPUThread([table, address = selectedAddress, &cpu, val = newIntVal] {
+			cpu.write32(address, val);
+
+			QtHost::RunOnUIThread([table] {
+				if (!table)
+					return;
+
+				table->parent->update();
+			});
 		});
-	});
+	}
+	else
+	{
+		// If pasting into the hex view, also decode the input as hex bytes.
+		// This approach prevents one from pasting on a nibble boundary, but that is almost always
+		// user error, and we don't have an undo function in this view, so best to stay conservative.
+		QByteArray input = selectedText ? text.toUtf8() : QByteArray::fromHex(text.toUtf8());
+
+		const QPointer<MemoryViewTable> table(this);
+		const MemoryViewType display_type = displayType;
+		const bool little_endian = littleEndian;
+		Host::RunOnCPUThread([table, address = selectedAddress, &cpu, input, display_type, little_endian] {
+			u32 currAddr = address;
+			for (int i = 0; i < input.size(); i++)
+			{
+				cpu.write8(currAddr, input[i]);
+				currAddr = nextAddress(currAddr, address, display_type, little_endian);
+			}
+
+			u32 end_address = address + input.size();
+			QtHost::RunOnUIThread([table, end_address] {
+				if (!table)
+					return;
+
+				table->UpdateSelectedAddress(end_address);
+				table->parent->update();
+			});
+		});
+	}
 }
 
 u32 MemoryViewTable::nextAddress(u32 addr, u32 selected_address, MemoryViewType display_type, bool little_endian)
@@ -300,8 +412,8 @@ u32 MemoryViewTable::nextAddress(u32 addr, u32 selected_address, MemoryViewType
 	}
 	else
 	{
-		if (selected_address % static_cast<s32>(display_type) == 0)
-			return addr + (static_cast<s32>(display_type) * 2 - 1);
+		if (selected_address % MemoryViewTypeWidth[static_cast<s32>(display_type)] == 0)
+			return addr + (MemoryViewTypeWidth[static_cast<s32>(display_type)] * 2 - 1);
 		else
 			return addr - 1;
 	}
@@ -317,7 +429,7 @@ u32 MemoryViewTable::prevAddress(u32 addr, u32 selected_address, MemoryViewType
 	{
 		// It works
 		if ((addr & (static_cast<u32>(display_type) - 1)) == (static_cast<u32>(display_type) - 1))
-			return addr - (static_cast<s32>(display_type) * 2 - 1);
+			return addr - (MemoryViewTypeWidth[static_cast<s32>(display_type)] * 2 - 1);
 		else
 			return selected_address + 1;
 	}
@@ -325,39 +437,104 @@ u32 MemoryViewTable::prevAddress(u32 addr, u32 selected_address, MemoryViewType
 
 void MemoryViewTable::ForwardSelection()
 {
-	if (!littleEndian)
+	if (displayType == MemoryViewType::FLOAT)
 	{
-		if ((selectedNibbleHI = !selectedNibbleHI))
-			UpdateSelectedAddress(selectedAddress + 1);
+		if (!littleEndian)
+		{
+			// Bump to next address if selection is at end of current float segment
+			if (selectedIndex >= MemoryViewTypeVisualWidth[static_cast<s32>(MemoryViewType::FLOAT)] - 1)
+			{
+				UpdateSelectedAddress(selectedAddress + 4);
+				selectedIndex = 0;
+			}
+			else
+			{
+				selectedIndex++;
+			}
+		}
+		else
+		{
+			if (selectedIndex <= 0)
+			{
+				UpdateSelectedAddress(selectedAddress + 4);
+				selectedIndex = MemoryViewTypeVisualWidth[static_cast<s32>(MemoryViewType::FLOAT)] - 1;
+			}
+			else
+			{
+				selectedIndex--;
+			}
+		}
 	}
 	else
 	{
-		if ((selectedNibbleHI = !selectedNibbleHI))
+		if (!littleEndian)
 		{
-			if (selectedAddress % static_cast<s32>(displayType) == 0)
-				UpdateSelectedAddress(selectedAddress + (static_cast<s32>(displayType) * 2 - 1));
-			else
-				UpdateSelectedAddress(selectedAddress - 1);
+			if ((selectedNibbleHI = !selectedNibbleHI))
+				UpdateSelectedAddress(selectedAddress + 1);
+		}
+		else
+		{
+			if ((selectedNibbleHI = !selectedNibbleHI))
+			{
+				if (selectedAddress % MemoryViewTypeWidth[static_cast<s32>(displayType)] == 0)
+					UpdateSelectedAddress(selectedAddress + (MemoryViewTypeVisualWidth[static_cast<s32>(displayType)] - 1));
+				else
+					UpdateSelectedAddress(selectedAddress - 1);
+			}
 		}
 	}
 }
 
 void MemoryViewTable::BackwardSelection()
 {
-	if (!littleEndian)
+	const s32 displayTypeWidth = MemoryViewTypeWidth[static_cast<s32>(displayType)];
+	const s32 displayTypeVisualWidth = MemoryViewTypeVisualWidth[static_cast<s32>(displayType)];
+
+	if (displayType == MemoryViewType::FLOAT)
 	{
-		if (!(selectedNibbleHI = !selectedNibbleHI))
-			UpdateSelectedAddress(selectedAddress - 1);
+		if (!littleEndian)
+		{
+			// Bump to previous address if selection is at beginning of current float segment
+			if (selectedIndex <= 0)
+			{
+				UpdateSelectedAddress(selectedAddress - 4);
+				selectedIndex = displayTypeVisualWidth - 1;
+			}
+			else
+			{
+				selectedIndex--;
+			}
+		}
+		else
+		{
+			if (selectedIndex >= displayTypeVisualWidth - 1)
+			{
+				UpdateSelectedAddress(selectedAddress - 4);
+				selectedIndex = 0;
+			}
+			else
+			{
+				selectedIndex++;
+			}
+		}
 	}
 	else
 	{
-		if (!(selectedNibbleHI = !selectedNibbleHI))
+		if (!littleEndian)
 		{
-			// It works
-			if ((selectedAddress & (static_cast<u32>(displayType) - 1)) == (static_cast<u32>(displayType) - 1))
-				UpdateSelectedAddress(selectedAddress - (static_cast<s32>(displayType) * 2 - 1));
-			else
-				UpdateSelectedAddress(selectedAddress + 1);
+			if (!(selectedNibbleHI = !selectedNibbleHI))
+				UpdateSelectedAddress(selectedAddress - 1);
+		}
+		else
+		{
+			if (!(selectedNibbleHI = !selectedNibbleHI))
+			{
+				// It works
+				if ((selectedAddress & (static_cast<u32>(displayTypeWidth) - 1)) == (static_cast<u32>(displayTypeWidth) - 1))
+					UpdateSelectedAddress(selectedAddress - (displayTypeVisualWidth - 1));
+				else
+					UpdateSelectedAddress(selectedAddress + 1);
+			}
 		}
 	}
 }
@@ -430,12 +607,15 @@ bool MemoryViewTable::KeyPress(int key, QChar keychar, DebugInterface& cpu)
 
 		if (keyCharIsText)
 		{
-			// Check if key pressed is hex before insertion (QString conversion fails otherwise)
-			const u8 keyPressed = static_cast<u8>(QString(QChar(key)).toInt(&pressHandled, 16));
-			if (pressHandled)
+			if (displayType != MemoryViewType::FLOAT)
 			{
-				InsertIntoSelectedHexView(keyPressed, cpu);
-				ForwardSelection();
+				// Check if key pressed is hex before insertion (QString conversion fails otherwise)
+				const u8 keyPressed = static_cast<u8>(QString(QChar(key)).toInt(&pressHandled, 16));
+				if (pressHandled)
+				{
+					InsertIntoSelectedHexView(keyPressed, cpu);
+					ForwardSelection();
+				}
 			}
 		}
 
@@ -455,6 +635,13 @@ bool MemoryViewTable::KeyPress(int key, QChar keychar, DebugInterface& cpu)
 				BackwardSelection();
 				pressHandled = true;
 				break;
+			case Qt::Key::Key_Return:
+			case Qt::Key::Key_Enter:
+				if (displayType == MemoryViewType::FLOAT)
+				{
+					pressHandled = InsertFloatIntoSelectedHexView(cpu);
+				}
+				break;
 			default:
 				break;
 		}
@@ -549,7 +736,8 @@ bool MemoryView::fromJson(const JsonValueWrapper& json)
 		if (type == MemoryViewType::BYTE ||
 			type == MemoryViewType::BYTEHW ||
 			type == MemoryViewType::WORD ||
-			type == MemoryViewType::DWORD)
+			type == MemoryViewType::DWORD ||
+			type == MemoryViewType::FLOAT)
 			m_table.SetViewType(type);
 	}
 
@@ -647,6 +835,12 @@ void MemoryView::openContextMenu(QPoint pos)
 	connect(dword_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::DWORD); });
 	view_type_group->addAction(dword_action);
 
+	QAction* float_action = menu->addAction(tr("Show as float"));
+	float_action->setCheckable(true);
+	float_action->setChecked(current_view_type == MemoryViewType::FLOAT);
+	connect(float_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::FLOAT); });
+	view_type_group->addAction(float_action);
+
 	menu->addSeparator();
 
 	createEventActions<DebuggerEvents::AddToSavedAddresses>(menu, [this]() {
@@ -655,9 +849,16 @@ void MemoryView::openContextMenu(QPoint pos)
 		return std::optional(event);
 	});
 
-	connect(menu->addAction(tr("Copy Byte")), &QAction::triggered, this, &MemoryView::contextCopyByte);
+	QAction* copy_byte_action = menu->addAction(tr("Copy Byte"));
+	copy_byte_action->setEnabled(current_view_type != MemoryViewType::FLOAT);
+	connect(copy_byte_action, &QAction::triggered, this, &MemoryView::contextCopyByte);
+
 	connect(menu->addAction(tr("Copy Segment")), &QAction::triggered, this, &MemoryView::contextCopySegment);
-	connect(menu->addAction(tr("Copy Character")), &QAction::triggered, this, &MemoryView::contextCopyCharacter);
+
+	QAction* copy_char_action = menu->addAction(tr("Copy Character"));
+	copy_char_action->setEnabled(current_view_type != MemoryViewType::FLOAT);
+	connect(copy_char_action, &QAction::triggered, this, &MemoryView::contextCopyCharacter);
+
 	connect(menu->addAction(tr("Paste")), &QAction::triggered, this, &MemoryView::contextPaste);
 
 	menu->popup(this->mapToGlobal(pos));
@@ -673,7 +874,17 @@ void MemoryView::contextCopyByte()
 
 void MemoryView::contextCopySegment()
 {
-	QApplication::clipboard()->setText(QString::number(m_table.GetSelectedSegment(cpu()).lo, 16).toUpper());
+	if (m_table.GetViewType() == MemoryViewType::FLOAT)
+	{
+		u32 intVal = m_table.GetSelectedSegment(cpu()).lo;
+		float val = 0;
+		std::memcpy(&val, &intVal, sizeof(val));
+		QApplication::clipboard()->setText(QString::number(val, 'g'));
+	}
+	else
+	{
+		QApplication::clipboard()->setText(QString::number(m_table.GetSelectedSegment(cpu()).lo, 16).toUpper());
+	}
 }
 
 void MemoryView::contextCopyCharacter()

pcsx2-qt/Debugger/Memory/MemoryView.h

@@ -20,10 +20,27 @@
 
 enum class MemoryViewType
 {
-	BYTE = 1,
-	BYTEHW = 2,
-	WORD = 4,
-	DWORD = 8,
+	BYTE = 0,
+	BYTEHW = 1,
+	WORD = 2,
+	DWORD = 3,
+	FLOAT = 4,
+};
+
+const s32 MemoryViewTypeWidth[] = {
+	1, //	BYTE
+	2, //	BYTEHW
+	4, //	WORD
+	8, //	DWORD
+	4, //	FLOAT
+};
+
+const s32 MemoryViewTypeVisualWidth[] = {
+	2, //	BYTE
+	4, //	BYTEHW
+	8, //	WORD
+	16, //	DWORD
+	14, //	FLOAT
 };
 
 class MemoryViewTable : public QObject
@@ -48,6 +65,7 @@ private:
 	bool selectedNibbleHI = false;
 
 	void InsertIntoSelectedHexView(u8 value, DebugInterface& cpu);
+	bool InsertFloatIntoSelectedHexView(DebugInterface& cpu);
 
 	template <class T>
 	T convertEndian(T in)
@@ -73,6 +91,7 @@ public:
 
 	u32 startAddress;
 	u32 selectedAddress;
+	s32 selectedIndex;
 
 	void UpdateStartAddress(u32 start);
 	void UpdateSelectedAddress(u32 selected, bool page = false);

pcsx2-qt/Debugger/SymbolTree/SymbolTreeDelegates.cpp

@@ -114,12 +114,30 @@ QWidget* SymbolTreeValueDelegate::createEditor(QWidget* parent, const QStyleOpti
 				const ccc::ast::Enum& enumeration = type.as<ccc::ast::Enum>();
 
 				QComboBox* combo_box = new QComboBox(parent);
-				for (s32 i = 0; i < (s32)enumeration.constants.size(); i++)
+				bool named = false;
+
+				for (size_t i = 0; i < enumeration.constants.size(); i++)
 				{
-					combo_box->addItem(QString::fromStdString(enumeration.constants[i].second));
+					QString text = QString::fromStdString(enumeration.constants[i].second);
+					combo_box->addItem(text, enumeration.constants[i].first);
 					if (enumeration.constants[i].first == value.toInt())
-						combo_box->setCurrentIndex(i);
+					{
+						combo_box->setCurrentIndex(static_cast<int>(i));
+						named = true;
+					}
 				}
+
+				if (!named)
+				{
+					// The value isn't equal to any of the named constants, so
+					// add an extra item to the combo box representing the
+					// current value so that the first named constant isn't
+					// written back to VM memory accidentally.
+					QString text = display_options.signedIntegerToString(value.toInt(), 32);
+					combo_box->insertItem(0, text, value.toInt());
+					combo_box->setCurrentIndex(0);
+				}
+
 				connect(combo_box, &QComboBox::currentIndexChanged, this, &SymbolTreeValueDelegate::onComboBoxIndexChanged);
 				result = combo_box;
 
@@ -245,15 +263,10 @@ void SymbolTreeValueDelegate::setModelData(QWidget* editor, QAbstractItemModel*
 			}
 			case ccc::ast::ENUM:
 			{
-				const ccc::ast::Enum& enumeration = type.as<ccc::ast::Enum>();
 				QComboBox* combo_box = qobject_cast<QComboBox*>(editor);
 				Q_ASSERT(combo_box);
 
-				s32 comboIndex = combo_box->currentIndex();
-				if (comboIndex < 0 || comboIndex >= (s32)enumeration.constants.size())
-					break;
-
-				value = enumeration.constants[comboIndex].first;
+				value = combo_box->currentData().toInt();
 
 				break;
 			}

pcsx2-qt/Debugger/SymbolTree/SymbolTreeNode.cpp

@@ -390,15 +390,13 @@ QString SymbolTreeNode::generateDisplayString(
 		}
 		case ccc::ast::ENUM:
 		{
-			s32 value = (s32)location.read32(cpu);
+			s32 value = static_cast<s32>(location.read32(cpu));
 			const auto& enum_type = physical_type.as<ccc::ast::Enum>();
-			for (auto [test_value, name] : enum_type.constants)
-			{
+			for (const auto& [test_value, name] : enum_type.constants)
 				if (test_value == value)
 					return QString::fromStdString(name);
-			}
 
-			break;
+			return display_options.signedIntegerToString(value, 32);
 		}
 		case ccc::ast::POINTER_OR_REFERENCE:
 		{

pcsx2-qt/Debugger/ThreadModel.cpp

@@ -13,7 +13,7 @@ ThreadModel::ThreadModel(DebugInterface& cpu, QObject* parent)
 
 int ThreadModel::rowCount(const QModelIndex&) const
 {
-	return m_cpu.GetThreadList().size();
+	return static_cast<int>(m_threads.size());
 }
 
 int ThreadModel::columnCount(const QModelIndex&) const

pcsx2-qt/DisplayWidget.cpp

@@ -29,20 +29,12 @@
 #include <qpa/qplatformnativeinterface.h>
 #endif
 
-DisplayWidget::DisplayWidget(QWidget* parent)
-	: QWidget(parent)
+DisplaySurface::DisplaySurface()
+	: QWindow()
 {
-	// We want a native window for both D3D and OpenGL.
-	setAutoFillBackground(false);
-	setAttribute(Qt::WA_NativeWindow, true);
-	setAttribute(Qt::WA_NoSystemBackground, true);
-	setAttribute(Qt::WA_PaintOnScreen, true);
-	setAttribute(Qt::WA_KeyCompression, false);
-	setFocusPolicy(Qt::StrongFocus);
-	setMouseTracking(true);
 }
 
-DisplayWidget::~DisplayWidget()
+DisplaySurface::~DisplaySurface()
 {
 #ifdef _WIN32
 	if (m_clip_mouse_enabled)
@@ -50,19 +42,17 @@ DisplayWidget::~DisplayWidget()
 #endif
 }
 
-int DisplayWidget::scaledWindowWidth() const
+QWidget* DisplaySurface::createWindowContainer(QWidget* parent)
 {
-	return std::max(static_cast<int>(std::ceil(static_cast<qreal>(width()) * devicePixelRatioF())), 1);
+	m_container = QWidget::createWindowContainer(this, parent);
+	m_container->installEventFilter(this);
+	m_container->setFocusPolicy(Qt::StrongFocus);
+	return m_container;
 }
 
-int DisplayWidget::scaledWindowHeight() const
+std::optional<WindowInfo> DisplaySurface::getWindowInfo()
 {
-	return std::max(static_cast<int>(std::ceil(static_cast<qreal>(height()) * devicePixelRatioF())), 1);
-}
-
-std::optional<WindowInfo> DisplayWidget::getWindowInfo()
-{
-	std::optional<WindowInfo> ret(QtUtils::GetWindowInfoForWidget(this));
+	std::optional<WindowInfo> ret(QtUtils::GetWindowInfoForWindow(this));
 	if (ret.has_value())
 	{
 		m_last_window_width = ret->surface_width;
@@ -72,7 +62,7 @@ std::optional<WindowInfo> DisplayWidget::getWindowInfo()
 	return ret;
 }
 
-void DisplayWidget::updateRelativeMode(bool enabled)
+void DisplaySurface::updateRelativeMode(bool enabled)
 {
 #ifdef _WIN32
 	// prefer ClipCursor() over warping movement when we're using raw input
@@ -104,17 +94,17 @@ void DisplayWidget::updateRelativeMode(bool enabled)
 #endif
 		m_relative_mouse_start_pos = QCursor::pos();
 		updateCenterPos();
-		grabMouse();
+		setMouseGrabEnabled(true);
 	}
 	else if (m_relative_mouse_enabled)
 	{
 		m_relative_mouse_enabled = false;
 		QCursor::setPos(m_relative_mouse_start_pos);
-		releaseMouse();
+		setMouseGrabEnabled(false);
 	}
 }
 
-void DisplayWidget::updateCursor(bool hidden)
+void DisplaySurface::updateCursor(bool hidden)
 {
 	if (m_cursor_hidden == hidden)
 		return;
@@ -132,7 +122,7 @@ void DisplayWidget::updateCursor(bool hidden)
 	}
 }
 
-void DisplayWidget::handleCloseEvent(QCloseEvent* event)
+void DisplaySurface::handleCloseEvent(QCloseEvent* event)
 {
 	// Closing the separate widget will either cancel the close, or trigger shutdown.
 	// In the latter case, it's going to destroy us, so don't let Qt do it first.
@@ -152,28 +142,13 @@ void DisplayWidget::handleCloseEvent(QCloseEvent* event)
 	event->ignore();
 }
 
-void DisplayWidget::destroy()
+bool DisplaySurface::isActuallyFullscreen() const
 {
-	m_destroying = true;
-
-#ifdef __APPLE__
-	// See Qt documentation, entire application is in full screen state, and the main
-	// window will get reopened fullscreen instead of windowed if we don't close the
-	// fullscreen window first.
-	if (isActuallyFullscreen())
-		close();
-#endif
-	deleteLater();
+	// DisplaySurface is always in a container, so we need to check parent window
+	return parent()->windowState() & Qt::WindowFullScreen;
 }
 
-bool DisplayWidget::isActuallyFullscreen() const
-{
-	// I hate you QtWayland... have to check the parent, not ourselves.
-	QWidget* container = qobject_cast<QWidget*>(parent());
-	return container ? container->isFullScreen() : isFullScreen();
-}
-
-void DisplayWidget::updateCenterPos()
+void DisplaySurface::updateCenterPos()
 {
 #ifdef _WIN32
 	if (m_clip_mouse_enabled)
@@ -203,12 +178,14 @@ void DisplayWidget::updateCenterPos()
 #endif
 }
 
-QPaintEngine* DisplayWidget::paintEngine() const
-{
-	return nullptr;
-}
-
-bool DisplayWidget::event(QEvent* event)
+// Keyboard focus and child windows are inconsistant across platforms;
+// Windows: Can programmatically focus the child window, NVidia overlay can defocus it.
+// X11: Can programmatically focus the child window.
+// Wayland: Child window cannot be focused at all on most(?) DE.
+// Mac: Can programmatically focus the child window.
+// Thus for KB inputs we need to sometimes use the event filter.
+// Mouse events are always delivered to the child window, so that seems consistant.
+void DisplaySurface::handleKeyInputEvent(QEvent* event)
 {
 	switch (event->type())
 	{
@@ -229,7 +206,7 @@ bool DisplayWidget::event(QEvent* event)
 			}
 
 			if (key_event->isAutoRepeat())
-				return true;
+				return;
 
 			// For some reason, Windows sends "fake" key events.
 			// Scenario: Press shift, press F1, release shift, release F1.
@@ -246,7 +223,7 @@ bool DisplayWidget::event(QEvent* event)
 			if (it != m_keys_pressed_with_modifiers.end())
 			{
 				if (pressed)
-					return true;
+					return;
 				else
 					m_keys_pressed_with_modifiers.erase(it);
 			}
@@ -259,6 +236,23 @@ bool DisplayWidget::event(QEvent* event)
 				InputManager::InvokeEvents(InputManager::MakeHostKeyboardKey(key), static_cast<float>(pressed));
 			});
 
+			return;
+		}
+
+		default:
+			pxAssert(false);
+			return;
+	}
+}
+
+bool DisplaySurface::event(QEvent* event)
+{
+	switch (event->type())
+	{
+		case QEvent::KeyPress:
+		case QEvent::KeyRelease:
+		{
+			handleKeyInputEvent(event);
 			return true;
 		}
 
@@ -268,7 +262,7 @@ bool DisplayWidget::event(QEvent* event)
 
 			if (!m_relative_mouse_enabled)
 			{
-				const qreal dpr = devicePixelRatioF();
+				const qreal dpr = devicePixelRatio();
 				const QPoint mouse_pos = mouse_event->pos();
 
 				const float scaled_x = static_cast<float>(static_cast<qreal>(mouse_pos.x()) * dpr);
@@ -352,11 +346,11 @@ bool DisplayWidget::event(QEvent* event)
 		case QEvent::DevicePixelRatioChange:
 		case QEvent::Resize:
 		{
-			QWidget::event(event);
+			QWindow::event(event);
 
-			const float dpr = devicePixelRatioF();
-			const u32 scaled_width = static_cast<u32>(std::max(static_cast<int>(std::ceil(static_cast<qreal>(width()) * dpr)), 1));
-			const u32 scaled_height = static_cast<u32>(std::max(static_cast<int>(std::ceil(static_cast<qreal>(height()) * dpr)), 1));
+			const float dpr = devicePixelRatio();
+			const u32 scaled_width = static_cast<u32>(std::max(static_cast<int>(std::round(static_cast<qreal>(width()) * dpr)), 1));
+			const u32 scaled_height = static_cast<u32>(std::max(static_cast<int>(std::round(static_cast<qreal>(height()) * dpr)), 1));
 
 			// avoid spamming resize events for paint events (sent on move on windows)
 			if (m_last_window_width != scaled_width || m_last_window_height != scaled_height || m_last_window_scale != dpr)
@@ -371,106 +365,60 @@ bool DisplayWidget::event(QEvent* event)
 			return true;
 		}
 
+		case QEvent::DragEnter:
+			QWindow::event(event);
+			emit dragEnterEvent(static_cast<QDragEnterEvent*>(event));
+			return event->isAccepted();
+
+		case QEvent::Drop:
+			QWindow::event(event);
+			emit dropEvent(static_cast<QDropEvent*>(event));
+			return event->isAccepted();
+
 		case QEvent::Move:
 		{
 			updateCenterPos();
 			return true;
 		}
 
-		case QEvent::Close:
-		{
-			if (m_destroying)
-				return QWidget::event(event);
-
-			handleCloseEvent(static_cast<QCloseEvent*>(event));
-			return true;
-		}
-
-		case QEvent::WindowStateChange:
-		{
-			QWidget::event(event);
-
-			if (static_cast<QWindowStateChangeEvent*>(event)->oldState() & Qt::WindowMinimized)
-				emit windowRestoredEvent();
-
-			return true;
-		}
-
 		default:
-			return QWidget::event(event);
+			return QWindow::event(event);
 	}
 }
 
-DisplayContainer::DisplayContainer()
-	: QStackedWidget(nullptr)
+bool DisplaySurface::eventFilter(QObject* object, QEvent* event)
 {
-}
-
-DisplayContainer::~DisplayContainer() = default;
-
-bool DisplayContainer::isNeeded(bool fullscreen, bool render_to_main)
-{
-#if defined(_WIN32) || defined(__APPLE__)
-	return false;
-#else
-	if (!isRunningOnWayland())
-		return false;
-
-	// We only need this on Wayland because of client-side decorations...
-	return (fullscreen || !render_to_main);
-#endif
-}
-
-bool DisplayContainer::isRunningOnWayland()
-{
-#if defined(_WIN32) || defined(__APPLE__)
-	return false;
-#else
-	const QString platform_name = QGuiApplication::platformName();
-	return (platform_name == QStringLiteral("wayland"));
-#endif
-}
-
-void DisplayContainer::setDisplayWidget(DisplayWidget* widget)
-{
-	pxAssert(!m_display_widget);
-	m_display_widget = widget;
-	addWidget(widget);
-}
-
-DisplayWidget* DisplayContainer::removeDisplayWidget()
-{
-	DisplayWidget* widget = m_display_widget;
-	pxAssert(widget);
-	m_display_widget = nullptr;
-	removeWidget(widget);
-	return widget;
-}
-
-bool DisplayContainer::event(QEvent* event)
-{
-	if (event->type() == QEvent::Close && m_display_widget)
-	{
-		m_display_widget->handleCloseEvent(static_cast<QCloseEvent*>(event));
-		return true;
-	}
-
-	const bool res = QStackedWidget::event(event);
-	if (!m_display_widget)
-		return res;
-
 	switch (event->type())
 	{
+		case QEvent::KeyPress:
+		case QEvent::KeyRelease:
+#ifdef _WIN32
+			// Nvidia overlay causes the child window to lose focus, but not its parent.
+			// Refocus the child window.
+			requestActivate();
+#endif
+			handleKeyInputEvent(event);
+			return true;
+
+		// These events only work on the top level control.
+		// Which is this container when render to seperate or fullscreen is active.
+		case QEvent::Close:
+			handleCloseEvent(static_cast<QCloseEvent*>(event));
+			return true;
 		case QEvent::WindowStateChange:
-		{
 			if (static_cast<QWindowStateChangeEvent*>(event)->oldState() & Qt::WindowMinimized)
-				emit m_display_widget->windowRestoredEvent();
-		}
-		break;
+				emit windowRestoredEvent();
+			return false;
+
+		case QEvent::ChildRemoved:
+			if (static_cast<QChildEvent*>(event)->child() == m_container)
+			{
+				object->removeEventFilter(this);
+				m_container = nullptr;
+			}
+			return false;
 
 		default:
-			break;
+			return false;
 	}
-
-	return res;
 }

pcsx2-qt/DisplayWidget.h

@@ -3,40 +3,44 @@
 
 #pragma once
 #include "common/WindowInfo.h"
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QWidget>
+#include <QtGui/QDragMoveEvent>
+#include <QtGui/QWindow>
 #include <optional>
 #include <vector>
 
 class QCloseEvent;
 
-class DisplayWidget final : public QWidget
+class DisplaySurface final : public QWindow
 {
 	Q_OBJECT
 
 public:
-	explicit DisplayWidget(QWidget* parent);
-	~DisplayWidget();
+	explicit DisplaySurface();
+	~DisplaySurface();
 
-	QPaintEngine* paintEngine() const override;
-
-	int scaledWindowWidth() const;
-	int scaledWindowHeight() const;
+	// while QWindow can be used directly as a window, Popups requre a QWidget parent.
+	// Additionally, we use saveGeometry/restoreGeometry for render to seperate window mode
+	// but those functions only exist on QWidget.
+	// Thus, we always need a container widget.
+	QWidget* createWindowContainer(QWidget* parent = nullptr);
 
 	std::optional<WindowInfo> getWindowInfo();
 
 	void updateRelativeMode(bool enabled);
 	void updateCursor(bool hidden);
 
-	void handleCloseEvent(QCloseEvent* event);
-	void destroy();
-
 Q_SIGNALS:
 	void windowResizedEvent(int width, int height, float scale);
 	void windowRestoredEvent();
 
+	void dragEnterEvent(QDragEnterEvent* event);
+	void dropEvent(QDropEvent* event);
+
 protected:
+	void handleCloseEvent(QCloseEvent* event);
+	void handleKeyInputEvent(QEvent* event);
 	bool event(QEvent* event) override;
+	bool eventFilter(QObject* object, QEvent* event) override;
 
 private:
 	bool isActuallyFullscreen() const;
@@ -49,34 +53,12 @@ private:
 	bool m_clip_mouse_enabled = false;
 #endif
 	bool m_cursor_hidden = false;
-	bool m_destroying = false;
 
 	std::vector<int> m_keys_pressed_with_modifiers;
 
 	u32 m_last_window_width = 0;
 	u32 m_last_window_height = 0;
 	float m_last_window_scale = 1.0f;
-};
-
-class DisplayContainer final : public QStackedWidget
-{
-	Q_OBJECT
-
-public:
-	DisplayContainer();
-	~DisplayContainer();
-
-	// Wayland is broken in lots of ways, so we need to check for it.
-	static bool isRunningOnWayland();
-
-	static bool isNeeded(bool fullscreen, bool render_to_main);
-
-	void setDisplayWidget(DisplayWidget* widget);
-	DisplayWidget* removeDisplayWidget();
-
-protected:
-	bool event(QEvent* event) override;
-
-private:
-	DisplayWidget* m_display_widget = nullptr;
+
+	QWidget* m_container = nullptr;
 };

pcsx2-qt/GameList/EmptyGameListWidget.ui

@@ -14,7 +14,7 @@
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -30,7 +30,7 @@
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;No games in supported formats were found.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Please add a directory with games to begin.&lt;/p&gt;&lt;p&gt;Game dumps in the following formats will be scanned and listed:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignmentFlag::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -40,7 +40,7 @@
       <string notr="true">TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignmentFlag::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -49,7 +49,7 @@
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -69,7 +69,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -86,7 +86,7 @@
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -106,7 +106,7 @@
      <item>
       <spacer name="horizontalSpacer_4">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -121,7 +121,7 @@
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -133,6 +133,10 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>addGameDirectory</tabstop>
+  <tabstop>scanForNewGames</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

pcsx2-qt/GameList/GameListModel.cpp

@@ -23,53 +23,14 @@ static constexpr std::array<const char*, GameListModel::Column_Count> s_column_n
 static constexpr int COVER_ART_WIDTH = 350;
 static constexpr int COVER_ART_HEIGHT = 512;
 static constexpr int COVER_ART_SPACING = 32;
+
+// Scaling these is not a linear transform due to float conversions; add them together here.
+static constexpr int SIZE_HINT_WIDTH = COVER_ART_WIDTH + (COVER_ART_SPACING / 2);
+static constexpr int SIZE_HINT_HEIGHT = COVER_ART_HEIGHT + (COVER_ART_SPACING / 2);
+static constexpr int SIZE_HINT_HEIGHT_TITLES = SIZE_HINT_HEIGHT + COVER_ART_SPACING;
+
 static constexpr int MIN_COVER_CACHE_SIZE = 256;
 
-static int DPRScale(int size, qreal dpr)
-{
-	return static_cast<int>(static_cast<qreal>(size) * dpr);
-}
-
-static int DPRUnscale(int size, qreal dpr)
-{
-	return static_cast<int>(static_cast<qreal>(size) / dpr);
-}
-
-static void resizeAndPadPixmap(QPixmap* pm, int expected_width, int expected_height, qreal dpr)
-{
-	const int dpr_expected_width = DPRScale(expected_width, dpr);
-	const int dpr_expected_height = DPRScale(expected_height, dpr);
-	if (pm->width() == dpr_expected_width && pm->height() == dpr_expected_height)
-		return;
-
-	*pm = pm->scaled(dpr_expected_width, dpr_expected_height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-	if (pm->width() == dpr_expected_width && pm->height() == dpr_expected_height)
-		return;
-
-	// QPainter works in unscaled coordinates.
-	int xoffs = 0;
-	int yoffs = 0;
-	if (pm->width() < dpr_expected_width)
-		xoffs = DPRUnscale((dpr_expected_width - pm->width()) / 2, dpr);
-	if (pm->height() < dpr_expected_height)
-		yoffs = DPRUnscale((dpr_expected_height - pm->height()) / 2, dpr);
-
-	QPixmap padded_image(dpr_expected_width, dpr_expected_height);
-	padded_image.setDevicePixelRatio(dpr);
-	padded_image.fill(Qt::transparent);
-	QPainter painter;
-	if (painter.begin(&padded_image))
-	{
-		painter.setCompositionMode(QPainter::CompositionMode_Source);
-		painter.drawPixmap(xoffs, yoffs, *pm);
-		painter.setCompositionMode(QPainter::CompositionMode_Destination);
-		painter.fillRect(padded_image.rect(), QColor(0, 0, 0, 0));
-		painter.end();
-	}
-
-	*pm = padded_image;
-}
-
 static QPixmap createPlaceholderImage(const QPixmap& placeholder_pixmap, int width, int height, float scale,
 	qreal dpr, const std::string& title)
 {
@@ -78,7 +39,7 @@ static QPixmap createPlaceholderImage(const QPixmap& placeholder_pixmap, int wid
 	if (pm.isNull())
 		return QPixmap();
 
-	resizeAndPadPixmap(&pm, width, height, dpr);
+	QtUtils::resizeAndScalePixmap(&pm, width, height, dpr, QtUtils::ScalingMode::Fit, 100);
 	QPainter painter;
 	if (painter.begin(&pm))
 	{
@@ -96,9 +57,9 @@ static QPixmap createPlaceholderImage(const QPixmap& placeholder_pixmap, int wid
 	return pm;
 }
 
-std::optional<GameListModel::Column> GameListModel::getColumnIdForName(std::string_view name)
+std::optional<GameListModel::Column> GameListModel::getColumnIdForName(const std::string_view name)
 {
-	for (int column = 0; column < Column_Count; column++)
+	for (u32 column = 0; column < Column_Count; column++)
 	{
 		if (name == s_column_names[column])
 			return static_cast<Column>(column);
@@ -107,12 +68,12 @@ std::optional<GameListModel::Column> GameListModel::getColumnIdForName(std::stri
 	return std::nullopt;
 }
 
-const char* GameListModel::getColumnName(Column col)
+const char* GameListModel::getColumnName(const Column col)
 {
 	return s_column_names[static_cast<int>(col)];
 }
 
-GameListModel::GameListModel(float cover_scale, bool show_cover_titles, qreal dpr, QObject* parent /* = nullptr */)
+GameListModel::GameListModel(const float cover_scale, const bool show_cover_titles, const qreal dpr, QObject* parent /* = nullptr */)
 	: QAbstractTableModel(parent)
 	, m_show_titles_for_covers(show_cover_titles)
 	, m_dpr{dpr}
@@ -175,29 +136,31 @@ void GameListModel::loadOrGenerateCover(const GameList::Entry* ge)
 
 	QFuture<QPixmap> future = QtConcurrent::run([this, entry = *ge, counter]() -> QPixmap {
 		QPixmap image;
+
+		// Initial check that the scale is unchanged before we run costly image generation.
 		if (m_cover_scale_counter.load(std::memory_order_acquire) == counter)
 		{
 			const std::string cover_path(GameList::GetCoverImagePathForEntry(&entry));
 			if (!cover_path.empty())
-			{
 				image = QPixmap(QString::fromStdString(cover_path));
-				if (!image.isNull())
-				{
-					image.setDevicePixelRatio(m_dpr);
-					resizeAndPadPixmap(&image, getCoverArtWidth(), getCoverArtHeight(), m_dpr);
-				}
+
+			// Create placeholder image if no user-provided cover exists.
+			if (image.isNull())
+			{
+				const std::string& title = entry.GetTitle(m_prefer_english_titles);
+				image = createPlaceholderImage(m_placeholder_pixmap, getCoverArtWidth(), getCoverArtHeight(), m_cover_scale, m_dpr, title);
+			}
+			// Create resized image from user-provided cover.
+			else
+			{
+				image.setDevicePixelRatio(m_dpr);
+				QtUtils::resizeAndScalePixmap(&image, getCoverArtWidth(), getCoverArtHeight(), m_dpr, QtUtils::ScalingMode::Fit, 100);
 			}
 		}
 
-		const std::string& title = entry.GetTitle(m_prefer_english_titles);
+		// Final check that scale is unchanged before we send out the produced image.
+		return m_cover_scale_counter.load(std::memory_order_acquire) == counter ? image : QPixmap();
 
-		if (image.isNull())
-			image = createPlaceholderImage(m_placeholder_pixmap, getCoverArtWidth(), getCoverArtHeight(), m_cover_scale, m_dpr, title);
-
-		if (m_cover_scale_counter.load(std::memory_order_acquire) != counter)
-			image = {};
-
-		return image;
 	});
 
 	// Context must be 'this' so we run on the UI thread.
@@ -213,25 +176,18 @@ void GameListModel::loadOrGenerateCover(const GameList::Entry* ge)
 void GameListModel::invalidateCoverForPath(const std::string& path)
 {
 	// This isn't ideal, but not sure how else we can get the row, when it might change while scanning...
-	auto lock = GameList::GetLock();
+	const auto lock = GameList::GetLock();
 	const u32 count = GameList::GetEntryCount();
-	std::optional<u32> row;
-	for (u32 i = 0; i < count; i++)
+
+	for (u32 row = 0; row < count; row++)
 	{
-		if (GameList::GetEntryByIndex(i)->path == path)
+		if (GameList::GetEntryByIndex(row)->path == path)
 		{
-			row = i;
-			break;
+			const QModelIndex mi(index(row, Column_Cover));
+			emit dataChanged(mi, mi, {Qt::DecorationRole});
+			return;
 		}
 	}
-	if (!row.has_value())
-	{
-		// Game removed?
-		return;
-	}
-
-	const QModelIndex mi(index(static_cast<int>(row.value()), Column_Cover));
-	emit dataChanged(mi, mi, {Qt::DecorationRole});
 }
 
 int GameListModel::getCoverArtWidth() const
@@ -251,45 +207,43 @@ int GameListModel::getCoverArtSpacing() const
 
 int GameListModel::rowCount(const QModelIndex& parent) const
 {
-	if (parent.isValid())
-		return 0;
-
-	return static_cast<int>(GameList::GetEntryCount());
+	return parent.isValid() ? 0 : static_cast<int>(GameList::GetEntryCount());
 }
 
 int GameListModel::columnCount(const QModelIndex& parent) const
 {
-	if (parent.isValid())
-		return 0;
-
-	return Column_Count;
+	return parent.isValid() ? 0 : Column_Count;
 }
 
-QString GameListModel::formatTimespan(time_t timespan)
+QString GameListModel::formatTimespan(const time_t timespan)
 {
-	// avoid an extra string conversion
+	// Avoid an extra string conversion over calling QString::fromStdString(GameList::FormatTimespan).
 	const u32 hours = static_cast<u32>(timespan / 3600);
-	const u32 minutes = static_cast<u32>((timespan % 3600) / 60);
 	if (hours > 0)
 		return qApp->translate("GameList", "%n hours", "", hours);
-	else
+	
+	const u32 minutes = static_cast<u32>((timespan % 3600) / 60);
+	if (minutes > 0)
 		return qApp->translate("GameList", "%n minutes", "", minutes);
+	else
+		return qApp->translate("GameList", "%n seconds", "", static_cast<u32>((timespan % 3600) % 60));
 }
 
-QVariant GameListModel::data(const QModelIndex& index, int role) const
+QVariant GameListModel::data(const QModelIndex& index, const int role) const
 {
 	if (!index.isValid())
-		return {};
+		return QVariant();
 
 	const int row = index.row();
 	if (row < 0 || row >= static_cast<int>(GameList::GetEntryCount()))
-		return {};
+		return QVariant();
 
 	const auto lock = GameList::GetLock();
 	const GameList::Entry* ge = GameList::GetEntryByIndex(row);
 	if (!ge)
-		return {};
+		return QVariant();
 
+	// See: https://doc.qt.io/qt-6/qt.html#ItemDataRole-enum
 	switch (role)
 	{
 		case Qt::DisplayRole:
@@ -309,12 +263,7 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
 					return QString::fromStdString(fmt::format("{:08X}", ge->crc));
 
 				case Column_TimePlayed:
-				{
-					if (ge->total_played_time == 0)
-						return {};
-					else
-						return formatTimespan(ge->total_played_time);
-				}
+					return ge->total_played_time ? formatTimespan(ge->total_played_time) : QVariant();
 
 				case Column_LastPlayed:
 					return QString::fromStdString(GameList::FormatTimestamp(ge->last_played_time));
@@ -323,55 +272,10 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
 					return QString("%1 MB").arg(static_cast<double>(ge->total_size) / 1048576.0, 0, 'f', 2);
 
 				case Column_Cover:
-				{
-					if (m_show_titles_for_covers)
-						return QString::fromStdString(ge->GetTitle(m_prefer_english_titles));
-					else
-						return {};
-				}
+					return m_show_titles_for_covers ? QString::fromStdString(ge->GetTitle(m_prefer_english_titles)) : QVariant();
 
 				default:
-					return {};
-			}
-		}
-
-		case Qt::InitialSortOrderRole:
-		{
-			switch (index.column())
-			{
-				case Column_Type:
-					return static_cast<int>(ge->type);
-
-				case Column_Serial:
-					return QString::fromStdString(ge->serial);
-
-				case Column_Title:
-				case Column_Cover:
-					return QString::fromStdString(ge->GetTitleSort(m_prefer_english_titles));
-
-				case Column_FileTitle:
-					return QtUtils::StringViewToQString(Path::GetFileTitle(ge->path));
-
-				case Column_CRC:
-					return static_cast<int>(ge->crc);
-
-				case Column_TimePlayed:
-					return static_cast<qlonglong>(ge->total_played_time);
-
-				case Column_LastPlayed:
-					return static_cast<qlonglong>(ge->last_played_time);
-
-				case Column_Region:
-					return static_cast<int>(ge->region);
-
-				case Column_Compatibility:
-					return static_cast<int>(ge->compatibility_rating);
-
-				case Column_Size:
-					return static_cast<qulonglong>(ge->total_size);
-
-				default:
-					return {};
+					return QVariant();
 			}
 		}
 
@@ -380,22 +284,16 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
 			switch (index.column())
 			{
 				case Column_Type:
-				{
 					return m_type_pixmaps[static_cast<u32>(ge->type)];
-				}
 
 				case Column_Region:
-				{
 					return m_region_pixmaps[static_cast<u32>(ge->region)];
-				}
 
 				case Column_Compatibility:
-				{
 					return m_compatibility_pixmaps[static_cast<u32>(
 						(static_cast<u32>(ge->compatibility_rating) >= GameList::CompatibilityRatingCount) ?
 							GameList::CompatibilityRating::Unknown :
 							ge->compatibility_rating)];
-				}
 
 				case Column_Cover:
 				{
@@ -403,27 +301,38 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
 					if (pm)
 						return *pm;
 
-					// We insert the placeholder into the cache, so that we don't repeatedly
-					// queue loading jobs for this game.
+					// Insert the placeholder into the cache so we don't repeatedly queue loading jobs for this game.
 					const_cast<GameListModel*>(this)->loadOrGenerateCover(ge);
 					return *m_cover_pixmap_cache.Insert(ge->path, m_loading_pixmap);
 				}
-				break;
 
 				default:
-					return {};
+					return QVariant();
 			}
-
-			default:
-				return {};
 		}
+
+		case Qt::SizeHintRole:
+		{
+			switch (index.column())
+			{
+				case Column_Cover:
+					return QSize(static_cast<int>(static_cast<float>(SIZE_HINT_WIDTH) * m_cover_scale),
+						static_cast<int>(static_cast<float>(m_show_titles_for_covers ? SIZE_HINT_HEIGHT_TITLES : SIZE_HINT_HEIGHT) * m_cover_scale));
+
+				default:
+					return QVariant();
+			}
+		}
+
+		default:
+			return QVariant();
 	}
 }
 
-QVariant GameListModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant GameListModel::headerData(const int section, const Qt::Orientation orientation, const int role) const
 {
 	if (orientation != Qt::Horizontal || role != Qt::DisplayRole || section < 0 || section >= Column_Count)
-		return {};
+		return QVariant();
 
 	return m_column_display_names[section];
 }
@@ -435,7 +344,7 @@ void GameListModel::refresh()
 	endResetModel();
 }
 
-bool GameListModel::titlesLessThan(int left_row, int right_row) const
+bool GameListModel::titlesLessThan(const int left_row, const int right_row) const
 {
 	if (left_row < 0 || left_row >= static_cast<int>(GameList::GetEntryCount()) || right_row < 0 ||
 		right_row >= static_cast<int>(GameList::GetEntryCount()))
@@ -449,7 +358,7 @@ bool GameListModel::titlesLessThan(int left_row, int right_row) const
 			   QString::fromStdString(right->GetTitleSort(m_prefer_english_titles))) < 0;
 }
 
-bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& right_index, int column) const
+bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& right_index, const int column) const
 {
 	if (!left_index.isValid() || !right_index.isValid())
 		return false;
@@ -482,13 +391,12 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r
 		{
 			if (left->serial == right->serial)
 				return titlesLessThan(left_row, right_row);
+
 			return (StringUtil::Strcasecmp(left->serial.c_str(), right->serial.c_str()) < 0);
 		}
 
 		case Column_Title:
-		{
 			return titlesLessThan(left_row, right_row);
-		}
 
 		case Column_FileTitle:
 		{
@@ -505,6 +413,7 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r
 		{
 			if (left->region == right->region)
 				return titlesLessThan(left_row, right_row);
+
 			return (static_cast<int>(left->region) < static_cast<int>(right->region));
 		}
 
@@ -558,7 +467,7 @@ void GameListModel::loadSettings()
 	m_prefer_english_titles = Host::GetBaseBoolSettingValue("UI", "PreferEnglishGameList", false);
 }
 
-QIcon GameListModel::getIconForType(GameList::EntryType type)
+QIcon GameListModel::getIconForType(const GameList::EntryType type)
 {
 	switch (type)
 	{
@@ -572,7 +481,7 @@ QIcon GameListModel::getIconForType(GameList::EntryType type)
 	}
 }
 
-QIcon GameListModel::getIconForRegion(GameList::Region region)
+QIcon GameListModel::getIconForRegion(const GameList::Region region)
 {
 	return QIcon(
 		QStringLiteral("%1/icons/flags/%2.svg").arg(QtHost::GetResourcesBasePath()).arg(GameList::RegionToString(region, false)));
@@ -583,8 +492,8 @@ void GameListModel::loadThemeSpecificImages()
 	for (u32 type = 0; type < static_cast<u32>(GameList::EntryType::Count); type++)
 		m_type_pixmaps[type] = getIconForType(static_cast<GameList::EntryType>(type)).pixmap(QSize(24, 24), m_dpr);
 
-	for (u32 i = 0; i < static_cast<u32>(GameList::Region::Count); i++)
-		m_region_pixmaps[i] = getIconForRegion(static_cast<GameList::Region>(i)).pixmap(QSize(36, 26), m_dpr);
+	for (u32 region = 0; region < static_cast<u32>(GameList::Region::Count); region++)
+		m_region_pixmaps[region] = getIconForRegion(static_cast<GameList::Region>(region)).pixmap(QSize(36, 26), m_dpr);
 }
 
 void GameListModel::loadCommonImages()
@@ -592,8 +501,8 @@ void GameListModel::loadCommonImages()
 	loadThemeSpecificImages();
 
 	const QString base_path(QtHost::GetResourcesBasePath());
-	for (u32 i = 1; i < GameList::CompatibilityRatingCount; i++)
-		m_compatibility_pixmaps[i] = QIcon((QStringLiteral("%1/icons/star-%2.svg").arg(base_path).arg(i - 1))).pixmap(QSize(88, 16), m_dpr);
+	for (u32 rating = 1; rating < GameList::CompatibilityRatingCount; rating++)
+		m_compatibility_pixmaps[rating] = QIcon((QStringLiteral("%1/icons/star-%2.svg").arg(base_path).arg(rating - 1))).pixmap(QSize(88, 16), m_dpr);
 
 	m_placeholder_pixmap.load(QStringLiteral("%1/cover-placeholder.png").arg(base_path));
 }

pcsx2-qt/GameList/GameListModel.h

@@ -84,7 +84,7 @@ private:
 	void loadOrGenerateCover(const GameList::Entry* ge);
 	void invalidateCoverForPath(const std::string& path);
 
-	static QString formatTimespan(time_t timespan);
+	static QString formatTimespan(const time_t timespan);
 
 	float m_cover_scale = 0.0f;
 	std::atomic<u32> m_cover_scale_counter{0};

pcsx2-qt/GameList/GameListRefreshThread.cpp

@@ -4,14 +4,17 @@
 #include "GameListRefreshThread.h"
 
 #include "pcsx2/GameList.h"
+#include "pcsx2/Host.h"
 
+#include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/ProgressCallback.h"
-#include "common/Timer.h"
 
 #include <QtWidgets/QMessageBox>
 
-AsyncRefreshProgressCallback::AsyncRefreshProgressCallback(GameListRefreshThread* parent)
+AsyncRefreshProgressCallback::AsyncRefreshProgressCallback(bool popup_on_error, GameListRefreshThread* parent)
 	: m_parent(parent)
+	, m_popup_on_error(popup_on_error)
 {
 }
 
@@ -57,17 +60,20 @@ void AsyncRefreshProgressCallback::SetTitle(const char* title)
 
 void AsyncRefreshProgressCallback::DisplayError(const char* message)
 {
-	QMessageBox::critical(nullptr, QStringLiteral("Error"), QString::fromUtf8(message));
+	if (m_popup_on_error)
+		Host::ReportErrorAsync(TRANSLATE_SV("GameListRefreshThread", "Error"), message);
+	else
+		ERROR_LOG("{}", message);
 }
 
 void AsyncRefreshProgressCallback::DisplayWarning(const char* message)
 {
-	QMessageBox::warning(nullptr, QStringLiteral("Warning"), QString::fromUtf8(message));
+	pxFailRel("Not implemented.");
 }
 
 void AsyncRefreshProgressCallback::DisplayInformation(const char* message)
 {
-	QMessageBox::information(nullptr, QStringLiteral("Information"), QString::fromUtf8(message));
+	pxFailRel("Not implemented.");
 }
 
 void AsyncRefreshProgressCallback::DisplayDebugMessage(const char* message)
@@ -77,17 +83,18 @@ void AsyncRefreshProgressCallback::DisplayDebugMessage(const char* message)
 
 void AsyncRefreshProgressCallback::ModalError(const char* message)
 {
-	QMessageBox::critical(nullptr, QStringLiteral("Error"), QString::fromUtf8(message));
+	pxFailRel("Not implemented.");
 }
 
 bool AsyncRefreshProgressCallback::ModalConfirmation(const char* message)
 {
-	return QMessageBox::question(nullptr, QStringLiteral("Question"), QString::fromUtf8(message)) == QMessageBox::Yes;
+	pxFailRel("Not implemented.");
+	return false;
 }
 
 void AsyncRefreshProgressCallback::ModalInformation(const char* message)
 {
-	QMessageBox::information(nullptr, QStringLiteral("Information"), QString::fromUtf8(message));
+	pxFailRel("Not implemented.");
 }
 
 void AsyncRefreshProgressCallback::fireUpdate()
@@ -95,9 +102,9 @@ void AsyncRefreshProgressCallback::fireUpdate()
 	m_parent->refreshProgress(m_status_text, m_last_value, m_last_range);
 }
 
-GameListRefreshThread::GameListRefreshThread(bool invalidate_cache)
+GameListRefreshThread::GameListRefreshThread(bool invalidate_cache, bool popup_on_error)
 	: QThread()
-	, m_progress(this)
+	, m_progress(popup_on_error, this)
 	, m_invalidate_cache(invalidate_cache)
 {
 }

pcsx2-qt/GameList/GameListRefreshThread.h

@@ -14,7 +14,7 @@ class GameListRefreshThread;
 class AsyncRefreshProgressCallback : public BaseProgressCallback
 {
 public:
-	AsyncRefreshProgressCallback(GameListRefreshThread* parent);
+	AsyncRefreshProgressCallback(bool popup_on_error, GameListRefreshThread* parent);
 
 	void Cancel();
 
@@ -38,6 +38,7 @@ private:
 	QString m_status_text;
 	int m_last_range = 1;
 	int m_last_value = 0;
+	bool m_popup_on_error = false;
 };
 
 class GameListRefreshThread final : public QThread
@@ -45,7 +46,7 @@ class GameListRefreshThread final : public QThread
 	Q_OBJECT
 
 public:
-	GameListRefreshThread(bool invalidate_cache);
+	GameListRefreshThread(bool invalidate_cache, bool popup_on_error);
 	~GameListRefreshThread();
 
 	void cancel();
@@ -60,4 +61,5 @@ protected:
 private:
 	AsyncRefreshProgressCallback m_progress;
 	bool m_invalidate_cache;
+	bool m_popup_on_error;
 };

pcsx2-qt/GameList/GameListWidget.cpp

@@ -7,6 +7,7 @@
 #include "QtHost.h"
 #include "QtUtils.h"
 
+#include "Settings/InterfaceSettingsWidget.h"
 #include "pcsx2/GameList.h"
 #include "pcsx2/Host.h"
 
@@ -44,6 +45,25 @@ static const char* SUPPORTED_FORMATS_STRING = QT_TRANSLATE_NOOP(GameListWidget,
 static constexpr float MIN_SCALE = 0.1f;
 static constexpr float MAX_SCALE = 2.0f;
 
+static constexpr GameListModel::Column DEFAULT_SORT_COLUMN = GameListModel::Column_Title;
+static constexpr int DEFAULT_SORT_INDEX = static_cast<int>(DEFAULT_SORT_COLUMN);
+static constexpr Qt::SortOrder DEFAULT_SORT_ORDER = Qt::AscendingOrder;
+
+static constexpr std::array<int, GameListModel::Column_Count> DEFAULT_COLUMN_WIDTHS = {{
+	55, // type
+	85, // code
+	-1, // title
+	-1, // file title
+	75, // crc
+	95, // time played
+	90, // last played
+	80, // size
+	60, // region
+	120 // compatibility
+}};
+static_assert(static_cast<int>(DEFAULT_COLUMN_WIDTHS.size()) <= GameListModel::Column_Count,
+	"Game List: More default column widths than column types.");
+
 class GameListSortModel final : public QSortFilterProxyModel
 {
 public:
@@ -55,18 +75,21 @@ public:
 
 	void setFilterType(GameList::EntryType type)
 	{
+		beginFilterChange();
 		m_filter_type = type;
-		invalidateRowsFilter();
+		endFilterChange(Direction::Rows);
 	}
 	void setFilterRegion(GameList::Region region)
 	{
+		beginFilterChange();
 		m_filter_region = region;
-		invalidateRowsFilter();
+		endFilterChange(Direction::Rows);
 	}
 	void setFilterName(const QString& name)
 	{
+		beginFilterChange();
 		m_filter_name = name;
-		invalidateRowsFilter();
+		endFilterChange(Direction::Rows);
 	}
 
 	bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override
@@ -106,6 +129,7 @@ private:
 
 namespace
 {
+	// Used for Type, Region, and Compatibility columns to center icons; Qt::AlignCenter only works on DisplayRole (text).
 	class GameListIconStyleDelegate final : public QStyledItemDelegate
 	{
 	public:
@@ -115,58 +139,61 @@ namespace
 		}
 		~GameListIconStyleDelegate() = default;
 
+		// See: QStyledItemDelegate::paint(), QItemDelegate::drawDecoration(), and Qt::QStyleOptionViewItem.
 		void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override
 		{
-			// https://stackoverflow.com/questions/32216568/how-to-set-icon-center-in-qtableview
 			Q_ASSERT(index.isValid());
 
-			// Draw the base item, with a blank icon
-			QStyleOptionViewItem opt = option;
-			initStyleOption(&opt, index);
-			opt.icon = QIcon();
-			// Based on QStyledItemDelegate::paint()
-			const QStyle* style = option.widget ? option.widget->style() : QApplication::style();
-			style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, option.widget);
+			// Draw highlight for cell.
+			QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &option, painter, option.widget);
 
-			// Fetch icon pixmap
-			const QRect r = option.rect;
-			const QPixmap pix = qvariant_cast<QPixmap>(index.data(Qt::DecorationRole));
-			const int pix_width = static_cast<int>(pix.width() / pix.devicePixelRatio());
-			const int pix_height = static_cast<int>(pix.height() / pix.devicePixelRatio());
+			// Fetch icon pixmap and stop if no icon exists
+			const QPixmap icon = qvariant_cast<QPixmap>(index.data(Qt::DecorationRole));
 
-			// Clip the pixmaps so they don't extend outside the column
+			if (icon.isNull())
+				return;
+
+			// Save painter state and restore later so clip setting doesn't persist across cell draws.
 			painter->save();
-			painter->setClipRect(option.rect);
 
-			// Draw the icon, using code derived from QItemDelegate::drawDecoration()
-			const bool enabled = option.state & QStyle::State_Enabled;
-			const QPoint p = QPoint((r.width() - pix_width) / 2, (r.height() - pix_height) / 2);
+			// Clip pixmap so it doesn't extend outside the cell.
+			const QRect rect = option.rect;
+			painter->setClipRect(rect);
+
+			// Determine starting location of icon (Qt uses top-left origin).
+			const int icon_width = static_cast<int>(static_cast<qreal>(icon.width()) / icon.devicePixelRatio());
+			const int icon_height = static_cast<int>(static_cast<qreal>(icon.height()) / icon.devicePixelRatio());
+			const QPoint icon_top_left = QPoint((rect.width() - icon_width) / 2, (rect.height() - icon_height) / 2);
+
+			// Change palette if the item is selected.
 			if (option.state & QStyle::State_Selected)
 			{
-				// See QItemDelegate::selectedPixmap()
+				// Set color based on whether cell is enabled.
+				const bool enabled = option.state & QStyle::State_Enabled;
 				QColor color = option.palette.color(enabled ? QPalette::Normal : QPalette::Disabled, QPalette::Highlight);
 				color.setAlphaF(0.3f);
 
-				QString key = QString::fromStdString(fmt::format("{:016X}-{:d}-{:08X}", pix.cacheKey(), enabled, color.rgba()));
-				QPixmap pm;
-				if (!QPixmapCache::find(key, &pm))
+				// Fetch pixmap from cache or construct a new one.
+				const QString key = QString::fromStdString(fmt::format("{:016X}-{:d}-{:08X}", icon.cacheKey(), enabled, color.rgba()));
+				QPixmap highlighted_icon;
+				if (!QPixmapCache::find(key, &highlighted_icon))
 				{
-					QImage img = pix.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
+					QImage img = icon.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
 					QPainter tinted_painter(&img);
 					tinted_painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
 					tinted_painter.fillRect(0, 0, img.width(), img.height(), color);
 					tinted_painter.end();
 
-					pm = QPixmap(QPixmap::fromImage(img));
-					QPixmapCache::insert(key, pm);
+					highlighted_icon = QPixmap(QPixmap::fromImage(img));
+					QPixmapCache::insert(key, highlighted_icon);
 				}
 
-				painter->drawPixmap(r.topLeft() + p, pm);
+				painter->drawPixmap(rect.topLeft() + icon_top_left, highlighted_icon);
 			}
 			else
 			{
-				painter->drawPixmap(r.topLeft() + p, pix);
+				painter->drawPixmap(rect.topLeft() + icon_top_left, icon);
 			}
 
 			// Restore the old clip path.
@@ -230,33 +257,46 @@ void GameListWidget::initialize()
 	m_table_view = new QTableView(m_ui.stack);
 	m_table_view->setModel(m_sort_model);
 	m_table_view->setSortingEnabled(true);
+	m_table_view->horizontalHeader()->setSectionsMovable(true);
 	m_table_view->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_table_view->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_table_view->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_table_view->setAlternatingRowColors(true);
 	m_table_view->setMouseTracking(true);
 	m_table_view->setShowGrid(false);
-	m_table_view->setCurrentIndex({});
+	m_table_view->setCurrentIndex(QModelIndex());
 	m_table_view->horizontalHeader()->setHighlightSections(false);
 	m_table_view->horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_table_view->verticalHeader()->hide();
 	m_table_view->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
+
+	// Custom painter to center-align DisplayRoles (icons)
 	m_table_view->setItemDelegateForColumn(0, new GameListIconStyleDelegate(this));
 	m_table_view->setItemDelegateForColumn(8, new GameListIconStyleDelegate(this));
 	m_table_view->setItemDelegateForColumn(9, new GameListIconStyleDelegate(this));
 
-	loadTableViewColumnVisibilitySettings();
-	loadTableViewColumnSortSettings();
-
 	connect(m_table_view->selectionModel(), &QItemSelectionModel::currentChanged, this,
 		&GameListWidget::onSelectionModelCurrentChanged);
 	connect(m_table_view, &QTableView::activated, this, &GameListWidget::onTableViewItemActivated);
 	connect(m_table_view, &QTableView::customContextMenuRequested, this,
 		&GameListWidget::onTableViewContextMenuRequested);
 	connect(m_table_view->horizontalHeader(), &QHeaderView::customContextMenuRequested, this,
-		&GameListWidget::onTableViewHeaderContextMenuRequested);
+			&GameListWidget::onTableViewHeaderContextMenuRequested);
+
+	// Save state when header state changes (hiding and showing handled within onTableViewHeaderContextMenuRequested).
+	connect(m_table_view->horizontalHeader(), &QHeaderView::sectionMoved, this, &GameListWidget::onTableHeaderStateChanged);
+	connect(m_table_view->horizontalHeader(), &QHeaderView::sectionResized, this, &GameListWidget::onTableHeaderStateChanged);
 	connect(m_table_view->horizontalHeader(), &QHeaderView::sortIndicatorChanged, this,
-		&GameListWidget::onTableViewHeaderSortIndicatorChanged);
+		[this](const int column, const Qt::SortOrder sort_order) { GameListWidget::saveSortSettings(column, sort_order); GameListWidget::onTableHeaderStateChanged(); });
+
+	// Load the last session's header state or create a new one.
+	if (Host::ContainsBaseSettingValue("GameListTableView", "HeaderState"))
+		loadTableHeaderState();
+	else
+		applyTableHeaderDefaults();
+
+	// After header state load to account for user-specified sort.
+	m_table_view->setSortingEnabled(true);
 
 	m_ui.stack->insertWidget(0, m_table_view);
 
@@ -288,7 +328,7 @@ void GameListWidget::initialize()
 	m_empty_ui.setupUi(m_empty_widget);
 	m_empty_ui.supportedFormats->setText(qApp->translate("GameListWidget", SUPPORTED_FORMATS_STRING));
 	connect(m_empty_ui.addGameDirectory, &QPushButton::clicked, this, [this]() { emit addGameDirectoryRequested(); });
-	connect(m_empty_ui.scanForNewGames, &QPushButton::clicked, this, [this]() { refresh(false); });
+	connect(m_empty_ui.scanForNewGames, &QPushButton::clicked, this, [this]() { refresh(false, true); });
 	connect(qApp, &QGuiApplication::applicationStateChanged, this, [this]() { GameListWidget::updateCustomBackgroundState(); });
 	m_ui.stack->insertWidget(2, m_empty_widget);
 
@@ -304,84 +344,30 @@ void GameListWidget::initialize()
 	setCustomBackground();
 }
 
-static void resizeAndPadImage(QImage* image, int expected_width, int expected_height, bool fill_with_top_left, bool expand_to_fill)
+void GameListWidget::setCustomBackground()
 {
-	const qreal dpr = image->devicePixelRatio();
-	const int dpr_expected_width = static_cast<int>(static_cast<qreal>(expected_width) * dpr);
-	const int dpr_expected_height = static_cast<int>(static_cast<qreal>(expected_height) * dpr);
-	if (image->width() == dpr_expected_width && image->height() == dpr_expected_height)
-		return;
-
-	// Resize
-	if (((static_cast<float>(image->width()) / static_cast<float>(image->height())) >=
-		(static_cast<float>(dpr_expected_width) / static_cast<float>(dpr_expected_height))) != expand_to_fill)
-	{
-		*image = image->scaledToWidth(dpr_expected_width, Qt::SmoothTransformation);
-	}
-	else
-	{
-		*image = image->scaledToHeight(dpr_expected_height, Qt::SmoothTransformation);
-	}
-
-	if (image->width() == dpr_expected_width && image->height() == dpr_expected_height)
-		return;
-
-	// Padding
-	int xoffs = 0;
-	int yoffs = 0;
-	const int image_width = image->width();
-	const int image_height = image->height();
-	if ((image_width < dpr_expected_width) != expand_to_fill)
-		xoffs = static_cast<int>(static_cast<qreal>((dpr_expected_width - image_width) / 2) / dpr);
-	if ((image_height < dpr_expected_height) != expand_to_fill)
-		yoffs = static_cast<int>(static_cast<qreal>((dpr_expected_height - image_height) / 2) / dpr);
-
-	QImage padded_image(dpr_expected_width, dpr_expected_height, QImage::Format_ARGB32);
-	padded_image.setDevicePixelRatio(dpr);
-	if (fill_with_top_left)
-		padded_image.fill(image->pixel(0, 0));
-	else
-		padded_image.fill(Qt::transparent);
-
-	// Painting
-	QPainter painter;
-	const float opacity = Host::GetBaseFloatSettingValue("UI", "GameListBackgroundOpacity");
-	if (painter.begin(&padded_image))
-	{
-		painter.setOpacity((static_cast<float>(opacity / 100.0f))); // Qt expects the range to be from 0.0 to 1.0
-		painter.setCompositionMode(QPainter::CompositionMode_Source);
-		painter.drawImage(xoffs, yoffs, *image);
-		painter.end();
-	}
-
-	*image = std::move(padded_image);
-}
-
-void GameListWidget::setCustomBackground(bool force_refresh)
-{
-	std::string path = Host::GetBaseStringSettingValue("UI", "GameListBackgroundPath");
-	bool enabled = Host::GetBaseBoolSettingValue("UI", "GameListBackgroundEnabled");
-	bool fill = Host::GetBaseBoolSettingValue("UI", "GameListBackgroundFill");
-
 	// Cleanup old animation if it still exists on gamelist
 	if (m_background_movie != nullptr)
 	{
+		m_background_movie->disconnect(this);
 		delete m_background_movie;
 		m_background_movie = nullptr;
 	}
 
+	std::string path = Host::GetBaseStringSettingValue("UI", "GameListBackgroundPath");
 	if (!Path::IsAbsolute(path))
 		path = Path::Combine(EmuFolders::DataRoot, path);
 
-	// Only try to create background both if path are valid and custom background are enabled
-	if ((!path.empty() && FileSystem::FileExists(path.c_str())) && enabled)
+	// Only try to create background if path are valid
+	if (!path.empty() && FileSystem::FileExists(path.c_str()))
 	{
 		QMovie* new_movie;
-		if (Path::GetExtension(path) == "png")
+		QString img_path = QString::fromStdString(path);
+		if (img_path.endsWith(".png", Qt::CaseInsensitive))
 			// Use apng plugin
-			new_movie = new QMovie(QString::fromStdString(path), "apng", this);
+			new_movie = new QMovie(img_path, "apng", this);
 		else
-			new_movie = new QMovie(QString::fromStdString(path), QByteArray(), this);
+			new_movie = new QMovie(img_path, QByteArray(), this);
 
 		if (new_movie->isValid())
 			m_background_movie = new_movie;
@@ -392,7 +378,7 @@ void GameListWidget::setCustomBackground(bool force_refresh)
 		}
 	}
 
-	// If there is no valid background then reset fallback to UI state
+	// If there is no valid background then reset fallback to default UI state
 	if (!m_background_movie)
 	{
 		m_ui.stack->setPalette(QApplication::palette());
@@ -400,36 +386,60 @@ void GameListWidget::setCustomBackground(bool force_refresh)
 		return;
 	}
 
-	// Background is valid, connect the signals and start animation in gamelist
-	connect(m_background_movie, &QMovie::frameChanged, this, [this, fill]() { processBackgroundFrames(fill); });
-	updateCustomBackgroundState(force_refresh);
+	// Retrieve scaling setting
+	m_background_scaling = QtUtils::ScalingMode::Fit;
+	const std::string ar_value = Host::GetBaseStringSettingValue("UI", "GameListBackgroundMode", InterfaceSettingsWidget::BACKGROUND_SCALE_NAMES[static_cast<u8>(QtUtils::ScalingMode::Fit)]);
+	for (u8 i = 0; i < static_cast<u8>(QtUtils::ScalingMode::MaxCount); i++)
+	{
+		if (!(InterfaceSettingsWidget::BACKGROUND_SCALE_NAMES[i] == nullptr))
+		{
+			if (ar_value == InterfaceSettingsWidget::BACKGROUND_SCALE_NAMES[i])
+			{
+				m_background_scaling = static_cast<QtUtils::ScalingMode>(i);
+				break;
+			}
+		}
+	}
 
+	// Retrieve opacity setting
+	m_background_opacity = Host::GetBaseFloatSettingValue("UI", "GameListBackgroundOpacity", 100.0f);
+
+	// Selected Custom background is valid, connect the signals and start animation in gamelist
+	connect(m_background_movie, &QMovie::frameChanged, this, &GameListWidget::processBackgroundFrames, Qt::UniqueConnection);
+	updateCustomBackgroundState(true);
 	m_table_view->setAlternatingRowColors(false);
 }
 
-void GameListWidget::updateCustomBackgroundState(bool force_start)
+void GameListWidget::updateCustomBackgroundState(const bool force_start)
 {
-	if (m_background_movie)
+	if (m_background_movie && m_background_movie->isValid())
 	{
 		if ((isVisible() && (isActiveWindow() || force_start)) && qGuiApp->applicationState() == Qt::ApplicationActive)
-			m_background_movie->start();
+			m_background_movie->setPaused(false);
 		else
-			m_background_movie->stop();
+			m_background_movie->setPaused(true);
 	}
 }
 
-void GameListWidget::processBackgroundFrames(bool fill_area)
+void GameListWidget::processBackgroundFrames()
 {
-	QImage img = m_background_movie->currentImage();
-	img.setDevicePixelRatio(devicePixelRatioF());
-	const int widget_width = m_ui.stack->width();
-	const int widget_height = m_ui.stack->height();
+	if (m_background_movie && m_background_movie->isValid())
+	{
+		const int widget_width = m_ui.stack->width();
+		const int widget_height = m_ui.stack->height();
 
-	resizeAndPadImage(&img, widget_width, widget_height, false, fill_area);
+		if (widget_width <= 0 || widget_height <= 0)
+			return;
 
-	QPalette new_palette(m_ui.stack->palette());
-	new_palette.setBrush(QPalette::Base, img);
-	m_ui.stack->setPalette(new_palette);
+		QPixmap pm = m_background_movie->currentPixmap();
+		const qreal dpr = devicePixelRatioF();
+
+		QtUtils::resizeAndScalePixmap(&pm, widget_width, widget_height, dpr, m_background_scaling, m_background_opacity);
+
+		QPalette bg_palette(m_ui.stack->palette());
+		bg_palette.setBrush(QPalette::Base, pm);
+		m_ui.stack->setPalette(bg_palette);
+	}
 }
 
 bool GameListWidget::isShowingGameList() const
@@ -447,11 +457,11 @@ bool GameListWidget::getShowGridCoverTitles() const
 	return m_model->getShowCoverTitles();
 }
 
-void GameListWidget::refresh(bool invalidate_cache)
+void GameListWidget::refresh(bool invalidate_cache, bool popup_on_error)
 {
 	cancelRefresh();
 
-	m_refresh_thread = new GameListRefreshThread(invalidate_cache);
+	m_refresh_thread = new GameListRefreshThread(invalidate_cache, popup_on_error);
 	connect(m_refresh_thread, &GameListRefreshThread::refreshProgress, this, &GameListWidget::onRefreshProgress,
 		Qt::QueuedConnection);
 	connect(m_refresh_thread, &GameListRefreshThread::refreshComplete, this, &GameListWidget::onRefreshComplete,
@@ -548,18 +558,24 @@ void GameListWidget::onListViewContextMenuRequested(const QPoint& point)
 void GameListWidget::onTableViewHeaderContextMenuRequested(const QPoint& point)
 {
 	QMenu menu;
+	QHeaderView* header = m_table_view->horizontalHeader();
+	if (!header)
+		return;
 
+	int column_visual = 0;
 	for (int column = 0; column < GameListModel::Column_Count; column++)
 	{
+		// The "cover" column is the game grid and cannot be hidden.
 		if (column == GameListModel::Column_Cover)
 			continue;
 
-		QAction* action = menu.addAction(m_model->getColumnDisplayName(column));
+		column_visual = header->visualIndex(column);
+		QAction* action = menu.addAction(m_model->getColumnDisplayName(column_visual));
 		action->setCheckable(true);
-		action->setChecked(!m_table_view->isColumnHidden(column));
-		connect(action, &QAction::toggled, [this, column](bool enabled) {
-			m_table_view->setColumnHidden(column, !enabled);
-			saveTableViewColumnVisibilitySettings(column);
+		action->setChecked(!m_table_view->isColumnHidden(column_visual));
+		connect(action, &QAction::toggled, [this, column_visual](bool enabled) {
+			m_table_view->setColumnHidden(column_visual, !enabled);
+			onTableHeaderStateChanged();
 			resizeTableViewColumnsToFit();
 		});
 	}
@@ -567,11 +583,6 @@ void GameListWidget::onTableViewHeaderContextMenuRequested(const QPoint& point)
 	menu.exec(m_table_view->mapToGlobal(point));
 }
 
-void GameListWidget::onTableViewHeaderSortIndicatorChanged(int, Qt::SortOrder)
-{
-	saveTableViewColumnSortSettings();
-}
-
 void GameListWidget::onCoverScaleChanged()
 {
 	m_model->updateCacheSize(width(), height());
@@ -707,7 +718,7 @@ void GameListWidget::resizeEvent(QResizeEvent* event)
 	QWidget::resizeEvent(event);
 	resizeTableViewColumnsToFit();
 	m_model->updateCacheSize(width(), height());
-	setCustomBackground();
+	processBackgroundFrames();
 }
 
 bool GameListWidget::event(QEvent* event)
@@ -725,126 +736,141 @@ bool GameListWidget::event(QEvent* event)
 void GameListWidget::resizeTableViewColumnsToFit()
 {
 	QtUtils::ResizeColumnsForTableView(m_table_view, {
-														 45, // type
-														 80, // code
-														 -1, // title
-														 -1, // file title
-														 65, // crc
-														 80, // time played
-														 80, // last played
-														 80, // size
-														 60, // region
-														 120 // compatibility
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Type],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Serial],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_FileTitle],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Type],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_CRC],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_TimePlayed],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_LastPlayed],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Size],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Region],
+														 DEFAULT_COLUMN_WIDTHS[GameListModel::Column_Compatibility],
 													 });
 }
 
-static std::string getColumnVisibilitySettingsKeyName(int column)
+void GameListWidget::loadTableHeaderState()
 {
-	return StringUtil::StdStringFromFormat("Show%s",
+	QHeaderView* header = m_table_view->horizontalHeader();
+	if (!header)
+		return;
+
+	// Decode Base64 string from settings to QByteArray state.
+	const std::string state_setting = Host::GetBaseStringSettingValue("GameListTableView", "HeaderState");
+	if (state_setting.empty())
+		return;
+
+	QSignalBlocker blocker(header);
+	header->restoreState(QByteArray::fromBase64(QByteArray::fromStdString(state_setting)));
+}
+
+void GameListWidget::onTableHeaderStateChanged()
+{
+	QHeaderView* header = m_table_view->horizontalHeader();
+	if (!header)
+		return;
+
+	// Encode QByteArray state as Base64 string for storage.
+	Host::SetBaseStringSettingValue("GameListTableView", "HeaderState", header->saveState().toBase64());
+}
+
+void GameListWidget::applyTableHeaderDefaults()
+{
+	QHeaderView* header = m_table_view->horizontalHeader();
+	if (!header)
+		return;
+
+	{
+		QSignalBlocker blocker(header);
+		header->hideSection(GameListModel::Column_FileTitle);
+		header->hideSection(GameListModel::Column_CRC);
+		header->hideSection(GameListModel::Column_Cover);
+		for (int column = 0; column < GameListModel::Column_Count; column++)
+		{
+			if (column == GameListModel::Column_Cover)
+				continue;
+
+			header->resizeSection(column, DEFAULT_COLUMN_WIDTHS[column]);
+		}
+		header->setSortIndicator(DEFAULT_SORT_INDEX, DEFAULT_SORT_ORDER);
+	}
+
+	Host::SetBaseStringSettingValue("GameListTableView", "HeaderState", header->saveState().toBase64());
+}
+
+// TODO (Tech): Create a button for this in the minibar. Currently unused.
+void GameListWidget::resetTableHeaderToDefault()
+{
+	QHeaderView* header = m_table_view->horizontalHeader();
+	if (!header)
+		return;
+
+	{
+		QSignalBlocker blocker(header);
+		for (int column = 0; column < GameListModel::Column_Count; column++)
+		{
+			if (column == GameListModel::Column_Cover)
+				continue;
+
+			// Reset size, position, and visibility.
+			header->resizeSection(column, DEFAULT_COLUMN_WIDTHS[column]);
+			header->moveSection(header->visualIndex(column), column);
+			header->setSectionHidden(column,
+				column == GameListModel::Column_CRC || column == GameListModel::Column_FileTitle);
+		}
+		header->hideSection(GameListModel::Column_Cover);
+		header->setSortIndicator(DEFAULT_SORT_INDEX, DEFAULT_SORT_ORDER);
+	}
+
+	Host::SetBaseStringSettingValue("GameListTableView", "HeaderState", header->saveState().toBase64());
+}
+
+void GameListWidget::saveSortSettings(const int column, const Qt::SortOrder sort_order)
+{
+	Host::SetBaseStringSettingValue("GameListTableView", "SortColumn",
 		GameListModel::getColumnName(static_cast<GameListModel::Column>(column)));
+	Host::SetBaseBoolSettingValue("GameListTableView", "SortDescending", static_cast<bool>(sort_order));
 }
 
-void GameListWidget::loadTableViewColumnVisibilitySettings()
+std::optional<GameList::Entry> GameListWidget::getSelectedEntry() const
 {
-	static constexpr std::array<bool, GameListModel::Column_Count> DEFAULT_VISIBILITY = {{
-		true, // type
-		true, // code
-		true, // title
-		false, // file title
-		false, // crc
-		true, // time played
-		true, // last played
-		true, // size
-		true, // region
-		true // compatibility
-	}};
+	auto lock = GameList::GetLock();
 
-	for (int column = 0; column < GameListModel::Column_Count; column++)
-	{
-		const bool visible = Host::GetBaseBoolSettingValue(
-			"GameListTableView", getColumnVisibilitySettingsKeyName(column).c_str(), DEFAULT_VISIBILITY[column]);
-		m_table_view->setColumnHidden(column, !visible);
-	}
-}
-
-void GameListWidget::saveTableViewColumnVisibilitySettings()
-{
-	for (int column = 0; column < GameListModel::Column_Count; column++)
-	{
-		const bool visible = !m_table_view->isColumnHidden(column);
-		Host::SetBaseBoolSettingValue("GameListTableView", getColumnVisibilitySettingsKeyName(column).c_str(), visible);
-		Host::CommitBaseSettingChanges();
-	}
-}
-
-void GameListWidget::saveTableViewColumnVisibilitySettings(int column)
-{
-	const bool visible = !m_table_view->isColumnHidden(column);
-	Host::SetBaseBoolSettingValue("GameListTableView", getColumnVisibilitySettingsKeyName(column).c_str(), visible);
-	Host::CommitBaseSettingChanges();
-}
-
-void GameListWidget::loadTableViewColumnSortSettings()
-{
-	const GameListModel::Column DEFAULT_SORT_COLUMN = GameListModel::Column_Type;
-	const bool DEFAULT_SORT_DESCENDING = false;
-
-	const GameListModel::Column sort_column =
-		GameListModel::getColumnIdForName(Host::GetBaseStringSettingValue("GameListTableView", "SortColumn"))
-			.value_or(DEFAULT_SORT_COLUMN);
-	const bool sort_descending =
-		Host::GetBaseBoolSettingValue("GameListTableView", "SortDescending", DEFAULT_SORT_DESCENDING);
-	const Qt::SortOrder sort_order = sort_descending ? Qt::DescendingOrder : Qt::AscendingOrder;
-	m_sort_model->sort(sort_column, sort_order);
-	if (QHeaderView* hv = m_table_view->horizontalHeader())
-		hv->setSortIndicator(sort_column, sort_order);
-}
-
-void GameListWidget::saveTableViewColumnSortSettings()
-{
-	const int sort_column = m_table_view->horizontalHeader()->sortIndicatorSection();
-	const bool sort_descending = (m_table_view->horizontalHeader()->sortIndicatorOrder() == Qt::DescendingOrder);
-
-	if (sort_column >= 0 && sort_column < GameListModel::Column_Count)
-	{
-		Host::SetBaseStringSettingValue(
-			"GameListTableView", "SortColumn", GameListModel::getColumnName(static_cast<GameListModel::Column>(sort_column)));
-	}
-
-	Host::SetBaseBoolSettingValue("GameListTableView", "SortDescending", sort_descending);
-	Host::CommitBaseSettingChanges();
-}
-
-const GameList::Entry* GameListWidget::getSelectedEntry() const
-{
+	const GameList::Entry* entry;
 	if (m_ui.stack->currentIndex() == 0)
 	{
 		const QItemSelectionModel* selection_model = m_table_view->selectionModel();
 		if (!selection_model->hasSelection())
-			return nullptr;
+			return std::nullopt;
 
 		const QModelIndexList selected_rows = selection_model->selectedRows();
 		if (selected_rows.empty())
-			return nullptr;
+			return std::nullopt;
 
 		const QModelIndex source_index = m_sort_model->mapToSource(selected_rows[0]);
 		if (!source_index.isValid())
-			return nullptr;
+			return std::nullopt;
 
-		return GameList::GetEntryByIndex(source_index.row());
+		entry = GameList::GetEntryByIndex(source_index.row());
 	}
 	else
 	{
 		const QItemSelectionModel* selection_model = m_list_view->selectionModel();
 		if (!selection_model->hasSelection())
-			return nullptr;
+			return std::nullopt;
 
 		const QModelIndex source_index = m_sort_model->mapToSource(selection_model->currentIndex());
 		if (!source_index.isValid())
-			return nullptr;
+			return std::nullopt;
 
-		return GameList::GetEntryByIndex(source_index.row());
+		entry = GameList::GetEntryByIndex(source_index.row());
 	}
+
+	if (!entry)
+		return std::nullopt;
+
+	// Copy the entry here instead of keeping the lock held to avoid deadlocks.
+	return *entry;
 }
 
 void GameListWidget::rescanFile(const std::string& path)

pcsx2-qt/GameList/GameListWidget.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "QtUtils.h"
 #include "ui_EmptyGameListWidget.h"
 #include "ui_GameListWidget.h"
 
@@ -46,18 +47,18 @@ public:
 	void initialize();
 	void resizeTableViewColumnsToFit();
 
-	void refresh(bool invalidate_cache);
+	void refresh(bool invalidate_cache, bool popup_on_error);
 	void cancelRefresh();
 	void reloadThemeSpecificImages();
-	void setCustomBackground(bool force = false);
-	void updateCustomBackgroundState(bool force_start = false);
-	void processBackgroundFrames(bool fill_area);
+	void setCustomBackground();
+	void updateCustomBackgroundState(const bool force_start = false);
+	void processBackgroundFrames();
 
 	bool isShowingGameList() const;
 	bool isShowingGameGrid() const;
 	bool getShowGridCoverTitles() const;
 
-	const GameList::Entry* getSelectedEntry() const;
+	std::optional<GameList::Entry> getSelectedEntry() const;
 
 	/// Rescans a single file. NOTE: Happens on UI thread.
 	void rescanFile(const std::string& path);
@@ -81,10 +82,10 @@ private Q_SLOTS:
 	void onTableViewItemActivated(const QModelIndex& index);
 	void onTableViewContextMenuRequested(const QPoint& point);
 	void onTableViewHeaderContextMenuRequested(const QPoint& point);
-	void onTableViewHeaderSortIndicatorChanged(int, Qt::SortOrder);
 	void onListViewItemActivated(const QModelIndex& index);
 	void onListViewContextMenuRequested(const QPoint& point);
 	void onCoverScaleChanged();
+	void onTableHeaderStateChanged();
 
 public Q_SLOTS:
 	void showGameList();
@@ -102,11 +103,10 @@ protected:
 	bool event(QEvent* event) override;
 
 private:
-	void loadTableViewColumnVisibilitySettings();
-	void saveTableViewColumnVisibilitySettings();
-	void saveTableViewColumnVisibilitySettings(int column);
-	void loadTableViewColumnSortSettings();
-	void saveTableViewColumnSortSettings();
+	void loadTableHeaderState();
+	void applyTableHeaderDefaults();
+	void resetTableHeaderToDefault();
+	void saveSortSettings(int column, Qt::SortOrder sort_order);
 	void listZoom(float delta);
 	void updateToolbar();
 
@@ -123,4 +123,6 @@ private:
 	GameListRefreshThread* m_refresh_thread = nullptr;
 
 	QMovie* m_background_movie = nullptr;
+	QtUtils::ScalingMode m_background_scaling = QtUtils::ScalingMode::Fit;
+	float m_background_opacity = 100.0f;
 };

pcsx2-qt/GameList/GameListWidget.ui

@@ -214,6 +214,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>viewGameList</tabstop>
+  <tabstop>viewGameGrid</tabstop>
+  <tabstop>viewGridTitles</tabstop>
+  <tabstop>gridScale</tabstop>
+  <tabstop>filterType</tabstop>
+  <tabstop>filterRegion</tabstop>
+  <tabstop>searchText</tabstop>
+ </tabstops>
  <resources>
   <include location="../resources/resources.qrc"/>
  </resources>

pcsx2-qt/MainWindow.h

@@ -20,7 +20,7 @@
 class QProgressBar;
 
 class AutoUpdaterDialog;
-class DisplayWidget;
+class DisplaySurface;
 class DisplayContainer;
 class GameListWidget;
 class ControllerSettingsWindow;
@@ -69,6 +69,7 @@ public:
 		friend MainWindow;
 
 		QWidget* m_dialog_parent;
+		bool m_has_lock;
 		bool m_was_paused;
 		bool m_was_fullscreen;
 	};
@@ -113,7 +114,7 @@ public:
 	void checkMousePosition(int x, int y);
 public Q_SLOTS:
 	void checkForUpdates(bool display_message, bool force_check);
-	void refreshGameList(bool invalidate_cache);
+	void refreshGameList(bool invalidate_cache, bool popup_on_error);
 	void cancelGameListRefresh();
 	void reportInfo(const QString& title, const QString& message);
 	void reportError(const QString& title, const QString& message);
@@ -170,6 +171,9 @@ private Q_SLOTS:
 	void onAboutActionTriggered();
 	void onToolsOpenDataDirectoryTriggered();
 	void onToolsCoverDownloaderTriggered();
+#if !defined(__APPLE__)
+	void onCreateGameShortcutTriggered();
+#endif
 	void onToolsEditCheatsPatchesTriggered(bool cheats);
 	void onCreateMemoryCardOpenRequested();
 	void updateTheme();
@@ -254,7 +258,6 @@ private:
 	bool shouldAbortForMemcardBusy(const VMLock& lock);
 
 	QWidget* getContentParent();
-	QWidget* getDisplayContainer() const;
 	void saveDisplayWindowGeometryToConfig();
 	void restoreDisplayWindowGeometryFromConfig();
 	void createDisplayWidget(bool fullscreen, bool render_to_main);
@@ -271,11 +274,11 @@ private:
 	QString getDiscDevicePath(const QString& title);
 
 	void startGameListEntry(
-		const GameList::Entry* entry, std::optional<s32> save_slot = std::nullopt, std::optional<bool> fast_boot = std::nullopt, bool load_backup = false);
-	void setGameListEntryCoverImage(const GameList::Entry* entry);
-	void clearGameListEntryPlayTime(const GameList::Entry* entry);
-	void goToWikiPage(const GameList::Entry* entry);
-	void openScreenshotsFolderForGame(const GameList::Entry* entry);
+		const GameList::Entry& entry, std::optional<s32> save_slot = std::nullopt, std::optional<bool> fast_boot = std::nullopt, bool load_backup = false);
+	void setGameListEntryCoverImage(const GameList::Entry& entry);
+	void clearGameListEntryPlayTime(const GameList::Entry& entry, const time_t entry_played_time);
+	void goToWikiPage(const GameList::Entry& entry);
+	void openSnapshotsFolderForGame(const GameList::Entry& entry);
 
 	std::optional<bool> promptForResumeState(const QString& save_state_path);
 	void loadSaveStateSlot(s32 slot, bool load_backup = false);
@@ -288,8 +291,8 @@ private:
 	Ui::MainWindow m_ui;
 
 	GameListWidget* m_game_list_widget = nullptr;
-	DisplayWidget* m_display_widget = nullptr;
-	DisplayContainer* m_display_container = nullptr;
+	DisplaySurface* m_display_surface = nullptr;
+	QWidget* m_display_container = nullptr;
 
 	SettingsWindow* m_settings_window = nullptr;
 	ControllerSettingsWindow* m_controller_settings_window = nullptr;

pcsx2-qt/MainWindow.ui

@@ -104,6 +104,7 @@
     <addaction name="actionDEV9Settings"/>
     <addaction name="actionFolderSettings"/>
     <addaction name="actionAchievementSettings"/>
+    <addaction name="separator"/>
     <addaction name="actionControllerSettings"/>
     <addaction name="actionHotkeySettings"/>
     <addaction name="separator"/>

pcsx2-qt/QtHost.cpp

@@ -88,12 +88,13 @@ static QTimer* s_settings_save_timer = nullptr;
 static std::unique_ptr<INISettingsInterface> s_base_settings_interface;
 static bool s_batch_mode = false;
 static bool s_nogui_mode = false;
-static bool s_start_fullscreen_ui = false;
-static bool s_start_fullscreen_ui_fullscreen = false;
+static bool s_start_big_picture_mode = false;
+static bool s_start_fullscreen = false;
 static bool s_test_config_and_exit = false;
 static bool s_run_setup_wizard = false;
 static bool s_cleanup_after_update = false;
 static bool s_boot_and_debug = false;
+static std::atomic_int s_vm_locked_with_dialog = 0;
 
 //////////////////////////////////////////////////////////////////////////
 // CPU Thread
@@ -495,6 +496,11 @@ void EmuThread::setFullscreen(bool fullscreen, bool allow_render_to_main)
 		return;
 	}
 
+	// HACK: Prevent entering/exiting fullscreen mode when a dialog is shown, so
+	// that we don't destroy the dialog while inside its exec function.
+	if (s_vm_locked_with_dialog > 0)
+		return;
+
 	if (!MTGS::IsOpen() || m_is_fullscreen == fullscreen)
 		return;
 
@@ -764,12 +770,12 @@ void EmuThread::enumerateVibrationMotors()
 	onVibrationMotorsEnumerated(qmotors);
 }
 
-void EmuThread::connectDisplaySignals(DisplayWidget* widget)
+void EmuThread::connectDisplaySignals(DisplaySurface* widget)
 {
 	widget->disconnect(this);
 
-	connect(widget, &DisplayWidget::windowResizedEvent, this, &EmuThread::onDisplayWindowResized);
-	connect(widget, &DisplayWidget::windowRestoredEvent, this, &EmuThread::redrawDisplayWindow);
+	connect(widget, &DisplaySurface::windowResizedEvent, this, &EmuThread::onDisplayWindowResized);
+	connect(widget, &DisplaySurface::windowRestoredEvent, this, &EmuThread::redrawDisplayWindow);
 }
 
 void EmuThread::onDisplayWindowResized(int width, int height, float scale)
@@ -879,38 +885,6 @@ void EmuThread::endCapture()
 	MTGS::RunOnGSThread(&GSEndCapture);
 }
 
-void EmuThread::setAudioOutputVolume(int volume, int fast_forward_volume)
-{
-	if (!isOnEmuThread())
-	{
-		QMetaObject::invokeMethod(this, "setAudioOutputVolume", Qt::QueuedConnection, Q_ARG(int, volume),
-			Q_ARG(int, fast_forward_volume));
-		return;
-	}
-
-	if (!VMManager::HasValidVM())
-		return;
-
-	EmuConfig.SPU2.OutputVolume = static_cast<u32>(volume);
-	EmuConfig.SPU2.FastForwardVolume = static_cast<u32>(fast_forward_volume);
-	SPU2::SetOutputVolume(SPU2::GetResetVolume());
-}
-
-void EmuThread::setAudioOutputMuted(bool muted)
-{
-	if (!isOnEmuThread())
-	{
-		QMetaObject::invokeMethod(this, "setAudioOutputMuted", Qt::QueuedConnection, Q_ARG(bool, muted));
-		return;
-	}
-
-	if (!VMManager::HasValidVM())
-		return;
-
-	EmuConfig.SPU2.OutputMuted = muted;
-	SPU2::SetOutputVolume(SPU2::GetResetVolume());
-}
-
 std::optional<WindowInfo> EmuThread::acquireRenderWindow(bool recreate_window)
 {
 	// Check if we're wanting to get exclusive fullscreen. This should be safe to read, since we're going to be calling from the GS thread.
@@ -991,6 +965,9 @@ void Host::OnGameChanged(const std::string& title, const std::string& elf_overri
 
 void EmuThread::updatePerformanceMetrics(bool force)
 {
+	if (!g_main_window)
+		return;
+
 	if (VMManager::HasValidVM())
 	{
 		QString gs_stat;
@@ -1184,7 +1161,7 @@ void Host::OpenHostFileSelectorAsync(std::string_view title, bool select_directo
 	if (!filters.empty())
 	{
 		filters_str.append(QStringLiteral("All File Types (%1)")
-				.arg(QString::fromStdString(StringUtil::JoinString(filters.begin(), filters.end(), " "))));
+							   .arg(QString::fromStdString(StringUtil::JoinString(filters.begin(), filters.end(), " "))));
 		for (const std::string& filter : filters)
 		{
 			filters_str.append(
@@ -1745,6 +1722,16 @@ void Host::SetMouseMode(bool relative_mode, bool hide_cursor)
 	emit g_emu_thread->onMouseModeRequested(relative_mode, hide_cursor);
 }
 
+void QtHost::LockVMWithDialog()
+{
+	s_vm_locked_with_dialog++;
+}
+
+void QtHost::UnlockVMWithDialog()
+{
+	s_vm_locked_with_dialog--;
+}
+
 namespace
 {
 	class QtHostProgressCallback final : public BaseProgressCallback
@@ -2200,7 +2187,7 @@ bool QtHost::ParseCommandLineOptions(const QStringList& args, std::shared_ptr<VM
 			else if (CHECK_ARG(QStringLiteral("-fullscreen")))
 			{
 				AutoBoot(autoboot)->fullscreen = true;
-				s_start_fullscreen_ui_fullscreen = true;
+				s_start_fullscreen = true;
 				continue;
 			}
 			else if (CHECK_ARG(QStringLiteral("-nofullscreen")))
@@ -2215,7 +2202,7 @@ bool QtHost::ParseCommandLineOptions(const QStringList& args, std::shared_ptr<VM
 			}
 			else if (CHECK_ARG(QStringLiteral("-bigpicture")))
 			{
-				s_start_fullscreen_ui = true;
+				s_start_big_picture_mode = true;
 				continue;
 			}
 			else if (CHECK_ARG(QStringLiteral("-testconfig")))
@@ -2276,7 +2263,7 @@ bool QtHost::ParseCommandLineOptions(const QStringList& args, std::shared_ptr<VM
 
 	// if we don't have autoboot, we definitely don't want batch mode (because that'll skip
 	// scanning the game list).
-	if (s_batch_mode && !s_start_fullscreen_ui && !autoboot)
+	if (s_batch_mode && !s_start_big_picture_mode && !autoboot)
 	{
 		QMessageBox::critical(nullptr, QStringLiteral("Error"),
 			s_nogui_mode ? QStringLiteral("Cannot use no-gui mode, because no boot filename was specified.") :
@@ -2360,7 +2347,12 @@ int main(int argc, char* argv[])
 {
 	CrashHandler::Install();
 
+// Exceptions are disabled, so we can't try/catch this.
+// Timestamps in some locales showed up wrong on Windows.
+// Qt already applies the user locale on Unix-like systems.
+#ifdef _WIN32
 	std::locale::global(std::locale(""));
+#endif
 
 	QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 	QtHost::RegisterTypes();
@@ -2412,7 +2404,7 @@ int main(int argc, char* argv[])
 
 	// When running in batch mode, ensure game list is loaded, but don't scan for any new files.
 	if (!s_batch_mode)
-		g_main_window->refreshGameList(false);
+		g_main_window->refreshGameList(false, false);
 	else
 		GameList::Refresh(false, true);
 
@@ -2425,8 +2417,9 @@ int main(int argc, char* argv[])
 	}
 
 	// Initialize big picture mode if requested by command line or settings.
-	if (s_start_fullscreen_ui || Host::GetBaseBoolSettingValue("UI", "StartBigPictureMode", false))
-		g_emu_thread->startFullscreenUI(s_start_fullscreen_ui_fullscreen);
+	// As CLI arguments are baked-in, they're tracked separately from settings which can be changed during runtime.
+	if (s_start_big_picture_mode || Host::GetBaseBoolSettingValue("UI", "StartBigPictureMode", false))
+		g_emu_thread->startFullscreenUI(s_start_fullscreen || Host::GetBaseBoolSettingValue("UI", "StartFullscreen", false));
 
 	if (s_boot_and_debug || DebuggerWindow::shouldShowOnStartup())
 	{

pcsx2-qt/QtHost.h

@@ -28,7 +28,7 @@
 
 class SettingsInterface;
 
-class DisplayWidget;
+class DisplaySurface;
 struct VMBootParameters;
 
 enum class CDVD_SourceType : uint8_t;
@@ -69,7 +69,7 @@ public:
 
 	/// Called back from the GS thread when the display state changes (e.g. fullscreen, render to main).
 	std::optional<WindowInfo> acquireRenderWindow(bool recreate_window);
-	void connectDisplaySignals(DisplayWidget* widget);
+	void connectDisplaySignals(DisplaySurface* widget);
 	void releaseRenderWindow();
 
 	void startBackgroundControllerPollTimer();
@@ -112,8 +112,6 @@ public Q_SLOTS:
 	void queueSnapshot(quint32 gsdump_frames);
 	void beginCapture(const QString& path);
 	void endCapture();
-	void setAudioOutputVolume(int volume, int fast_forward_volume);
-	void setAudioOutputMuted(bool muted);
 
 Q_SIGNALS:
 	bool messageConfirmed(const QString& title, const QString& message);
@@ -292,4 +290,10 @@ namespace QtHost
 
 	/// Compare strings in the locale of the current UI language
 	int LocaleSensitiveCompare(QStringView lhs, QStringView rhs);
+
+	/// Determines whether or not requests to enter/exit fullscreen mode should
+	/// be ignored. This is a hack so that we don't destroy a dialog box while
+	/// inside its exec function, which would cause a crash.
+	void LockVMWithDialog();
+	void UnlockVMWithDialog();
 } // namespace QtHost

pcsx2-qt/QtUtils.cpp

@@ -8,10 +8,9 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QMetaObject>
 #include <QtGui/QAction>
-#include <QtGui/QGuiApplication>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QKeyEvent>
-#include <QtGui/QScreen>
+#include <QtGui/QPainter>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QHeaderView>
@@ -40,8 +39,6 @@
 #if defined(_WIN32)
 #include "common/RedtapeWindows.h"
 #include <Shlobj.h>
-#elif !defined(APPLE)
-#include <qpa/qplatformnativeinterface.h>
 #endif
 
 namespace QtUtils
@@ -90,7 +87,9 @@ namespace QtUtils
 
 		const int min_column_width = header->minimumSectionSize();
 		const int scrollbar_width = ((view->verticalScrollBar() && view->verticalScrollBar()->isVisible()) ||
-			view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ? view->verticalScrollBar()->width() : 0;
+										view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ?
+		                                view->verticalScrollBar()->width() :
+		                                0;
 		int num_flex_items = 0;
 		int total_width = 0;
 		int column_index = 0;
@@ -137,6 +136,126 @@ namespace QtUtils
 		ResizeColumnsForView(view, widths);
 	}
 
+	void resizeAndScalePixmap(QPixmap* pm, const int expected_width, const int expected_height, const qreal dpr, const ScalingMode scaling_mode, const float opacity)
+	{
+		if (!pm || pm->isNull() || pm->width() <= 0 || pm->height() <= 0)
+			return;
+
+		const int dpr_expected_width = qRound(expected_width * dpr);
+		const int dpr_expected_height = qRound(expected_height * dpr);
+
+		if (pm->width() == dpr_expected_width &&
+			pm->height() == dpr_expected_height &&
+			pm->devicePixelRatio() == dpr &&
+			opacity == 100.0f)
+		{
+			switch (scaling_mode)
+			{
+				case ScalingMode::Fit:
+				case ScalingMode::Stretch:
+				case ScalingMode::Center:
+					return;
+
+				case ScalingMode::Fill:
+				case ScalingMode::Tile:
+				default:
+					break;
+			}
+		}
+
+		QPixmap final_pixmap(dpr_expected_width, dpr_expected_height);
+		final_pixmap.setDevicePixelRatio(dpr);
+		final_pixmap.fill(Qt::transparent);
+
+		QPainter painter;
+		painter.begin(&final_pixmap);
+		painter.setRenderHint(QPainter::Antialiasing, true);
+		painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+		painter.setOpacity(opacity / 100.0f);
+		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+
+		const QRectF srcRect(0, 0, pm->width(), pm->height());
+		const QRectF painterRect(0, 0, expected_width, expected_height);
+
+		switch (scaling_mode)
+		{
+			case ScalingMode::Fit:
+			case ScalingMode::Fill:
+			{
+				auto const aspect_mode = (scaling_mode == ScalingMode::Fit) ?
+				                             Qt::KeepAspectRatio :
+				                             Qt::KeepAspectRatioByExpanding;
+
+				QSizeF scaledSize(pm->width(), pm->height());
+				scaledSize.scale(dpr_expected_width, dpr_expected_height, aspect_mode);
+
+				*pm = pm->scaled(
+					qRound(scaledSize.width()),
+					qRound(scaledSize.height()),
+					Qt::IgnoreAspectRatio,
+					Qt::SmoothTransformation
+				);
+
+				const QRectF scaledSrcRect(0, 0, pm->width(), pm->height());
+
+				QSizeF logicalSize = pm->size() / dpr;
+				QRectF destRect(QPointF(0, 0), logicalSize);
+
+				destRect.moveCenter(painterRect.center());
+
+				painter.drawPixmap(destRect, *pm, scaledSrcRect);
+				break;
+			}
+			case ScalingMode::Stretch:
+			{
+				*pm = pm->scaled(
+					dpr_expected_width,
+					dpr_expected_height,
+					Qt::IgnoreAspectRatio,
+					Qt::SmoothTransformation
+				);
+
+				const QRectF scaledSrcRect(0, 0, pm->width(), pm->height());
+
+				painter.drawPixmap(painterRect, *pm, scaledSrcRect);
+				break;
+			}
+			case ScalingMode::Center:
+			{
+				const qreal pmWidth = pm->width() / dpr;
+				const qreal pmHeight = pm->height() / dpr;
+
+				QRectF destRect(0, 0, pmWidth, pmHeight);
+
+				destRect.moveCenter(painterRect.center());
+
+				painter.drawPixmap(destRect, *pm, srcRect);
+				break;
+			}
+			case ScalingMode::Tile:
+			{
+				const qreal tileWidth = pm->width() / dpr;
+				const qreal tileHeight = pm->height() / dpr;
+
+				if (tileWidth <= 0 || tileHeight <= 0)
+					break;
+
+				QPixmap tileSource = pm->scaled(tileWidth, tileHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+				tileSource.setDevicePixelRatio(dpr);
+
+				QBrush tileBrush(tileSource);
+				tileBrush.setTextureImage(tileSource.toImage());
+
+				painter.fillRect(painterRect, tileBrush);
+				break;
+			}
+			default:
+				break;
+		}
+		painter.end();
+		*pm = std::move(final_pixmap);
+	}
+
 	void ShowInFileExplorer(QWidget* parent, const QFileInfo& file)
 	{
 #if defined(_WIN32)
@@ -252,68 +371,6 @@ namespace QtUtils
 		widget->resize(width, height);
 	}
 
-	std::optional<WindowInfo> GetWindowInfoForWidget(QWidget* widget)
-	{
-		WindowInfo wi;
-
-		// Windows and Apple are easy here since there's no display connection.
-#if defined(_WIN32)
-		wi.type = WindowInfo::Type::Win32;
-		wi.window_handle = reinterpret_cast<void*>(widget->winId());
-#elif defined(__APPLE__)
-		wi.type = WindowInfo::Type::MacOS;
-		wi.window_handle = reinterpret_cast<void*>(widget->winId());
-#else
-		QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface();
-		const QString platform_name = QGuiApplication::platformName();
-		if (platform_name == QStringLiteral("xcb"))
-		{
-			// Can't get a handle for an unmapped window in X, it doesn't like it.
-			if (!widget->isVisible())
-			{
-				Console.WriteLn("Returning null window info for widget because it is not visible.");
-				return std::nullopt;
-			}
-
-			wi.type = WindowInfo::Type::X11;
-			wi.display_connection = pni->nativeResourceForWindow("display", widget->windowHandle());
-			wi.window_handle = reinterpret_cast<void*>(widget->winId());
-		}
-		else if (platform_name == QStringLiteral("wayland"))
-		{
-			wi.type = WindowInfo::Type::Wayland;
-			wi.display_connection = pni->nativeResourceForWindow("display", widget->windowHandle());
-			wi.window_handle = pni->nativeResourceForWindow("surface", widget->windowHandle());
-		}
-		else
-		{
-			Console.WriteLn("Unknown PNI platform '%s'.", platform_name.toUtf8().constData());
-			return std::nullopt;
-		}
-#endif
-
-		const qreal dpr = widget->devicePixelRatioF();
-		wi.surface_width = static_cast<u32>(static_cast<qreal>(widget->width()) * dpr);
-		wi.surface_height = static_cast<u32>(static_cast<qreal>(widget->height()) * dpr);
-		wi.surface_scale = static_cast<float>(dpr);
-
-		// Query refresh rate, we need it for sync.
-		std::optional<float> surface_refresh_rate = WindowInfo::QueryRefreshRateForWindow(wi);
-		if (!surface_refresh_rate.has_value())
-		{
-			// Fallback to using the screen, getting the rate for Wayland is an utter mess otherwise.
-			const QScreen* widget_screen = widget->screen();
-			if (!widget_screen)
-				widget_screen = QGuiApplication::primaryScreen();
-			surface_refresh_rate = widget_screen ? static_cast<float>(widget_screen->refreshRate()) : 0.0f;
-		}
-
-		wi.surface_refresh_rate = surface_refresh_rate.value();
-		INFO_LOG("Surface refresh rate: {} hz", wi.surface_refresh_rate);
-
-		return wi;
-	}
-
 	QString AbstractItemModelToCSV(QAbstractItemModel* model, int role, bool useQuotes)
 	{
 		QString csv;
@@ -346,11 +403,6 @@ namespace QtUtils
 		return csv;
 	}
 
-	bool IsLightTheme(const QPalette& palette)
-	{
-		return palette.text().color().lightnessF() < 0.5;
-	}
-
 	bool IsCompositorManagerRunning()
 	{
 		if (qEnvironmentVariableIsSet("PCSX2_NO_COMPOSITING"))

pcsx2-qt/QtUtils.h

@@ -9,11 +9,20 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QString>
 #include <QtCore/QAbstractItemModel>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QWindow>
+#if !defined(_WIN32) and !defined(__APPLE__)
+#include <qpa/qplatformnativeinterface.h>
+#endif
+#include <QtGui/QScreen>
 #include <functional>
 #include <initializer_list>
 #include <string_view>
+#include <type_traits>
 #include <optional>
 
+#include "common/Console.h"
+
 class ByteStream;
 
 class QAction;
@@ -49,6 +58,20 @@ namespace QtUtils
 	void ResizeColumnsForTableView(QTableView* view, const std::initializer_list<int>& widths);
 	void ResizeColumnsForTreeView(QTreeView* view, const std::initializer_list<int>& widths);
 
+	enum struct ScalingMode
+	{
+		Fit,
+		Fill,
+		Stretch,
+		Center,
+		Tile,
+
+		MaxCount
+	};
+
+	/// Resize and scale a given Pixmap (and optionally adjust opacity)
+	void resizeAndScalePixmap(QPixmap* pm, const int expected_width, const int expected_height, const qreal dpr, const ScalingMode scaling_mode, const float opacity);
+
 	/// Returns a key id for a key event, including any modifiers that we need (e.g. Keypad).
 	/// NOTE: Defined in QtKeyCodes.cpp, not QtUtils.cpp.
 	u32 KeyEventToCode(const QKeyEvent* ev);
@@ -83,8 +106,82 @@ namespace QtUtils
 	/// Adjusts the fixed size for a window if it's not resizeable.
 	void ResizePotentiallyFixedSizeWindow(QWidget* widget, int width, int height);
 
-	/// Returns the common window info structure for a Qt widget.
-	std::optional<WindowInfo> GetWindowInfoForWidget(QWidget* widget);
+	/// Returns the common window info structure for a Qt Window/Widget.
+	template <class T>
+		requires std::is_base_of_v<QWidget, T> || std::is_base_of_v<QWindow, T>
+	std::optional<WindowInfo> GetWindowInfoForWindow(T* window)
+	{
+		WindowInfo wi;
+
+		// Windows and Apple are easy here since there's no display connection.
+#if defined(_WIN32)
+		wi.type = WindowInfo::Type::Win32;
+		wi.window_handle = reinterpret_cast<void*>(window->winId());
+#elif defined(__APPLE__)
+		wi.type = WindowInfo::Type::MacOS;
+		wi.window_handle = reinterpret_cast<void*>(window->winId());
+#else
+		QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface();
+		const QString platform_name = QGuiApplication::platformName();
+
+		QWindow* windowHandle;
+		if constexpr (std::is_base_of_v<QWidget, T>)
+			windowHandle = window->windowHandle();
+		else
+			windowHandle = window;
+
+		if (platform_name == QStringLiteral("xcb"))
+		{
+			// Can't get a handle for an unmapped window in X, it doesn't like it.
+			if (!window->isVisible())
+			{
+				Console.WriteLn("Returning null window info for widget because it is not visible.");
+				return std::nullopt;
+			}
+
+			wi.type = WindowInfo::Type::X11;
+			wi.display_connection = pni->nativeResourceForWindow("display", windowHandle);
+			wi.window_handle = reinterpret_cast<void*>(window->winId());
+		}
+		else if (platform_name == QStringLiteral("wayland"))
+		{
+			wi.type = WindowInfo::Type::Wayland;
+			wi.display_connection = pni->nativeResourceForWindow("display", windowHandle);
+			wi.window_handle = pni->nativeResourceForWindow("surface", windowHandle);
+		}
+		else
+		{
+			Console.WriteLn("Unknown PNI platform '%s'.", platform_name.toUtf8().constData());
+			return std::nullopt;
+		}
+#endif
+
+		qreal dpr;
+		if constexpr (std::is_base_of_v<QWidget, T>)
+			dpr = window->devicePixelRatioF();
+		else
+			dpr = window->devicePixelRatio();
+
+		wi.surface_width = static_cast<u32>(std::max(static_cast<int>(std::round(static_cast<qreal>(window->width()) * dpr)), 1));
+		wi.surface_height = static_cast<u32>(std::max(static_cast<int>(std::round(static_cast<qreal>(window->height()) * dpr)), 1));
+		wi.surface_scale = static_cast<float>(dpr);
+
+		// Query refresh rate, we need it for sync.
+		std::optional<float> surface_refresh_rate = WindowInfo::QueryRefreshRateForWindow(wi);
+		if (!surface_refresh_rate.has_value())
+		{
+			// Fallback to using the screen, getting the rate for Wayland is an utter mess otherwise.
+			const QScreen* widget_screen = window->screen();
+			if (!widget_screen)
+				widget_screen = QGuiApplication::primaryScreen();
+			surface_refresh_rate = widget_screen ? static_cast<float>(widget_screen->refreshRate()) : 0.0f;
+		}
+
+		wi.surface_refresh_rate = surface_refresh_rate.value();
+		INFO_LOG("Surface refresh rate: {} hz", wi.surface_refresh_rate);
+
+		return wi;
+	}
 
 	/// Converts a value to a QString of said value with a proper fixed width
 	template <typename T>
@@ -96,9 +193,7 @@ namespace QtUtils
 	/// Converts an abstract item model to a CSV string.
 	QString AbstractItemModelToCSV(QAbstractItemModel* model, int role = Qt::DisplayRole, bool useQuotes = false);
 
-	// Heuristic to check if the current theme is a light or dark theme.
-	bool IsLightTheme(const QPalette& palette);
-
+	/// Checks if we can use transparency effects e.g. for dock drop indicators.
 	bool IsCompositorManagerRunning();
 
 	/// Sets the scalable icon to a given label (svg icons, or icons with multiple size pixmaps)

pcsx2-qt/Settings/AchievementLoginDialog.cpp

@@ -127,7 +127,25 @@ void AchievementLoginDialog::processLoginResult(bool result, const QString& mess
 		}
 	}
 
-	done(0);
+	// Show success messagebox
+	const std::string username = Host::GetBaseStringSettingValue("Achievements", "Username");
+	QMessageBox::information(
+		this, tr("Login Successful"),
+		tr("Successfully logged in to RetroAchievements as %1.").arg(QString::fromStdString(username)));
+	
+	m_ui.status->setText(tr("Successfully logged in as %1.").arg(QString::fromStdString(username)));
+	m_ui.status->setStyleSheet("color: green; font-weight: bold;");
+	
+	disconnect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &AchievementLoginDialog::loginClicked);
+	
+	m_login->setVisible(false);
+	QPushButton* dismissButton = m_ui.buttonBox->addButton(tr("&Dismiss"), QDialogButtonBox::AcceptRole);
+	dismissButton->setDefault(true);
+	dismissButton->setFocus();
+	
+	connect(dismissButton, &QPushButton::clicked, this, [this]() { done(0); });
+	
+	enableUI(false);
 }
 
 void AchievementLoginDialog::connectUi()