reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename regions and splits in pane_grid::Node

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2020-06-30 00:32:55 +02:00
parent 1bc69e7a8a
commit cb530ccf2f
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/src/widget/pane_grid.rs
View File

@ -288,7 +288,7 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
if let Some((split, _)) = self.state.picked_split() { if let Some((split, _)) = self.state.picked_split() {
let bounds = layout.bounds(); let bounds = layout.bounds();
let splits = self.state.splits( let splits = self.state.split_regions(
f32::from(self.spacing), f32::from(self.spacing),
Size::new(bounds.width, bounds.height), Size::new(bounds.width, bounds.height),
); );
@ -410,7 +410,7 @@ where
let limits = limits.width(self.width).height(self.height); let limits = limits.width(self.width).height(self.height);
let size = limits.resolve(Size::ZERO); let size = limits.resolve(Size::ZERO);
let regions = self.state.regions(f32::from(self.spacing), size); let regions = self.state.pane_regions(f32::from(self.spacing), size);
let children = self let children = self
.elements .elements
@ -453,7 +453,7 @@ where
cursor_position.y - bounds.y, cursor_position.y - bounds.y,
); );
let splits = self.state.splits( let splits = self.state.split_regions(
f32::from(self.spacing), f32::from(self.spacing),
Size::new(bounds.width, bounds.height), Size::new(bounds.width, bounds.height),
); );
@ -590,7 +590,7 @@ where
let splits = self let splits = self
.state .state
.splits(f32::from(self.spacing), bounds.size()); .split_regions(f32::from(self.spacing), bounds.size());
hovered_split( hovered_split(
splits.iter(), splits.iter(),

4
native/src/widget/pane_grid/node.rs
View File

@ -48,7 +48,7 @@ impl Node {
/// ///
/// [`Pane`]: struct.Pane.html /// [`Pane`]: struct.Pane.html
/// [`Node`]: enum.Node.html /// [`Node`]: enum.Node.html
pub fn regions( pub fn pane_regions(
&self, &self,
spacing: f32, spacing: f32,
size: Size, size: Size,
@ -75,7 +75,7 @@ impl Node {
/// ///
/// [`Split`]: struct.Split.html /// [`Split`]: struct.Split.html
/// [`Node`]: enum.Node.html /// [`Node`]: enum.Node.html
pub fn splits( pub fn split_regions(
&self, &self,
spacing: f32, spacing: f32,
size: Size, size: Size,

14
native/src/widget/pane_grid/state.rs
View File

@ -154,8 +154,10 @@ impl<T> State<T> {
/// [`Pane`]: struct.Pane.html /// [`Pane`]: struct.Pane.html
/// [`State::active`]: struct.State.html#method.active /// [`State::active`]: struct.State.html#method.active
pub fn adjacent(&self, pane: &Pane, direction: Direction) -> Option<Pane> { pub fn adjacent(&self, pane: &Pane, direction: Direction) -> Option<Pane> {
let regions = let regions = self
self.internal.layout.regions(0.0, Size::new(4096.0, 4096.0)); .internal
.layout
.pane_regions(0.0, Size::new(4096.0, 4096.0));
let current_region = regions.get(pane)?; let current_region = regions.get(pane)?;
@ -362,20 +364,20 @@ impl Internal {
} }
} }
pub fn regions( pub fn pane_regions(
&self, &self,
spacing: f32, spacing: f32,
size: Size, size: Size,
) -> HashMap<Pane, Rectangle> { ) -> HashMap<Pane, Rectangle> {
self.layout.regions(spacing, size) self.layout.pane_regions(spacing, size)
} }
pub fn splits( pub fn split_regions(
&self, &self,
spacing: f32, spacing: f32,
size: Size, size: Size,
) -> HashMap<Split, (Axis, Rectangle, f32)> { ) -> HashMap<Split, (Axis, Rectangle, f32)> {
self.layout.splits(spacing, size) self.layout.split_regions(spacing, size)
} }
pub fn focus(&mut self, pane: &Pane) { pub fn focus(&mut self, pane: &Pane) {