Fix unfriendly keybind modifiers (#1809)

* Update LoaderImpl.cpp

* turn set into member of LoaderImpl

also fix issue with overlapping keybinds

Author: Vinsterplays

loader/src/loader/LoaderImpl.cpp

@@ -390,9 +390,23 @@ void Loader::Impl::populateModList(std::vector<ModMetadata>& modQueue) {
             Keybind keybind(data.key, data.modifiers);
             bool down = data.action != KeyboardInputData::Action::Release;
             bool repeat = data.action == KeyboardInputData::Action::Repeat;
-            for (auto& setting : m_keybindSettings[keybind]) {
-                if (KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp)) {
-                    return ListenerResult::Stop;
+            if (down) {
+                auto it = m_keybindSettings.find(keybind);
+                if (it != m_keybindSettings.end()) {
+                    for (auto& setting : it->second) {
+                        if (!repeat) m_activeKeybinds[setting.get()] = keybind;
+                        if (KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(keybind, down, repeat, data.timestamp)) {
+                            return ListenerResult::Stop;
+                        }
+                    }
+                }
+            } else {
+                for (auto& [setting, heldKeybind] : m_activeKeybinds) {
+                    if (heldKeybind.key == data.key) {
+                        KeybindSettingPressedEventV3(setting->getModID(), setting->getKey()).send(heldKeybind, down, repeat, data.timestamp);
+                        m_activeKeybinds.erase(setting);
+                        break;
+                    }
                 }
             }
             return ListenerResult::Propagate;

loader/src/loader/LoaderImpl.hpp

@@ -161,6 +161,7 @@ namespace geode {
         std::optional<std::string> getBinaryPath() const;
 
         std::unordered_map<Keybind, std::vector<std::shared_ptr<KeybindSettingV3>>> m_keybindSettings;
+        std::unordered_map<KeybindSettingV3*, Keybind> m_activeKeybinds;
         void onKeybindSettingChanged(std::shared_ptr<KeybindSettingV3> setting, std::vector<Keybind> const& keybinds);
     };