djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug in keyboard shortcut formatting

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-11-27 22:03:42 +01:00
parent c5e6def65e
commit a3f1e5961f
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/egui/src/data/input.rs
View file

@ -546,7 +546,7 @@ impl<'a> ModifierNames<'a> {
append_if(modifiers.alt, self.alt); append_if(modifiers.alt, self.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, self.ctrl); append_if(modifiers.ctrl || modifiers.command, self.ctrl);
append_if(modifiers.alt, self.alt); append_if(modifiers.alt, self.alt);
append_if(modifiers.shift, self.shift); append_if(modifiers.shift, self.shift);
} }
@ -789,6 +789,21 @@ impl KeyboardShortcut {
} }
} }
#[test]
fn format_kb_shortcut() {
let cmd_shift_f = KeyboardShortcut::new(Modifiers::COMMAND | Modifiers::SHIFT, Key::F);
assert_eq!(
cmd_shift_f.format(&ModifierNames::NAMES, false),
"Ctrl+Shift+F"
);
assert_eq!(
cmd_shift_f.format(&ModifierNames::NAMES, true),
"Shift+Cmd+F"
);
assert_eq!(cmd_shift_f.format(&ModifierNames::SYMBOLS, false), "^⇧F");
assert_eq!(cmd_shift_f.format(&ModifierNames::SYMBOLS, true), "⇧⌘F");
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
impl RawInput { impl RawInput {