Merge pull request #21320 from hrydgard/even-more-fixes

Fix mousewheel scroll problem, merge dependabot PRs

.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/

.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/
@@ -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/
@@ -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:
@@ -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
@@ -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/

.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/

.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

.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/

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;

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);

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()) {

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),
 

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);