Skip to content

Commit

Permalink
Added KeyRepeat event. (#2389)
Browse files Browse the repository at this point in the history
KeyPress no longer repeats.

Co-authored-by: Mike Krueger <mkrueger@posteo.de>
  • Loading branch information
mkrueger and Mike Krueger committed Dec 5, 2022
1 parent 3519358 commit ee25829
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 18 deletions.
8 changes: 8 additions & 0 deletions crates/egui/src/data/input.rs
Expand Up @@ -191,6 +191,14 @@ pub enum Event {
modifiers: Modifiers,
},

/// A key was repeated while pressed.
KeyRepeat {
key: Key,

/// The state of the modifier keys at the time of the event.
modifiers: Modifiers,
},

/// The mouse or touch moved to a new place.
PointerMoved(Pos2),

Expand Down
46 changes: 28 additions & 18 deletions crates/egui/src/input_state.rs
Expand Up @@ -164,26 +164,36 @@ impl InputState {
let mut keys_down = self.keys_down;
let mut scroll_delta = Vec2::ZERO;
let mut zoom_factor_delta = 1.0;
new.events.retain(|event| match event {
Event::Key { key, pressed, .. } => {
if *pressed {
// We only retain presses that are novel (i.e. the first Press event, not those generated by key-repeat)
keys_down.insert(*key)
} else {
keys_down.remove(key);
true
for event in &mut new.events {
match event {
Event::Key {
key,
pressed,
modifiers,
} => {
if *pressed {
// We only retain presses that are novel (i.e. the first Press event, not those generated by key-repeat)
// key repeats are represented by KeyRepeat.
if !keys_down.insert(*key) {
*event = Event::KeyRepeat {
key: *key,
modifiers: *modifiers,
};
}
} else {
keys_down.remove(key);
}
}
Event::Scroll(delta) => {
scroll_delta += *delta;
}
Event::Zoom(factor) => {
zoom_factor_delta *= *factor;
}
_ => {}
}
Event::Scroll(delta) => {
scroll_delta += *delta;
true
}
Event::Zoom(factor) => {
zoom_factor_delta *= *factor;
true
}
_ => true,
});
}

InputState {
pointer,
touch_states: self.touch_states,
Expand Down

0 comments on commit ee25829

Please sign in to comment.