Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore key-repeat events #2334

Merged
merged 5 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NOTE: [`epaint`](crates/epaint/CHANGELOG.md), [`eframe`](crates/eframe/CHANGELOG
* MSRV (Minimum Supported Rust Version) is now `1.65.0` ([#2314](https://github.com/emilk/egui/pull/2314)).
* ⚠️ BREAKING: egui now expects integrations to do all color blending in gamma space ([#2071](https://github.com/emilk/egui/pull/2071)).
* ⚠️ BREAKING: if you have overlapping interactive widgets, only the top widget (last added) will be interactive ([#2244](https://github.com/emilk/egui/pull/2244)).
* Keyboard press events are only pressent at the frame when the key was pressed, consistent with how key releases work.
emilk marked this conversation as resolved.
Show resolved Hide resolved

### Added ⭐
* Added helper functions for animating panels that collapse/expand ([#2190](https://github.com/emilk/egui/pull/2190)).
Expand Down
42 changes: 24 additions & 18 deletions crates/egui/src/input_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,11 @@ impl Default for InputState {

impl InputState {
#[must_use]
pub fn begin_frame(mut self, new: RawInput, requested_repaint_last_frame: bool) -> InputState {
pub fn begin_frame(
mut self,
mut new: RawInput,
requested_repaint_last_frame: bool,
) -> InputState {
let time = new.time.unwrap_or(self.time + new.predicted_dt as f64);
let unstable_dt = (time - self.time) as f32;

Expand All @@ -160,24 +164,26 @@ impl InputState {
let mut keys_down = self.keys_down;
let mut scroll_delta = Vec2::ZERO;
let mut zoom_factor_delta = 1.0;
for event in &new.events {
match event {
Event::Key { key, pressed, .. } => {
if *pressed {
keys_down.insert(*key);
} else {
keys_down.remove(key);
}
}
Event::Scroll(delta) => {
scroll_delta += *delta;
}
Event::Zoom(factor) => {
zoom_factor_delta *= *factor;
new.events.retain(|event| match event {
Event::Key { key, pressed, .. } => {
if *pressed {
//return false (thus filtering out the Event) if the key already existed in the set of pressed keys
emilk marked this conversation as resolved.
Show resolved Hide resolved
keys_down.insert(*key)
} else {
keys_down.remove(key);
true
}
_ => {}
}
}
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 Expand Up @@ -280,7 +286,7 @@ impl InputState {
self.num_presses(desired_key) > 0
}

/// How many times were the given key pressed this frame?
/// How many times was the given key pressed this frame?
pub fn num_presses(&self, desired_key: Key) -> usize {
self.events
.iter()
Expand Down
13 changes: 13 additions & 0 deletions examples/keyboard_events/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "keyboard_events"
version = "0.1.0"
authors = ["Jose Palazon <[email protected]>"]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.65"
publish = false


[dependencies]
eframe = { path = "../../crates/eframe" }
tracing-subscriber = "0.3"
3 changes: 3 additions & 0 deletions examples/keyboard_events/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```sh
cargo run -p hello_world
```
56 changes: 56 additions & 0 deletions examples/keyboard_events/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release

use eframe::egui;
use egui::*;
fn main() {
// Log to stdout (if you run with `RUST_LOG=debug`).
tracing_subscriber::fmt::init();

let options = eframe::NativeOptions::default();
eframe::run_native(
"Keyboard events",
options,
Box::new(|_cc| Box::new(Content::default())),
);
}

struct Content {
text: String,
}

impl Default for Content {
fn default() -> Self {
Self {
text: "".to_owned(),
}
}
}

impl eframe::App for Content {
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
egui::CentralPanel::default().show(ctx, |ui| {
ui.heading("Press/Hold/Release example");
let text_style = TextStyle::Body;
let row_height = ui.text_style_height(&text_style);
ScrollArea::vertical()
.auto_shrink([false; 2])
.stick_to_bottom(true)
.show_rows(ui, row_height, self.text.len(), |ui, _row_range| {
//for row in row_range {
for line in self.text.lines() {
ui.label(line);
}
});

if ctx.input().key_released(Key::A) {
self.text.push_str("\nReleased");
}
if ctx.input().key_pressed(Key::A) {
self.text.push_str("\npressed");
}
if ctx.input().key_down(Key::A) {
self.text.push_str("\nheld");
}
});
}
}