dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-07-05 11:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better Input keyboard event handling

Browse source
This commit is contained in:
Jonathan Johnson 2023-11-08 11:21:45 -08:00
parent bf9836a82b
commit a8cd3df22c
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/login.rs
View file

@ -47,7 +47,12 @@ fn main() -> gooey::Result {
), ),
]), ]),
Stack::columns(children![ Stack::columns(children![
Button::new("Cancel").on_click(|_| exit(0)).into_escape(), Button::new("Cancel")
.on_click(|_| {
eprintln!("Login cancelled");
exit(0)
})
.into_escape(),
Expand::empty(), Expand::empty(),
Button::new("Log In") Button::new("Log In")
.on_click(move |_| { .on_click(move |_| {

22
src/widgets/input.rs
View file

@ -3,7 +3,7 @@ use std::fmt::Debug;
use std::panic::UnwindSafe; use std::panic::UnwindSafe;
use std::time::Duration; use std::time::Duration;
use kludgine::app::winit::event::{Ime, KeyEvent}; use kludgine::app::winit::event::{ElementState, Ime, KeyEvent};
use kludgine::app::winit::keyboard::Key; use kludgine::app::winit::keyboard::Key;
use kludgine::cosmic_text::{Action, Attrs, Buffer, Cursor, Edit, Editor, Metrics, Shaping}; use kludgine::cosmic_text::{Action, Attrs, Buffer, Cursor, Edit, Editor, Metrics, Shaping};
use kludgine::figures::units::{Px, UPx}; use kludgine::figures::units::{Px, UPx};
@ -350,10 +350,6 @@ impl Widget for Input {
on_key.invoke(input.clone())?; on_key.invoke(input.clone())?;
} }
if !input.state.is_pressed() {
return IGNORED;
}
let styles = context.query_styles(&[&TextColor]); let styles = context.query_styles(&[&TextColor]);
let editor = self.editor_mut(context.kludgine, &styles); let editor = self.editor_mut(context.kludgine, &styles);
@ -361,8 +357,8 @@ impl Widget for Input {
// "Keyboard input: {:?}. {:?}, {:?}", // "Keyboard input: {:?}. {:?}, {:?}",
// input.logical_key, input.text, input.physical_key // input.logical_key, input.text, input.physical_key
// ); // );
let (text_changed, handled) = match (input.logical_key, input.text) { let (text_changed, handled) = match (input.state, input.logical_key, input.text) {
(key @ (Key::Backspace | Key::Delete), _) => { (ElementState::Pressed, key @ (Key::Backspace | Key::Delete), _) => {
editor.action( editor.action(
context.kludgine.font_system(), context.kludgine.font_system(),
match key { match key {
@ -373,7 +369,7 @@ impl Widget for Input {
); );
(true, HANDLED) (true, HANDLED)
} }
(key @ (Key::ArrowLeft | Key::ArrowDown | Key::ArrowUp | Key::ArrowRight), _) => { (ElementState::Pressed, key @ (Key::ArrowLeft | Key::ArrowDown | Key::ArrowUp | Key::ArrowRight), _) => {
let modifiers = context.modifiers(); let modifiers = context.modifiers();
match (editor.select_opt(), modifiers.state().shift_key()) { match (editor.select_opt(), modifiers.state().shift_key()) {
(None, true) => { (None, true) => {
@ -399,17 +395,19 @@ impl Widget for Input {
); );
(false, HANDLED) (false, HANDLED)
} }
(_, Some(text)) (state, _, Some(text))
if !context.modifiers().primary() if !context.modifiers().primary()
&& text != "\t" // tab && text != "\t" // tab
&& text != "\r" // enter/return && text != "\r" // enter/return
&& text != "\u{1b}" // escape && text != "\u{1b}" // escape
=> =>
{ {
editor.insert_string(dbg!(&text), None); if state.is_pressed() {
(true, HANDLED) editor.insert_string(&text, None);
}
(state.is_pressed(), HANDLED)
} }
(_, _) => (false, IGNORED), (_, _, _) => (false, IGNORED),
}; };
if handled.is_break() { if handled.is_break() {