From 3b464c2ed90ef91956a024f3c7b427b248c33c81 Mon Sep 17 00:00:00 2001
From: catsout <36527596+catsout@users.noreply.github.com>
Date: Mon, 9 Jan 2023 13:55:11 +0800
Subject: [PATCH 1/3] Set StartupWMClass

---
 org.ppsspp.PPSSPP.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.ppsspp.PPSSPP.yml b/org.ppsspp.PPSSPP.yml
index 5c8b4f8..b95c563 100644
--- a/org.ppsspp.PPSSPP.yml
+++ b/org.ppsspp.PPSSPP.yml
@@ -46,7 +46,7 @@ modules:
             - -DUSING_EGL=ON
             - -DUSING_GLES2=ON
     post-install:
-      - desktop-file-edit --set-name=PPSSPP ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
+      - desktop-file-edit --set-name=PPSSPP --set-key=StartupWMClass --set-value=PPSSPPSDL ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
       - install -Dm644 icons/icon-512.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ppsspp.svg
       - install -Dm644 ${FLATPAK_ID}.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo
     cleanup:

From 3a7762c71e435c2ec0718391a9a8dabc9de1f908 Mon Sep 17 00:00:00 2001
From: catsout <outline941@live.com>
Date: Mon, 9 Jan 2023 13:56:40 +0800
Subject: [PATCH 2/3] update shared-modules

---
 shared-modules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-modules b/shared-modules
index 0534d32..a285255 160000
--- a/shared-modules
+++ b/shared-modules
@@ -1 +1 @@
-Subproject commit 0534d3276b3966e87abacd163f757454b6fcf724
+Subproject commit a2852553082acf05814f8b9ea881fb1ed37b8020

From 9f6843067575fadb654ee24a2f6785873418739c Mon Sep 17 00:00:00 2001
From: catsout <outline941@live.com>
Date: Mon, 9 Jan 2023 14:30:57 +0800
Subject: [PATCH 3/3] Use env to set wm classname

---
 org.ppsspp.PPSSPP.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.ppsspp.PPSSPP.yml b/org.ppsspp.PPSSPP.yml
index b95c563..ed2d963 100644
--- a/org.ppsspp.PPSSPP.yml
+++ b/org.ppsspp.PPSSPP.yml
@@ -15,6 +15,8 @@ finish-args:
   - --share=ipc
   - --share=network
   - --talk-name=org.freedesktop.ScreenSaver
+  - --env=SDL_VIDEO_X11_WMCLASS=org.ppsspp.PPSSPP
+  - --env=SDL_VIDEO_WAYLAND_WMCLASS=org.ppsspp.PPSSPP
 add-extensions:
   org.ppsspp.PPSSPP.Locale:
     directory: share/locale
@@ -46,7 +48,7 @@ modules:
             - -DUSING_EGL=ON
             - -DUSING_GLES2=ON
     post-install:
-      - desktop-file-edit --set-name=PPSSPP --set-key=StartupWMClass --set-value=PPSSPPSDL ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
+      - desktop-file-edit --set-name=PPSSPP ${FLATPAK_DEST}/share/applications/PPSSPPSDL.desktop
       - install -Dm644 icons/icon-512.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ppsspp.svg
       - install -Dm644 ${FLATPAK_ID}.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo
     cleanup: