hrydgard · hrydgard · Dec 20, 2023 · Dec 20, 2023
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -839,6 +839,7 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("ConfineMap", &g_Config.bMouseConfine, false, CfgFlag::PER_GAME),
 	ConfigSetting("MouseSensitivity", &g_Config.fMouseSensitivity, 0.1f, CfgFlag::PER_GAME),
 	ConfigSetting("MouseSmoothing", &g_Config.fMouseSmoothing, 0.9f, CfgFlag::PER_GAME),
+	ConfigSetting("MouseWheelUpDelayMs", &g_Config.iMouseWheelUpDelayMs, 80, CfgFlag::PER_GAME),
 
 	ConfigSetting("SystemControls", &g_Config.bSystemControls, true, CfgFlag::DEFAULT),
 	ConfigSetting("RapidFileInterval", &g_Config.iRapidFireInterval, 5, CfgFlag::DEFAULT),

diff --git a/Core/Config.h b/Core/Config.h
@@ -404,6 +404,7 @@ struct Config {
 	bool bMouseConfine; // Trap inside the window.
 	float fMouseSensitivity;
 	float fMouseSmoothing;
+	int iMouseWheelUpDelayMs;
 
 	bool bSystemControls;
 	int iRapidFireInterval;

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -767,7 +767,11 @@ void GameSettingsScreen::CreateControlsSettings(UI::ViewGroup *controlsSettings)
 		bool enableMouseSettings = false;
 #endif
 		if (enableMouseSettings) {
+			// The mousewheel button-release setting is independent of actual mouse delta control.
 			controlsSettings->Add(new ItemHeader(co->T("Mouse", "Mouse settings")));
+			auto wheelUpDelaySlider = controlsSettings->Add(new PopupSliderChoice(&g_Config.iMouseWheelUpDelayMs, 10, 300, 1, co->T("Mouse wheel button-release delay"), screenManager()));
+			wheelUpDelaySlider->SetFormat(di->T("%d ms"));
+
 			CheckBox *mouseControl = controlsSettings->Add(new CheckBox(&g_Config.bMouseControl, co->T("Use Mouse Control")));
 			mouseControl->OnClick.Add([=](EventParams &e) {
 				if (g_Config.bMouseControl)
@@ -919,9 +923,11 @@ void GameSettingsScreen::CreateNetworkingSettings(UI::ViewGroup *networkingSetti
 	}
 #endif
 
+	auto di = GetI18NCategory(I18NCat::DIALOG);
+
 	networkingSettings->Add(new ItemHeader(n->T("Misc", "Misc (default = compatibility)")));
 	networkingSettings->Add(new PopupSliderChoice(&g_Config.iPortOffset, 0, 60000, 10000, n->T("Port offset", "Port offset (0 = PSP compatibility)"), 100, screenManager()));
-	networkingSettings->Add(new PopupSliderChoice(&g_Config.iMinTimeout, 0, 15000, 0, n->T("Minimum Timeout", "Minimum Timeout (override in ms, 0 = default)"), 50, screenManager()));
+	networkingSettings->Add(new PopupSliderChoice(&g_Config.iMinTimeout, 0, 15000, 0, n->T("Minimum Timeout", "Minimum Timeout (override in ms, 0 = default)"), 50, screenManager()))->SetFormat(di->T("%d ms"));
 	networkingSettings->Add(new CheckBox(&g_Config.bForcedFirstConnect, n->T("Forced First Connect", "Forced First Connect (faster Connect)")));
 }
 

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
@@ -1269,7 +1269,6 @@ void NativeTouch(const TouchInput &touch) {
 
 // up, down
 static double g_wheelReleaseTime[2]{};
-static const double RELEASE_TIME = 0.1;  // about 3 frames at 30hz.
 
 static void ProcessWheelRelease(InputKeyCode keyCode, double now, bool keyPress) {
 	int dir = keyCode - NKCODE_EXT_MOUSEWHEEL_UP;
@@ -1283,7 +1282,8 @@ static void ProcessWheelRelease(InputKeyCode keyCode, double now, bool keyPress)
 	}
 
 	if (keyPress) {
-		g_wheelReleaseTime[dir] = now + RELEASE_TIME;
+		float releaseTime = (float)g_Config.iMouseWheelUpDelayMs * (1.0f / 1000.0f);
+		g_wheelReleaseTime[dir] = now + releaseTime;
 	}
 }
 

diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1600,6 +1600,8 @@ public boolean processCommand(String command, String params) {
 				throw new Exception();
 			} catch (Exception e) {
 				NativeApp.reportException(e, params);
+
+
 			}
 		}
 		return false;

diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -141,6 +141,7 @@ Low end radius = Low end radius
 Mouse = ‎إعدادات الماوس
 Mouse sensitivity = ‎حساسية الماوس
 Mouse smoothing = ‎تنعيم حركة الماوس
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = ‎'M'يمكنك الأن تخطيط الماوس في شاشة التخطيط عن طريق أيقونة .
 None (Disabled) = ‎لا شئ (معطل)
 Off = ‎مغلق
@@ -349,6 +350,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = ‎* PSP حجم
 Active = Active

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = Нищо (изключено)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -133,6 +133,7 @@ Low end radius = Ràdio inferior
 Mouse = Configuració del ratolí
 Mouse sensitivity = Sensibilitat del ratolí
 Mouse smoothing = Suavitat del ratolí
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Podeu mapejar el ratolí als paràmetres de control prement la icona 'M'.
 None (Disabled) = Desactivat
 Off = No
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d segons
 * PSP res = * resolució PSP
 Active = Actiu

diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = Žádné (zakázáno)
 Off = Vypnuto
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d vteřin
 * PSP res = * PSP rozlišení
 Active = Active

diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Instillinger af mus
 Mouse sensitivity = Følsomhed af muss
 Mouse smoothing = Udjævning af mus
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Du kan nu mappe musen i kontrol mapningsskærmen ved at trykke på 'M' ikonet.
 None (Disabled) = Ingen (deaktiveret)
 Off = Slukket
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d sekunder
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Einstellung für Maussteuerung
 Mouse sensitivity = Mausempfindlichkeit
 Mouse smoothing = Mausglättung
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Nun können Sie in der Tastenbelegung die Maustasten benutzen in dem Sie auf das 'M' Symbol klicken.
 None (Disabled) = Kein (Deaktiviert)
 Off = Aus
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d Sekunden
 * PSP res = * PSP Auflösung
 Active = Aktiv

diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -157,6 +157,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Off
@@ -365,6 +366,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
@@ -133,6 +133,7 @@ Low end radius = Radio inferior
 Mouse = Ajustes de ratón
 Mouse sensitivity = Sensibilidad del ratón
 Mouse smoothing = Suavidad del ratón
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Puedes mapear el ratón en los ajustes de controles presionando el icono 'M'.
 None (Disabled) = Desactivado
 Off = No
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d segundos
 * PSP res = * resolución PSP
 Active = Activo

diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
@@ -133,6 +133,7 @@ Low end radius = Radio inferior
 Mouse = Ajustes de ratón
 Mouse sensitivity = Sensibilidad del ratón
 Mouse smoothing = Suavidad del ratón
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Puedes controlar el ratón en la pantalla de controles presionando el icono 'M'.
 None (Disabled) = Desactivado
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Activo

diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
@@ -133,6 +133,7 @@ Low end radius = شعاع کم پایان
 Mouse = ‎تنظیمات موس
 Mouse sensitivity = ‎حساسیت موس
 Mouse smoothing = ‎روان کردن حرکت موس
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = ‎در قسمت تنظیمات کنترلر میتوانید از دکمه های موس استفاده کنید M با انتخاب آیکون
 None (Disabled) = ‎هیچ کدام (غیر فعال)
 Off = ‎خاموش
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Hiiren herkkyys
 Mouse smoothing = Hiiren tasoitus
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Pois
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Paramètres de la souris
 Mouse sensitivity = Sensibilité de la souris
 Mouse smoothing = Lissage du déplacement de la souris
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Vous pouvez maintenant utiliser la souris dans l'écran de réassignation des touches en cliquant sur le bouton "M".
 None (Disabled) = Désactivée
 Off = Désactivé
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d secondes
 * PSP res = × définition PSP
 Active = Actif

diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = Desactivado
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Ρυθμίσεις ποντικιού
 Mouse sensitivity = Ευαισθησία ποντικιού
 Mouse smoothing = Εξομάλυνση ποντικιού
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Τωρα μπορείτε να ρυθμίσετε το ποντίκι στην οθόνη χαρτογράφησης ελέγχου πατώντας το εικονίδιο "M".
 None (Disabled) = Κανένα (απενεργοποιημένο)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d δευτερόλεπτα
 * PSP res = * ανάλυση PSP
 Active = ΕΝΕΡΓΟ

diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Mouse settings
 Mouse sensitivity = Mouse sensitivity
 Mouse smoothing = Mouse smoothing
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = You can now map mouse in control mapping screen by pressing the 'M' icon.
 None (Disabled) = None (disabled)
 Off = Off
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d seconds
 * PSP res = * PSP res
 Active = Active

diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Postavke miša
 Mouse sensitivity = Senzitivnost miša
 Mouse smoothing = Izglađivanje miša
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Sada možeš postaviti miš u ekranu postavljanja kontroli pritiskajuci 'M' tipku.
 None (Disabled) = Nema (Isključeno)
 Off = Isključeno
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d sekundi
 * PSP res = * PSP res
 Active = Aktivno

diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
@@ -133,6 +133,7 @@ Low end radius = Low end radius
 Mouse = Egér beállítások
 Mouse sensitivity = Egér érzékenység
 Mouse smoothing = Egér simítás
+Mouse wheel button-release delay = Mouse wheel button-release delay
 MouseControl Tip = Az 'M' ikonra kattintva egérgombokat is társíthatsz a különböző gombokhoz.
 None (Disabled) = Nincs (letiltva)
 Off = Ki
@@ -341,6 +342,7 @@ Vertex = Vertex
 VFPU = VFPU
 
 [Dialog]
+%d ms = %d ms
 %d seconds = %d másodpercig
 * PSP res = * PSP felbontás
 Active = Aktív