From 6b3e4b7dd0844c731a17240d5d1baafc3f249ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 28 Feb 2026 13:56:18 +0100 Subject: [PATCH 1/6] Shorter default hiding time for touch controls (8 seconds now) --- Core/Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index a23a24c9d7..a4dd2d8f5c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1045,7 +1045,7 @@ static const ConfigSetting controlSettings[] = { ConfigSetting("GamepadOnlyFocused", SETTING(g_Config, bGamepadOnlyFocused), false, CfgFlag::PER_GAME), ConfigSetting("TouchButtonStyle", SETTING(g_Config, iTouchButtonStyle), 1, CfgFlag::PER_GAME), ConfigSetting("TouchButtonOpacity", SETTING(g_Config, iTouchButtonOpacity), 65, CfgFlag::PER_GAME), - ConfigSetting("TouchButtonHideSeconds", SETTING(g_Config, iTouchButtonHideSeconds), 20, CfgFlag::PER_GAME), + ConfigSetting("TouchButtonHideSeconds", SETTING(g_Config, iTouchButtonHideSeconds), 8, CfgFlag::PER_GAME), ConfigSetting("AutoCenterTouchAnalog", SETTING(g_Config, bAutoCenterTouchAnalog), false, CfgFlag::PER_GAME), ConfigSetting("StickyTouchDPad", SETTING(g_Config, bStickyTouchDPad), false, CfgFlag::PER_GAME), From d37ca94eb7fb20cfa5f1b0fbc58a6f12ef9228d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2026 08:47:20 +0000 Subject: [PATCH 2/6] Bump actions/upload-artifact from 6 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/appimage.yml | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/manual_generate_apk.yml | 2 +- .github/workflows/manual_generate_ipa.yml | 4 ++-- .github/workflows/manual_generate_uwp.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index d62597551b..4963d13789 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -266,7 +266,7 @@ jobs: fi - name: Upload artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: linux-${{ steps.version.outputs.tag }}-${{ matrix.id }} AppImage path: artifacts/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f46f7f4c3..3ac1dd3306 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: run: cp Windows/Release/*.exe ppsspp/ - name: Upload build - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: Windows ${{ matrix.platform }} build path: ppsspp/ @@ -372,14 +372,14 @@ jobs: fi - name: Upload build - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 if: matrix.extra == 'test' with: name: ${{ matrix.os }} build path: ppsspp/ - name: Upload iOS build - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 if: matrix.id == 'ios' with: name: ${{ matrix.id }} build diff --git a/.github/workflows/manual_generate_apk.yml b/.github/workflows/manual_generate_apk.yml index 5866f21bb4..4c74ef945e 100644 --- a/.github/workflows/manual_generate_apk.yml +++ b/.github/workflows/manual_generate_apk.yml @@ -75,7 +75,7 @@ jobs: fi - name: Upload artifact - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: android-${{ github.event.inputs.buildVariant }} build path: ppsspp/ diff --git a/.github/workflows/manual_generate_ipa.yml b/.github/workflows/manual_generate_ipa.yml index cde2e478ff..7642bfc8a9 100644 --- a/.github/workflows/manual_generate_ipa.yml +++ b/.github/workflows/manual_generate_ipa.yml @@ -81,13 +81,13 @@ jobs: fi - name: Upload IPA artifact - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: iOS-IPA build path: ppsspp/*.ipa - name: Upload DEB artifact - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: iOS-DEB build path: ppsspp/*.deb diff --git a/.github/workflows/manual_generate_uwp.yml b/.github/workflows/manual_generate_uwp.yml index 66e7da6c4d..38763cc8d0 100644 --- a/.github/workflows/manual_generate_uwp.yml +++ b/.github/workflows/manual_generate_uwp.yml @@ -116,7 +116,7 @@ jobs: #ls ppsspp - name: Upload artifact - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: UWP-${{ github.event.inputs.buildConfiguration }}-${{ github.event.inputs.buildPlatform }} build path: ppsspp/ From 109df8be7d8469fe1133b305cfad948c19cd9faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2026 08:47:23 +0000 Subject: [PATCH 3/6] Bump nttld/setup-ndk from 1.5.0 to 1.6.0 Bumps [nttld/setup-ndk](https://github.com/nttld/setup-ndk) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/nttld/setup-ndk/releases) - [Commits](https://github.com/nttld/setup-ndk/compare/afb4c9964b521afb97c864b7d40b11e6911bd410...ed92fe6cadad69be94a966a7ee3271275e62f779) --- updated-dependencies: - dependency-name: nttld/setup-ndk dependency-version: 1.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f46f7f4c3..4545f2e65e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -271,7 +271,7 @@ jobs: version: 5.15.2 - name: Setup Android NDK - uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0 + uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0 if: matrix.extra == 'android' id: setup-ndk with: From 2a71a087e249518af2ddd2205dc1ab5f0ee08e4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2026 08:47:27 +0000 Subject: [PATCH 4/6] Bump actions/download-artifact from 7 to 8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f46f7f4c3..eae04df326 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,7 +151,7 @@ jobs: run: git submodule update --init pspautotests assets/lang - name: Download build - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: name: Windows x64 build path: ppsspp/ @@ -437,7 +437,7 @@ jobs: git submodule update --init SDL/macOS - name: Download build - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: name: ${{ matrix.os }} build path: ppsspp/ From 5e6ec7028003a84cf425b0eaae57a1c903f41103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 1 Mar 2026 12:09:43 +0100 Subject: [PATCH 5/6] Minor stuff --- Common/GPU/OpenGL/GLQueueRunner.cpp | 5 +++++ Common/GPU/OpenGL/GLQueueRunner.h | 5 +---- GPU/GLES/GPU_GLES.cpp | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Common/GPU/OpenGL/GLQueueRunner.cpp b/Common/GPU/OpenGL/GLQueueRunner.cpp index e85d830e5a..c5e2cb4d5e 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.cpp +++ b/Common/GPU/OpenGL/GLQueueRunner.cpp @@ -1775,6 +1775,11 @@ void GLQueueRunner::fbo_unbind() { CHECK_GL_ERROR_IF_DEBUG(); } +std::string GLQueueRunner::GetGLString(int name) const { + auto it = glStrings_.find(name); + return it != glStrings_.end() ? it->second : ""; +} + GLRFramebuffer::~GLRFramebuffer() { if (handle == 0 && z_stencil_buffer == 0 && z_buffer == 0 && stencil_buffer == 0) return; diff --git a/Common/GPU/OpenGL/GLQueueRunner.h b/Common/GPU/OpenGL/GLQueueRunner.h index a0a058c335..1261bb9ab2 100644 --- a/Common/GPU/OpenGL/GLQueueRunner.h +++ b/Common/GPU/OpenGL/GLQueueRunner.h @@ -370,10 +370,7 @@ public: return sawOutOfMemory_; } - std::string GetGLString(int name) const { - auto it = glStrings_.find(name); - return it != glStrings_.end() ? it->second : ""; - } + std::string GetGLString(int name) const; private: void InitCreateFramebuffer(const GLRInitStep &step); diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 248ed5052d..307ad5e122 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -195,6 +195,9 @@ u32 GPU_GLES::CheckGPUFeatures() const { void GPU_GLES::BuildReportingInfo() { GLRenderManager *render = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER); + if (!render) { + return; + } std::string glVendor = render->GetGLString(GL_VENDOR); std::string glRenderer = render->GetGLString(GL_RENDERER); From 8086bd1adc02705a8d4101def384867837e99e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 1 Mar 2026 12:14:04 +0100 Subject: [PATCH 6/6] Correct the mouse scroll problem reported by sum2012 in #21315 Fixes #21315 Replaces #21316 --- Common/UI/ScrollView.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/UI/ScrollView.cpp b/Common/UI/ScrollView.cpp index 2e093d2029..e300a52ec9 100644 --- a/Common/UI/ScrollView.cpp +++ b/Common/UI/ScrollView.cpp @@ -146,6 +146,11 @@ const float friction = 0.92f; const float stop_threshold = 0.1f; bool ScrollView::Touch(const TouchInput &input) { + if (input.flags & TouchInputFlags::MOUSE) { + // Kinda hacky, we should make a proper hover mechanism. + mouseHover_ = bounds_.Contains(input.x, input.y); + } + // Ignore buttons other than the left one. if ((input.flags & TouchInputFlags::MOUSE) && (input.buttons & 1) == 0) { return false; @@ -177,11 +182,6 @@ bool ScrollView::Touch(const TouchInput &input) { draggingBob_ = false; } - if (input.flags & TouchInputFlags::MOUSE) { - // Kinda hacky, we should make a proper hover mechanism. - mouseHover_ = bounds_.Contains(input.x, input.y); - } - // We modify the input2 we send to children, so we can cancel drags if we start scrolling, and stuff like that. TouchInput input2; if (CanScroll()) {