diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3cb882..ecbb1eae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Bugfix: Fixed flickering tooltips on Wayland when the mouse cursor is over them. (#6451) - Bugfix: Fixed `c2.Channel` comparing `false` to the same channel. (#6456) - Bugfix: Fixed an issue where the moderation icon was missing from the Moderation tab. (#6457) +- Bugfix: Do not set default hotkeys for focusing splits on macOS, as Option + Arrows are used for cursor navigation. (#6470) - Bugfix: Fixed CMD+Backspace not working in the input on macOS if there was a selection. (#6469) - Dev: Added documentation for WebSockets to `wip-plugins.md`. (#6432) - Dev: Enable the hardened runtime on macOS. (#6467) diff --git a/src/controllers/hotkeys/HotkeyController.cpp b/src/controllers/hotkeys/HotkeyController.cpp index 447c6b76..c5936396 100644 --- a/src/controllers/hotkeys/HotkeyController.cpp +++ b/src/controllers/hotkeys/HotkeyController.cpp @@ -378,6 +378,7 @@ void HotkeyController::addDefaults(std::set &addedHotkeys) QKeySequence("Alt+x"), "createClip", std::vector(), "create clip"); +#ifndef Q_OS_MACOS this->tryAddDefault(addedHotkeys, HotkeyCategory::Split, QKeySequence("Alt+left"), "focus", {"left"}, "focus left"); @@ -390,6 +391,7 @@ void HotkeyController::addDefaults(std::set &addedHotkeys) this->tryAddDefault(addedHotkeys, HotkeyCategory::Split, QKeySequence("Alt+right"), "focus", {"right"}, "focus right"); +#endif this->tryAddDefault(addedHotkeys, HotkeyCategory::Split, QKeySequence("PgUp"), "scrollPage", {"up"},