diff --git a/examples/fonts.rs b/examples/fonts.rs index 6f7b620..c62cade 100644 --- a/examples/fonts.rs +++ b/examples/fonts.rs @@ -18,7 +18,7 @@ pub fn main() { .add_plugins(IcedPlugin { fonts: vec![ALPHAPROTA_FONT_BYTES], settings: iced::Settings { - default_text_size: 40.0, + default_text_size: 40.0.into(), default_font: ALPHAPROTA_FONT, ..Default::default() }, diff --git a/examples/toggle.rs b/examples/toggle.rs index c6f8366..080d878 100644 --- a/examples/toggle.rs +++ b/examples/toggle.rs @@ -23,7 +23,7 @@ pub fn main() { fn toggle_system(mut keyboard: EventReader, mut active: ResMut) { for event in keyboard.read() { - if event.key_code == Some(KeyCode::Space) && event.state == ButtonState::Pressed { + if event.key_code == KeyCode::Space && event.state == ButtonState::Pressed { active.0 = !active.0; } } diff --git a/src/systems.rs b/src/systems.rs index fd27295..8da5d53 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -86,12 +86,13 @@ pub fn process_input( for ev in events.received_character.read() { for char in ev.char.chars() { + let smol_str = SmolStr::new(char.to_string()); let event = keyboard::Event::KeyPressed { - key: keyboard::Key::Character(SmolStr::new(char.to_string())), + key: keyboard::Key::Character(smol_str.clone()), modifiers, // NOTE: This is a winit thing we don't get from bevy events location: keyboard::Location::Standard, - text: None, + text: Some(smol_str), }; event_queue.push(IcedEvent::Keyboard(event)); }