me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add modifiers to KeyPressEvent in pane_grid

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-03-17 07:16:54 +01:00
parent 6f9cf6c70d
commit 1cd1582506
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/pane_grid/src/main.rs
View file

@ -115,11 +115,11 @@ impl Sandbox for Example {
} }
} }
fn handle_hotkey(key_code: keyboard::KeyCode) -> Option<Message> { fn handle_hotkey(event: pane_grid::KeyPressEvent) -> Option<Message> {
use keyboard::KeyCode; use keyboard::KeyCode;
use pane_grid::{Axis, Direction}; use pane_grid::{Axis, Direction};
let direction = match key_code { let direction = match event.key_code {
KeyCode::Up => Some(Direction::Up), KeyCode::Up => Some(Direction::Up),
KeyCode::Down => Some(Direction::Down), KeyCode::Down => Some(Direction::Down),
KeyCode::Left => Some(Direction::Left), KeyCode::Left => Some(Direction::Left),
@ -127,7 +127,7 @@ fn handle_hotkey(key_code: keyboard::KeyCode) -> Option<Message> {
_ => None, _ => None,
}; };
match key_code { match event.key_code {
KeyCode::V => Some(Message::SplitFocused(Axis::Vertical)), KeyCode::V => Some(Message::SplitFocused(Axis::Vertical)),
KeyCode::H => Some(Message::SplitFocused(Axis::Horizontal)), KeyCode::H => Some(Message::SplitFocused(Axis::Horizontal)),
KeyCode::W => Some(Message::CloseFocused), KeyCode::W => Some(Message::CloseFocused),

17
native/src/widget/pane_grid.rs
View file

@ -28,7 +28,7 @@ pub struct PaneGrid<'a, Message, Renderer> {
modifier_keys: keyboard::ModifiersState, modifier_keys: keyboard::ModifiersState,
on_drag: Option<Box<dyn Fn(DragEvent) -> Message>>, on_drag: Option<Box<dyn Fn(DragEvent) -> Message>>,
on_resize: Option<Box<dyn Fn(ResizeEvent) -> Message>>, on_resize: Option<Box<dyn Fn(ResizeEvent) -> Message>>,
on_key_press: Option<Box<dyn Fn(keyboard::KeyCode) -> Option<Message>>>, on_key_press: Option<Box<dyn Fn(KeyPressEvent) -> Option<Message>>>,
} }
impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> { impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
@ -129,7 +129,7 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
pub fn on_key_press( pub fn on_key_press(
mut self, mut self,
f: impl Fn(keyboard::KeyCode) -> Option<Message> + 'static, f: impl Fn(KeyPressEvent) -> Option<Message> + 'static,
) -> Self { ) -> Self {
self.on_key_press = Some(Box::new(f)); self.on_key_press = Some(Box::new(f));
self self
@ -186,6 +186,12 @@ pub struct ResizeEvent {
pub ratio: f32, pub ratio: f32,
} }
#[derive(Debug, Clone, Copy)]
pub struct KeyPressEvent {
pub key_code: keyboard::KeyCode,
pub modifiers: keyboard::ModifiersState,
}
impl<'a, Message, Renderer> Widget<Message, Renderer> impl<'a, Message, Renderer> Widget<Message, Renderer>
for PaneGrid<'a, Message, Renderer> for PaneGrid<'a, Message, Renderer>
where where
@ -369,7 +375,12 @@ where
if state == ButtonState::Pressed { if state == ButtonState::Pressed {
if let Some(_) = self.state.idle_pane() { if let Some(_) = self.state.idle_pane() {
if modifiers == self.modifier_keys { if modifiers == self.modifier_keys {
if let Some(message) = on_key_press(key_code) { if let Some(message) =
on_key_press(KeyPressEvent {
key_code,
modifiers,
})
{
messages.push(message); messages.push(message);
} }
} }