From b6945e39f403cfe3fe306ab56efa2aac729e858b Mon Sep 17 00:00:00 2001 From: Jacob Alexander Thompson Date: Sat, 22 Mar 2025 08:14:07 -0700 Subject: [PATCH] fix: don't set binding for "toggle local r9k" on macOS (#5764) Co-authored-by: Rasmus Karlsson --- CHANGELOG.md | 1 + src/controllers/hotkeys/HotkeyController.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1e5487..e578e4e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Minor: Moved the "Delete message" menu option into a "Moderate" sub-menu. (#6100) - Bugfix: Fixed the channel name input not being focused when opening the select-channel dialog. (#6096) - Bugfix: Fixed inputs in dialogs not having a border around and padding in them. (#6098) +- Bugfix: Don't set default binding for "Toggle local R9K" on macOS. Was CTRL + H before, which clashes with a system binding. (#5764) - Dev: Temporarily disable precompiled header support for macOS. (#6104) ## 2.5.3-beta.1 diff --git a/src/controllers/hotkeys/HotkeyController.cpp b/src/controllers/hotkeys/HotkeyController.cpp index 1aa6e7c9..48a57211 100644 --- a/src/controllers/hotkeys/HotkeyController.cpp +++ b/src/controllers/hotkeys/HotkeyController.cpp @@ -515,9 +515,11 @@ void HotkeyController::addDefaults(std::set &addedHotkeys) QKeySequence("Ctrl+G"), "reopenSplit", std::vector(), "reopen split"); +#ifndef Q_OS_MACOS this->tryAddDefault(addedHotkeys, HotkeyCategory::Window, QKeySequence("Ctrl+H"), "toggleLocalR9K", std::vector(), "toggle local r9k"); +#endif this->tryAddDefault(addedHotkeys, HotkeyCategory::Window, QKeySequence("Ctrl+K"), "openQuickSwitcher",