From d1f2a184394e0439db58918f88f51745fdaf59fc Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 7 May 2020 00:40:07 +0200 Subject: Implement `Clone` for `pane_grid::State` --- native/src/widget/pane_grid/state.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index ed2813b8..6bb3fd9c 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -21,7 +21,7 @@ use std::collections::HashMap; /// [`Pane`]: struct.Pane.html /// [`Split`]: struct.Split.html /// [`State`]: struct.State.html -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct State { pub(super) panes: HashMap, pub(super) internal: Internal, @@ -248,7 +248,7 @@ impl State { } } -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct Internal { layout: Node, last_id: usize, -- cgit From f3d54a0f332c8da3aca3cc1b37e63cfa96d7a526 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 9 May 2020 00:16:07 +0200 Subject: Expose `Node` and `State::layout` for `PaneGrid` --- native/src/widget/pane_grid/state.rs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index 6bb3fd9c..5cb41984 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -102,6 +102,13 @@ impl State { self.panes.iter_mut() } + /// Returns the layout tree stored in the [`State`]. + /// + /// [`State`]: struct.State.html + pub fn layout(&self) -> &Node { + &self.internal.layout + } + /// Returns the active [`Pane`] of the [`State`], if there is one. /// /// A [`Pane`] is active if it is focused and is __not__ being dragged. -- cgit From c620e4dc4caaedf3ce74b14d95c1269eb7b1d535 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 9 May 2020 00:28:31 +0200 Subject: Implement `State::get` in `pane_grid` --- native/src/widget/pane_grid/state.rs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index 5cb41984..cca8fd4a 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -82,6 +82,14 @@ impl State { /// Returns the internal state of the given [`Pane`], if it exists. /// /// [`Pane`]: struct.Pane.html + pub fn get(&self, pane: &Pane) -> Option<&T> { + self.panes.get(pane) + } + + /// Returns the internal state of the given [`Pane`] with mutability, if it + /// exists. + /// + /// [`Pane`]: struct.Pane.html pub fn get_mut(&mut self, pane: &Pane) -> Option<&mut T> { self.panes.get_mut(pane) } -- cgit From 32b9c1fdbd217c664aae40f5852013e682d480df Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 9 May 2020 09:40:31 +0200 Subject: Return new `Split` in `pane_grid::State::split` --- native/src/widget/pane_grid/state.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index cca8fd4a..4cda818c 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -191,7 +191,12 @@ impl State { /// /// [`Pane`]: struct.Pane.html /// [`Axis`]: enum.Axis.html - pub fn split(&mut self, axis: Axis, pane: &Pane, state: T) -> Option { + pub fn split( + &mut self, + axis: Axis, + pane: &Pane, + state: T, + ) -> Option<(Pane, Split)> { let node = self.internal.layout.find(pane)?; let new_pane = { @@ -211,7 +216,7 @@ impl State { let _ = self.panes.insert(new_pane, state); self.focus(&new_pane); - Some(new_pane) + Some((new_pane, new_split)) } /// Swaps the position of the provided panes in the [`State`]. -- cgit From 2ab7341fa50865d6f0c26da59f945321ef839c5f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 12 May 2020 10:09:30 +0200 Subject: Implement `State::with_content` in `pane_grid` --- native/src/widget/pane_grid/state.rs | 63 +++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 16 deletions(-) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index 4cda818c..41f3cffd 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -1,6 +1,6 @@ use crate::{ keyboard, - pane_grid::{node::Node, Axis, Direction, Pane, Split}, + pane_grid::{Axis, Content, Direction, Node, Pane, Split}, Hasher, Point, Rectangle, Size, }; @@ -53,23 +53,24 @@ impl State { /// [`State`]: struct.State.html /// [`Pane`]: struct.Pane.html pub fn new(first_pane_state: T) -> (Self, Pane) { - let first_pane = Pane(0); + (Self::with_content(Content::Pane(first_pane_state)), Pane(0)) + } + pub fn with_content(content: impl Into>) -> Self { let mut panes = HashMap::new(); - let _ = panes.insert(first_pane, first_pane_state); - - ( - State { - panes, - internal: Internal { - layout: Node::Pane(first_pane), - last_id: 0, - action: Action::Idle { focus: None }, - }, - modifiers: keyboard::ModifiersState::default(), + + let (layout, last_id) = + Self::distribute_content(&mut panes, content.into(), 0); + + State { + panes, + internal: Internal { + layout, + last_id, + action: Action::Idle { focus: None }, }, - first_pane, - ) + modifiers: keyboard::ModifiersState::default(), + } } /// Returns the total amount of panes in the [`State`]. @@ -110,7 +111,7 @@ impl State { self.panes.iter_mut() } - /// Returns the layout tree stored in the [`State`]. + /// Returns the layout of the [`State`]. /// /// [`State`]: struct.State.html pub fn layout(&self) -> &Node { @@ -266,6 +267,36 @@ impl State { None } } + + fn distribute_content( + panes: &mut HashMap, + content: Content, + next_id: usize, + ) -> (Node, usize) { + match content { + Content::Split { axis, ratio, a, b } => { + let (a, next_id) = Self::distribute_content(panes, *a, next_id); + let (b, next_id) = Self::distribute_content(panes, *b, next_id); + + ( + Node::Split { + id: Split(next_id), + axis, + ratio, + a: Box::new(a), + b: Box::new(b), + }, + next_id + 1, + ) + } + Content::Pane(state) => { + let id = Pane(next_id); + let _ = panes.insert(id, state); + + (Node::Pane(id), next_id + 1) + } + } + } } #[derive(Debug, Clone)] -- cgit From 230bd6f7475752352ca9985802db0633e3508d9f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 22 May 2020 22:15:44 +0200 Subject: Write documentation for new `pane_grid` API --- native/src/widget/pane_grid/state.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'native/src/widget/pane_grid/state.rs') diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index 41f3cffd..4b13fb8e 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -56,6 +56,10 @@ impl State { (Self::with_content(Content::Pane(first_pane_state)), Pane(0)) } + /// Creates a new [`State`] with the given [`Content`]. + /// + /// [`State`]: struct.State.html + /// [`Content`]: enum.Content.html pub fn with_content(content: impl Into>) -> Self { let mut panes = HashMap::new(); -- cgit