git.iko.soy/helix
on master help sign in
fix: crossterm -> input key conversion
8e277adBlaž Hrastnik
helix-view/src/keyboard.rs+12−16
compare with master
unifiedsplit
@@ -18,16 +18,14 @@ impl From<KeyModifiers> for crossterm::event::KeyModifiers {
18
18
19 let mut result = CKeyModifiers::NONE;
19 let mut result = CKeyModifiers::NONE;
20
20
21− if key_modifiers & KeyModifiers::SHIFT != KeyModifiers::NONE {
21+ if key_modifiers.contains(KeyModifiers::SHIFT) {
22− result &= CKeyModifiers::SHIFT;
22+ result.insert(CKeyModifiers::SHIFT);
23 }
23 }
24−
25− if key_modifiers & KeyModifiers::CONTROL != KeyModifiers::NONE {
24+ if key_modifiers.contains(KeyModifiers::CONTROL) {
26− result &= CKeyModifiers::CONTROL;
25+ result.insert(CKeyModifiers::CONTROL);
27 }
26 }
28−
29− if key_modifiers & KeyModifiers::ALT != KeyModifiers::NONE {
27+ if key_modifiers.contains(KeyModifiers::ALT) {
30− result &= CKeyModifiers::ALT;
28+ result.insert(CKeyModifiers::ALT);
31 }
29 }
32
30
33 result
31 result
@@ -41,16 +39,14 @@ impl From<crossterm::event::KeyModifiers> for KeyModifiers {
41
39
42 let mut result = KeyModifiers::NONE;
40 let mut result = KeyModifiers::NONE;
43
41
44− if val & CKeyModifiers::SHIFT != CKeyModifiers::NONE {
42+ if val.contains(CKeyModifiers::SHIFT) {
45− result &= KeyModifiers::SHIFT;
43+ result.insert(KeyModifiers::SHIFT);
46 }
44 }
47−
48− if val & CKeyModifiers::CONTROL != CKeyModifiers::NONE {
45+ if val.contains(CKeyModifiers::CONTROL) {
49− result &= KeyModifiers::CONTROL;
46+ result.insert(KeyModifiers::CONTROL);
50 }
47 }
51−
52− if val & CKeyModifiers::ALT != CKeyModifiers::NONE {
48+ if val.contains(CKeyModifiers::ALT) {
53− result &= KeyModifiers::ALT;
49+ result.insert(KeyModifiers::ALT);
54 }
50 }
55
51
56 result
52 result