0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9173

Browse source
This commit is contained in:
Iris Morelle 2024-08-22 17:00:32 -04:00
commit 1ae764bd35
No known key found for this signature in database
GPG key ID: BB9666228F278524
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog_entries/macos-option-key-label.md Normal file
View file

@ -0,0 +1,2 @@
### User interface
* Option key is now identified as such instead of Alt in the Hotkeys preferences section on macOS builds

4
src/hotkey/hotkey_item.cpp
View file

@ -55,7 +55,11 @@ const std::string hotkey_base::get_name() const
ret += (!ret.empty() && !boost::algorithm::ends_with(ret, "+") ? "+" : "");
if(mod_ & KMOD_ALT) {
#ifdef __APPLE__
ret += "opt";
#else
ret += "alt";
#endif
}
ret += (!ret.empty() && !boost::algorithm::ends_with(ret, "+") ? "+" : "");