1.10.3 (Reset button bugfix + Command/Control/Arrow bugfix) (#89)

* Fix reset button appearing for default keybinds

* Long-awaited fixes

* Changelogger

* Add editor zooming hack

* Small oversight

---------

Co-authored-by: Jasmine <[email protected]>

Author: hiimjasmine00

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(CustomKeybinds VERSION 1.10.1)
+project(CustomKeybinds VERSION 1.10.3)
 
 file(GLOB SOURCES
 	src/*.hpp

changelog.md

@@ -1,4 +1,9 @@
 # Changelog
+## v1.10.3
+- Fixed reset button appearing for default keybinds
+- Fixed command/control and arrow key keybinds not working on MacOS
+  - Thanks hiimjasmine00!
+
 ## v1.10.2
 - MacOS support
   - Thanks hiimjasmine00!

include/Keybinds.hpp

@@ -61,11 +61,6 @@ namespace keybinds {
         Shift       = 0b0010,
         Alt         = 0b0100,
         Command     = 0b1000,
-    #ifdef GEODE_IS_MACOS
-        PlatformControl = Command,
-    #else
-        PlatformControl = Control,
-    #endif
     };
     CUSTOM_KEYBINDS_DLL Modifier operator|(Modifier const& a, Modifier const& b);
     CUSTOM_KEYBINDS_DLL Modifier operator|=(Modifier& a, Modifier const& b);

mod.json

@@ -5,7 +5,7 @@
 		"android": "2.2074",
 		"mac": "2.2074"
 	},
-	"version": "v1.10.2",
+	"version": "v1.10.3",
 	"id": "geode.custom-keybinds",
 	"name": "Custom Keybinds",
 	"developer": "Geode Team",

src/EditorUI.cpp

@@ -9,32 +9,6 @@
 using namespace geode::prelude;
 using namespace keybinds;
 
-// TODO: move this to header in 1.2.0
-
-class EvilBypass : public CCKeyboardDispatcher {
-public:
-    bool setControlPressed(bool pressed) {
-        auto old = m_bControlPressed;
-        m_bControlPressed = pressed;
-        return old;
-    }
-    bool setCommandPressed(bool pressed) {
-        auto old = m_bCommandPressed;
-        m_bCommandPressed = pressed;
-        return old;
-    }
-    bool setShiftPressed(bool pressed) {
-        auto old = m_bShiftPressed;
-        m_bShiftPressed = pressed;
-        return old;
-    }
-    bool setAltPressed(bool pressed) {
-        auto old = m_bAltPressed;
-        m_bAltPressed = pressed;
-        return old;
-    }
-};
-
 struct $modify(EditorPauseLayer) {
     static void onModify(auto& self) {
         (void)self.setHookPriority("EditorPauseLayer::keyDown", 1000);
@@ -129,28 +103,28 @@ struct $modify(EditorUI) {
                 this->passThroughKeyDown(KEY_Delete);
             });
             this->defineKeybind("robtop.geometry-dash/undo", [this] {
-                this->passThroughKeyDown(KEY_Z, Modifier::PlatformControl);
+                this->passThroughKeyDown(KEY_Z, Modifier::Control);
             });
             this->defineKeybind("robtop.geometry-dash/redo", [this] {
-                this->passThroughKeyDown(KEY_Z, Modifier::PlatformControl | Modifier::Shift);
+                this->passThroughKeyDown(KEY_Z, Modifier::Control | Modifier::Shift);
             });
             this->defineKeybind("robtop.geometry-dash/deselect-all", [this] {
                 this->passThroughKeyDown(KEY_D, Modifier::Alt);
             });
             this->defineKeybind("robtop.geometry-dash/copy", [this] {
-                this->passThroughKeyDown(KEY_C, Modifier::PlatformControl);
+                this->passThroughKeyDown(KEY_C, Modifier::Control);
             });
             this->defineKeybind("robtop.geometry-dash/paste", [this] {
-                this->passThroughKeyDown(KEY_V, Modifier::PlatformControl);
+                this->passThroughKeyDown(KEY_V, Modifier::Control);
             });
             this->defineKeybind("robtop.geometry-dash/copy-paste", [this] {
-                this->passThroughKeyDown(KEY_D, Modifier::PlatformControl);
+                this->passThroughKeyDown(KEY_D, Modifier::Control);
             });
             this->defineKeybind("robtop.geometry-dash/toggle-rotate", [this] {
                 this->passThroughKeyDown(KEY_R);
             });
             this->defineKeybind("robtop.geometry-dash/toggle-transform", [this] {
-                this->passThroughKeyDown(KEY_T, Modifier::PlatformControl);
+                this->passThroughKeyDown(KEY_T, Modifier::Control);
             });
             this->defineKeybind("robtop.geometry-dash/toggle-free-move", [this] {
                 this->passThroughKeyDown(KEY_F);
@@ -166,7 +140,7 @@ struct $modify(EditorUI) {
             });
             this->defineKeybind("robtop.geometry-dash/playback-music", [this] {
                 // RobTop broke this in 2.2, which makes it trigger the playtest keybind
-                // this->passThroughKeyDown(KEY_Enter, Modifier::PlatformControl);
+                // this->passThroughKeyDown(KEY_Enter, Modifier::Control);
                 EditorUI::onPlayback(nullptr);
             });
             this->defineKeybind("robtop.geometry-dash/prev-build-tab", [this] {
@@ -249,7 +223,7 @@ struct $modify(EditorUI) {
                 auto x = std::to_string(i);
                 auto key = static_cast<enumKeyCodes>(KEY_Zero + i);
                 this->defineKeybind("robtop.geometry-dash/save-editor-position-" + x, [this, key] {
-                    this->passThroughKeyDown(key, Modifier::PlatformControl);
+                    this->passThroughKeyDown(key, Modifier::Control);
                 });
                 this->defineKeybind("robtop.geometry-dash/load-editor-position-" + x, [this, key] {
                     this->passThroughKeyDown(key, Modifier::Alt);
@@ -298,16 +272,20 @@ struct $modify(EditorUI) {
 
     void passThroughKeyDown(enumKeyCodes key, Modifier modifiers = Modifier::None) {
         s_allowPassThrough = true;
-        auto d = static_cast<EvilBypass*>(CCKeyboardDispatcher::get());
-        auto alt = d->setAltPressed(modifiers & Modifier::Alt);
-        auto shift = d->setShiftPressed(modifiers & Modifier::Shift);
-        auto ctrl = d->setControlPressed(modifiers & Modifier::Control);
-        auto cmd = d->setCommandPressed(modifiers & Modifier::Command);
+        auto d = CCKeyboardDispatcher::get();
+        auto alt = d->m_bAltPressed;
+        auto shift = d->m_bShiftPressed;
+        auto ctrl = d->m_bControlPressed;
+        auto cmd = d->m_bCommandPressed;
+        d->m_bAltPressed = modifiers & Modifier::Alt;
+        d->m_bShiftPressed = modifiers & Modifier::Shift;
+        d->m_bControlPressed = modifiers & Modifier::Control;
+        d->m_bCommandPressed = modifiers & Modifier::Command;
         this->keyDown(key);
-        d->setAltPressed(alt);
-        d->setShiftPressed(shift);
-        d->setControlPressed(ctrl);
-        d->setCommandPressed(cmd);
+        d->m_bAltPressed = alt;
+        d->m_bShiftPressed = shift;
+        d->m_bControlPressed = ctrl;
+        d->m_bCommandPressed = cmd;
     }
 
     void keyDown(enumKeyCodes key) {
@@ -325,6 +303,15 @@ struct $modify(EditorUI) {
             EditorUI::keyUp(key);
         }
     }
+    #ifdef GEODE_IS_MACOS // Editor zooming hack
+    void scrollWheel(float y, float x) {
+        auto d = CCKeyboardDispatcher::get();
+        auto ctrl = d->m_bControlPressed;
+        d->m_bControlPressed = ctrl || d->m_bCommandPressed;
+        EditorUI::scrollWheel(y, x);
+        d->m_bControlPressed = ctrl;
+    }
+    #endif
 };
 
 $execute {
@@ -496,14 +483,14 @@ struct $modify(EditorUI) {
         "robtop.geometry-dash/next-layer",
         "Next Layer",
         "Go to Next Editor Layer",
-        { Keybind::create(KEY_Right, Modifier::None) },
+        { Keybind::create(KEY_Right, Modifier::None), GEODE_MACOS(Keybind::create(KEY_ArrowRight, Modifier::None)) },
         Category::EDITOR_UI, true
     });
     BindManager::get()->registerBindable({
         "robtop.geometry-dash/prev-layer",
         "Previous Layer",
         "Go to Previous Editor Layer",
-        { Keybind::create(KEY_Left, Modifier::None) },
+        { Keybind::create(KEY_Left, Modifier::None), GEODE_MACOS(Keybind::create(KEY_ArrowLeft, Modifier::None)) },
         Category::EDITOR_UI, true
     });
     BindManager::get()->registerBindable({

src/Keybind.cpp

@@ -37,7 +37,7 @@ Modifier Keybind::getModifiers() const {
 }
 
 size_t Keybind::getHash() const {
-    return m_key | (static_cast<int>(m_modifiers) << 29);
+    return static_cast<size_t>(m_key) | (static_cast<size_t>(m_modifiers) << 29);
 }
 
 bool Keybind::isEqual(Bind* other) const {

src/Keybinds.cpp

@@ -536,6 +536,10 @@ std::vector<Ref<Bind>> BindManager::getBindsFor(ActionID const& action) const {
             binds.push_back(bind.bind);
         }
     }
+    // since they aren't always sorted correctly...
+    std::sort(binds.begin(), binds.end(), [](auto const& a, auto const& b) {
+        return a->getHash() < b->getHash();
+    });
     return binds;
 }
 

src/UILayer.cpp

@@ -309,7 +309,11 @@ struct $modify(UILayer) {
         "robtop.geometry-dash/jump-p2",
         "Jump P2",
         "Player 2 Jump",
-        { Keybind::create(KEY_Up), ControllerBind::create(CONTROLLER_LB) },
+        {
+            Keybind::create(KEY_Up),
+            GEODE_MACOS(Keybind::create(KEY_ArrowUp, Modifier::None),)
+            ControllerBind::create(CONTROLLER_LB)
+        },
         Category::PLAY,
         false
     });
@@ -343,6 +347,7 @@ struct $modify(UILayer) {
         "Player 2 move left",
         {
             Keybind::create(KEY_Left),
+            GEODE_MACOS(Keybind::create(KEY_ArrowLeft, Modifier::None),)
             ControllerBind::create(CONTROLLER_RTHUMBSTICK_LEFT)
         },
         Category::PLAY,
@@ -354,6 +359,7 @@ struct $modify(UILayer) {
         "Player 2 move right",
         {
             Keybind::create(KEY_Right),
+            GEODE_MACOS(Keybind::create(KEY_ArrowRight, Modifier::None),)
             ControllerBind::create(CONTROLLER_RTHUMBSTICK_RIGHT)
         },
         Category::PLAY,