diff --git a/src/widget/table/mod.rs b/src/widget/table/mod.rs index c39a393d..7063dc8e 100644 --- a/src/widget/table/mod.rs +++ b/src/widget/table/mod.rs @@ -3,10 +3,10 @@ pub mod model; pub use model::{ + Entity, Model, category::ItemCategory, category::ItemInterface, selection::{MultiSelect, SingleSelect}, - Entity, Model, }; pub mod widget; pub use widget::compact::CompactTableView; diff --git a/src/widget/table/model/entity.rs b/src/widget/table/model/entity.rs index 44dd79a5..51c60609 100644 --- a/src/widget/table/model/entity.rs +++ b/src/widget/table/model/entity.rs @@ -4,8 +4,8 @@ use slotmap::{SecondaryMap, SparseSecondaryMap}; use super::{ - category::{ItemCategory, ItemInterface}, Entity, Model, Selectable, + category::{ItemCategory, ItemInterface}, }; /// A newly-inserted item which may have additional actions applied to it. diff --git a/src/widget/table/model/selection.rs b/src/widget/table/model/selection.rs index 24b7b67d..20a07248 100644 --- a/src/widget/table/model/selection.rs +++ b/src/widget/table/model/selection.rs @@ -4,8 +4,8 @@ //! Describes logic specific to the single-select and multi-select modes of a model. use super::{ - category::{ItemCategory, ItemInterface}, Entity, Model, + category::{ItemCategory, ItemInterface}, }; use std::collections::HashSet; diff --git a/src/widget/table/widget/compact.rs b/src/widget/table/widget/compact.rs index 0264be71..cc3bff1c 100644 --- a/src/widget/table/widget/compact.rs +++ b/src/widget/table/widget/compact.rs @@ -1,14 +1,13 @@ use derive_setters::Setters; use crate::widget::table::model::{ + Entity, Model, category::{ItemCategory, ItemInterface}, selection::Selectable, - Entity, Model, }; use crate::{ - theme, + Apply, Element, theme, widget::{self, container, menu}, - Apply, Element, }; use iced::{Alignment, Border, Padding}; diff --git a/src/widget/table/widget/standard.rs b/src/widget/table/widget/standard.rs index 35762eea..620d33fd 100644 --- a/src/widget/table/widget/standard.rs +++ b/src/widget/table/widget/standard.rs @@ -1,14 +1,13 @@ use derive_setters::Setters; use crate::widget::table::model::{ + Entity, Model, category::{ItemCategory, ItemInterface}, selection::Selectable, - Entity, Model, }; use crate::{ - theme, + Apply, Element, theme, widget::{self, container, divider, menu}, - Apply, Element, }; use iced::{Alignment, Border, Length, Padding}; @@ -132,10 +131,12 @@ where .apply(Element::from); // Build the items let items_full = if val.model.items.is_empty() { - vec![divider::horizontal::default() - .apply(container) - .padding(val.divider_padding) - .apply(Element::from)] + vec![ + divider::horizontal::default() + .apply(container) + .padding(val.divider_padding) + .apply(Element::from), + ] } else { val.model .iter()