chatterino2
Code Issues

fix: don't set binding for "toggle local r9k" on macOS (#5764)

Browse Source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Jacob Alexander Thompson
2025-03-22 08:14:07 -07:00
committed by GitHub
parent 9d0de1c373
commit b6945e39f4
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -6,6 +6,7 @@
- Minor: Moved the "Delete message" menu option into a "Moderate" sub-menu. (#6100) - 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 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: 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 <kbd>CTRL</kbd> + <kdb>H</kdb> before, which clashes with a system binding. (#5764)
- Dev: Temporarily disable precompiled header support for macOS. (#6104) - Dev: Temporarily disable precompiled header support for macOS. (#6104)
## 2.5.3-beta.1 ## 2.5.3-beta.1
src/controllers/hotkeys/HotkeyController.cpp
+2
View File
@@ -515,9 +515,11 @@ void HotkeyController::addDefaults(std::set<QString> &addedHotkeys)
QKeySequence("Ctrl+G"), "reopenSplit", QKeySequence("Ctrl+G"), "reopenSplit",
std::vector<QString>(), "reopen split"); std::vector<QString>(), "reopen split");
#ifndef Q_OS_MACOS
this->tryAddDefault(addedHotkeys, HotkeyCategory::Window, this->tryAddDefault(addedHotkeys, HotkeyCategory::Window,
QKeySequence("Ctrl+H"), "toggleLocalR9K", QKeySequence("Ctrl+H"), "toggleLocalR9K",
std::vector<QString>(), "toggle local r9k"); std::vector<QString>(), "toggle local r9k");
#endif
this->tryAddDefault(addedHotkeys, HotkeyCategory::Window, this->tryAddDefault(addedHotkeys, HotkeyCategory::Window,
QKeySequence("Ctrl+K"), "openQuickSwitcher", QKeySequence("Ctrl+K"), "openQuickSwitcher",