SDL_HINT_MOUSE_RELATIVE_SYSTEM_SCALE can be combined with SDL_HINT_MO…

…USE_RELATIVE_SPEED_SCALE
libsdl-org · Jan 12, 2025 · 551510c · 551510c
1 parent 95c1584
commit 551510c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/SDL3/SDL_hints.h b/include/SDL3/SDL_hints.h
@@ -2534,8 +2534,7 @@ extern "C" {
  * - "1": Relative mouse motion will be scaled using the system mouse
  *   acceleration curve.
  *
- * If SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE is set, that will override the
- * system speed scale.
+ * If SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE is set, that will apply before the system speed scale.
  *
  * This hint can be set anytime.
  *

diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
@@ -672,10 +672,9 @@ static void SDL_PrivateSendMouseMotion(Uint64 timestamp, SDL_Window *window, SDL
             if (mouse->enable_relative_speed_scale) {
                 x *= mouse->relative_speed_scale;
                 y *= mouse->relative_speed_scale;
-            } else if (mouse->enable_relative_system_scale) {
-                if (mouse->ApplySystemScale) {
-                    mouse->ApplySystemScale(mouse->system_scale_data, timestamp, window, mouseID, &x, &y);
-                }
+            }
+            if (mouse->enable_relative_system_scale && mouse->ApplySystemScale) {
+                mouse->ApplySystemScale(mouse->system_scale_data, timestamp, window, mouseID, &x, &y);
             }
         } else {
             if (mouse->enable_normal_speed_scale) {