From c03d46719ef79a796e03dab394248a55d92e0fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 17 Nov 2020 06:13:56 +0100 Subject: [PATCH] Remove `Focus` in `pane_grid` Since #608, the `PaneGrid` widget does not handle pane focus. --- glow/src/widget/pane_grid.rs | 4 ++-- graphics/src/widget/pane_grid.rs | 4 ++-- native/src/widget/pane_grid.rs | 2 +- native/src/widget/pane_grid/state.rs | 16 ---------------- wgpu/src/widget/pane_grid.rs | 4 ++-- 5 files changed, 7 insertions(+), 23 deletions(-) diff --git a/glow/src/widget/pane_grid.rs b/glow/src/widget/pane_grid.rs index 9e6d27d0..f594473f 100644 --- a/glow/src/widget/pane_grid.rs +++ b/glow/src/widget/pane_grid.rs @@ -11,8 +11,8 @@ use crate::Renderer; pub use iced_native::pane_grid::{ - Axis, Configuration, Direction, DragEvent, Focus, Node, Pane, ResizeEvent, - Split, State, + Axis, Configuration, Direction, DragEvent, Node, Pane, ResizeEvent, Split, + State, }; /// A collection of panes distributed using either vertical or horizontal splits diff --git a/graphics/src/widget/pane_grid.rs b/graphics/src/widget/pane_grid.rs index 1bc01c03..72a380e4 100644 --- a/graphics/src/widget/pane_grid.rs +++ b/graphics/src/widget/pane_grid.rs @@ -20,8 +20,8 @@ use iced_native::{ }; pub use iced_native::pane_grid::{ - Axis, Configuration, Content, Direction, DragEvent, Focus, Pane, - ResizeEvent, Split, State, TitleBar, + Axis, Configuration, Content, Direction, DragEvent, Pane, ResizeEvent, + Split, State, TitleBar, }; /// A collection of panes distributed using either vertical or horizontal splits diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs index 43e752cb..acb43276 100644 --- a/native/src/widget/pane_grid.rs +++ b/native/src/widget/pane_grid.rs @@ -25,7 +25,7 @@ pub use direction::Direction; pub use node::Node; pub use pane::Pane; pub use split::Split; -pub use state::{Focus, State}; +pub use state::State; pub use title_bar::TitleBar; use crate::container; diff --git a/native/src/widget/pane_grid/state.rs b/native/src/widget/pane_grid/state.rs index be36b070..7a51781e 100644 --- a/native/src/widget/pane_grid/state.rs +++ b/native/src/widget/pane_grid/state.rs @@ -26,22 +26,6 @@ pub struct State { pub(super) internal: Internal, } -/// The current focus of a [`Pane`]. -/// -/// [`Pane`]: struct.Pane.html -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum Focus { - /// The [`Pane`] is just focused. - /// - /// [`Pane`]: struct.Pane.html - Idle, - - /// The [`Pane`] is being dragged. - /// - /// [`Pane`]: struct.Pane.html - Dragging, -} - impl State { /// Creates a new [`State`], initializing the first pane with the provided /// state. diff --git a/wgpu/src/widget/pane_grid.rs b/wgpu/src/widget/pane_grid.rs index 9e6d27d0..f594473f 100644 --- a/wgpu/src/widget/pane_grid.rs +++ b/wgpu/src/widget/pane_grid.rs @@ -11,8 +11,8 @@ use crate::Renderer; pub use iced_native::pane_grid::{ - Axis, Configuration, Direction, DragEvent, Focus, Node, Pane, ResizeEvent, - Split, State, + Axis, Configuration, Direction, DragEvent, Node, Pane, ResizeEvent, Split, + State, }; /// A collection of panes distributed using either vertical or horizontal splits