From 501c6f260aac125dfcc31cb02934562cffebfd88 Mon Sep 17 00:00:00 2001 From: Cameron Bates Date: Tue, 14 Sep 2021 17:22:15 -0400 Subject: [PATCH] Remove mouse invert option and invert gcmouse by default --- core/cfg/option.cpp | 3 --- core/cfg/option.h | 3 --- core/rend/gui.cpp | 3 --- shell/apple/emulator-ios/emulator/ios_mouse.h | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/core/cfg/option.cpp b/core/cfg/option.cpp index 4312b8e8d..8b448f068 100644 --- a/core/cfg/option.cpp +++ b/core/cfg/option.cpp @@ -131,9 +131,6 @@ Option OmxAudioHdmi("audio_hdmi", true, "omx"); // Maple Option MouseSensitivity("MouseSensitivity", 100, "input"); -#ifdef __APPLE__ -Option MouseInvert("MouseInvert", false, "input"); -#endif Option VirtualGamepadVibration("VirtualGamepadVibration", 20, "input"); std::array, 4> MapleMainDevices { diff --git a/core/cfg/option.h b/core/cfg/option.h index 2d40b075a..4ce5ce847 100644 --- a/core/cfg/option.h +++ b/core/cfg/option.h @@ -506,9 +506,6 @@ extern Option OmxAudioHdmi; // Maple extern Option MouseSensitivity; -#ifdef __APPLE__ -extern Option MouseInvert; -#endif extern Option VirtualGamepadVibration; extern std::array, 4> MapleMainDevices; extern std::array, 2>, 4> MapleExpansionDevices; diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp index a8d8b3caa..e7cc7a608 100644 --- a/core/rend/gui.cpp +++ b/core/rend/gui.cpp @@ -1252,9 +1252,6 @@ static void gui_display_settings() ImGui::Spacing(); OptionSlider("Mouse sensitivity", config::MouseSensitivity, 1, 500); -#ifdef __APPLE__ - OptionCheckbox("Invert mouse", config::MouseInvert, "If your vertical mouse input feels wrong try enabling. Only applies to external iOS mice."); -#endif #ifdef _WIN32 OptionCheckbox("Use Raw Input", config::UseRawInput, "Supports multiple pointing devices (mice, light guns) and keyboards"); #endif diff --git a/shell/apple/emulator-ios/emulator/ios_mouse.h b/shell/apple/emulator-ios/emulator/ios_mouse.h index fa1cba369..6d0a4c31a 100644 --- a/shell/apple/emulator-ios/emulator/ios_mouse.h +++ b/shell/apple/emulator-ios/emulator/ios_mouse.h @@ -18,7 +18,7 @@ public: loadMapping(); [gcMouse.mouseInput setMouseMovedHandler:^(GCMouseInput * _Nonnull mouse, float deltaX, float deltaY) { - setRelPos(deltaX, deltaY * (config::MouseInvert ? -1 : 1)); + setRelPos(deltaX, -deltaY); }]; [gcMouse.mouseInput.leftButton setValueChangedHandler: