Merge branch 'master' into fix-touch-framestatistics

ppy · Nov 10, 2023 · 79bcefa · 79bcefa
2 parents e2c8f7e + d670ab5
commit 79bcefa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/osu.Framework.Templates/README.md b/osu.Framework.Templates/README.md
@@ -7,7 +7,7 @@ Templates to use when starting off with osu!framework. Create a fully-testable,
 ```bash
 # install (or update) template package.
 # this only needs to be done once
-dotnet new install ppy.osu.Framework.Templates
+dotnet new -i ppy.osu.Framework.Templates
 
 ## IMPORTANT: Do not use spaces or hyphens in your project name for the following commands.
 ## This does not play nice with the templating system.

diff --git a/osu.Framework/Platform/SDL2Window.cs b/osu.Framework/Platform/SDL2Window.cs
@@ -233,7 +233,8 @@ public virtual void Create()
             SDL.SDL_SetHint(SDL.SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1");
             SDL.SDL_SetHint(SDL.SDL_HINT_IME_SHOW_UI, "1");
             SDL.SDL_SetHint(SDL.SDL_HINT_MOUSE_RELATIVE_MODE_CENTER, "0");
-            SDL.SDL_SetHint(SDL.SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
+            SDL.SDL_SetHint(SDL.SDL_HINT_TOUCH_MOUSE_EVENTS, "0"); // disable touch events generating synthetic mouse events on desktop platforms
+            SDL.SDL_SetHint(SDL.SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); // disable mouse events generating synthetic touch events on mobile platforms
 
             // we want text input to only be active when SDL2DesktopWindowTextInput is active.
             // SDL activates it by default on some platforms: https://github.com/libsdl-org/SDL/blob/release-2.0.16/src/video/SDL_video.c#L573-L582