Skip to content

Commit

Permalink
fix: crossterm -> input key conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
archseer committed Jun 25, 2021
1 parent 4418e17 commit 8e277ad
Showing 1 changed file with 12 additions and 16 deletions.
28 changes: 12 additions & 16 deletions helix-view/src/keyboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ impl From<KeyModifiers> for crossterm::event::KeyModifiers {

let mut result = CKeyModifiers::NONE;

if key_modifiers & KeyModifiers::SHIFT != KeyModifiers::NONE {
result &= CKeyModifiers::SHIFT;
if key_modifiers.contains(KeyModifiers::SHIFT) {
result.insert(CKeyModifiers::SHIFT);
}

if key_modifiers & KeyModifiers::CONTROL != KeyModifiers::NONE {
result &= CKeyModifiers::CONTROL;
if key_modifiers.contains(KeyModifiers::CONTROL) {
result.insert(CKeyModifiers::CONTROL);
}

if key_modifiers & KeyModifiers::ALT != KeyModifiers::NONE {
result &= CKeyModifiers::ALT;
if key_modifiers.contains(KeyModifiers::ALT) {
result.insert(CKeyModifiers::ALT);
}

result
Expand All @@ -41,16 +39,14 @@ impl From<crossterm::event::KeyModifiers> for KeyModifiers {

let mut result = KeyModifiers::NONE;

if val & CKeyModifiers::SHIFT != CKeyModifiers::NONE {
result &= KeyModifiers::SHIFT;
if val.contains(CKeyModifiers::SHIFT) {
result.insert(KeyModifiers::SHIFT);
}

if val & CKeyModifiers::CONTROL != CKeyModifiers::NONE {
result &= KeyModifiers::CONTROL;
if val.contains(CKeyModifiers::CONTROL) {
result.insert(KeyModifiers::CONTROL);
}

if val & CKeyModifiers::ALT != CKeyModifiers::NONE {
result &= KeyModifiers::ALT;
if val.contains(CKeyModifiers::ALT) {
result.insert(KeyModifiers::ALT);
}

result
Expand Down

2 comments on commit 8e277ad

@Kethku
Copy link
Contributor

@Kethku Kethku commented on 8e277ad Jun 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. Didn't know what the right way to do this was...

@pickfire
Copy link
Contributor

@pickfire pickfire commented on 8e277ad Jun 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kethku No worries, bitflags need some different handling, so others can easily make mistake here.

Please sign in to comment.