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

Add leeway support to PaneGrid::on_resize

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-06-08 18:25:23 +02:00
parent 041cab0fa4
commit be0cc2c780
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ impl Sandbox for Example {
.height(Length::Fill) .height(Length::Fill)
.spacing(10) .spacing(10)
.on_drag(Message::Dragged) .on_drag(Message::Dragged)
.on_resize(Message::Resized) .on_resize(10, Message::Resized)
.on_key_press(handle_hotkey); .on_key_press(handle_hotkey);
Container::new(pane_grid) Container::new(pane_grid)

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

@ -91,7 +91,7 @@ pub struct PaneGrid<'a, Message, Renderer> {
spacing: u16, spacing: u16,
modifier_keys: keyboard::ModifiersState, modifier_keys: keyboard::ModifiersState,
on_drag: Option<Box<dyn Fn(DragEvent) -> Message + 'a>>, on_drag: Option<Box<dyn Fn(DragEvent) -> Message + 'a>>,
on_resize: Option<Box<dyn Fn(ResizeEvent) -> Message + 'a>>, on_resize: Option<(u16, Box<dyn Fn(ResizeEvent) -> Message + 'a>)>,
on_key_press: Option<Box<dyn Fn(KeyPressEvent) -> Option<Message> + 'a>>, on_key_press: Option<Box<dyn Fn(KeyPressEvent) -> Option<Message> + 'a>>,
} }
@ -208,12 +208,15 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
/// Enables the resize interactions of the [`PaneGrid`], which will /// Enables the resize interactions of the [`PaneGrid`], which will
/// use the provided function to produce messages. /// use the provided function to produce messages.
/// ///
/// The `leeway` describes the amount of space around a split that can be
/// used to grab it.
///
/// [`PaneGrid`]: struct.PaneGrid.html /// [`PaneGrid`]: struct.PaneGrid.html
pub fn on_resize<F>(mut self, f: F) -> Self pub fn on_resize<F>(mut self, leeway: u16, f: F) -> Self
where where
F: 'a + Fn(ResizeEvent) -> Message, F: 'a + Fn(ResizeEvent) -> Message,
{ {
self.on_resize = Some(Box::new(f)); self.on_resize = Some((leeway, Box::new(f)));
self self
} }
@ -277,7 +280,7 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
cursor_position: Point, cursor_position: Point,
messages: &mut Vec<Message>, messages: &mut Vec<Message>,
) { ) {
if let Some(on_resize) = &self.on_resize { if let Some((_, on_resize)) = &self.on_resize {
if let Some((split, _)) = self.state.picked_split() { if let Some((split, _)) = self.state.picked_split() {
let bounds = layout.bounds(); let bounds = layout.bounds();
@ -440,7 +443,7 @@ where
if bounds.contains(cursor_position) { if bounds.contains(cursor_position) {
match self.on_resize { match self.on_resize {
Some(_) => { Some((leeway, _)) => {
let relative_cursor = Point::new( let relative_cursor = Point::new(
cursor_position.x - bounds.x, cursor_position.x - bounds.x,
cursor_position.y - bounds.y, cursor_position.y - bounds.y,
@ -453,7 +456,7 @@ where
let clicked_split = hovered_split( let clicked_split = hovered_split(
splits.iter(), splits.iter(),
f32::from(self.spacing), f32::from(self.spacing + leeway),
relative_cursor, relative_cursor,
); );
@ -573,18 +576,23 @@ where
.state .state
.picked_split() .picked_split()
.or_else(|| match self.on_resize { .or_else(|| match self.on_resize {
Some(_) => { Some((leeway, _)) => {
let bounds = layout.bounds(); let bounds = layout.bounds();
let spacing = f32::from(self.spacing);
let relative_cursor = Point::new( let relative_cursor = Point::new(
cursor_position.x - bounds.x, cursor_position.x - bounds.x,
cursor_position.y - bounds.y, cursor_position.y - bounds.y,
); );
let splits = self.state.splits(spacing, bounds.size()); let splits = self
.state
.splits(f32::from(self.spacing), bounds.size());
hovered_split(splits.iter(), spacing, relative_cursor) hovered_split(
splits.iter(),
f32::from(self.spacing + leeway),
relative_cursor,
)
} }
None => None, None => None,
}) })