skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show alt key on mac as `"Option"`, not `"Alt"` (#2981)

This commit is contained in:
Andreas Reich 2023-05-10 09:35:01 +02:00 committed by GitHub
parent e9fa6c8ff6
commit 268a63fee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/egui/src/data/input.rs
View File

@ -534,6 +534,7 @@ pub struct ModifierNames<'a> {
pub ctrl: &'a str, pub ctrl: &'a str,
pub shift: &'a str, pub shift: &'a str,
pub mac_cmd: &'a str, pub mac_cmd: &'a str,
pub mac_alt: &'a str,
/// What goes between the names /// What goes between the names
pub concat: &'a str, pub concat: &'a str,
@ -547,6 +548,7 @@ impl ModifierNames<'static> {
ctrl: "^", ctrl: "^",
shift: "⇧", shift: "⇧",
mac_cmd: "⌘", mac_cmd: "⌘",
mac_alt: "⌥",
concat: "", concat: "",
}; };
@ -557,6 +559,7 @@ impl ModifierNames<'static> {
ctrl: "Ctrl", ctrl: "Ctrl",
shift: "Shift", shift: "Shift",
mac_cmd: "Cmd", mac_cmd: "Cmd",
mac_alt: "Option",
concat: "+", concat: "+",
}; };
} }
@ -577,7 +580,7 @@ impl<'a> ModifierNames<'a> {
if is_mac { if is_mac {
append_if(modifiers.ctrl, self.ctrl); append_if(modifiers.ctrl, self.ctrl);
append_if(modifiers.shift, self.shift); append_if(modifiers.shift, self.shift);
append_if(modifiers.alt, self.alt); append_if(modifiers.alt, self.mac_alt);
append_if(modifiers.mac_cmd || modifiers.command, self.mac_cmd); append_if(modifiers.mac_cmd || modifiers.command, self.mac_cmd);
} else { } else {
append_if(modifiers.ctrl || modifiers.command, self.ctrl); append_if(modifiers.ctrl || modifiers.command, self.ctrl);