Remove kas::layout::Visitor

crates/kas-core/src/core/tile.rs

@@ -11,8 +11,7 @@ use crate::{HasId, Id, Layout};
 use kas_macros::autoimpl;
 
 #[allow(unused)] use super::{Events, Widget};
-#[allow(unused)]
-use crate::layout::{self, AlignPair};
+#[allow(unused)] use crate::layout::{self, AlignPair};
 #[allow(unused)] use crate::theme::DrawCx;
 #[allow(unused)] use kas_macros as macros;
 

crates/kas-core/src/layout/mod.rs

@@ -45,7 +45,6 @@ mod size_rules;
 mod size_types;
 mod sizer;
 mod storage;
-mod visitor;
 
 use crate::dir::{Direction, Directional, Directions};
 
@@ -57,11 +56,6 @@ pub use size_rules::SizeRules;
 pub use size_types::*;
 pub use sizer::{solve_size_rules, RulesSetter, RulesSolver, SolveCache};
 pub use storage::*;
-pub use visitor::{FrameStorage, PackStorage};
-
-#[cfg_attr(not(feature = "internal_doc"), doc(hidden))]
-#[cfg_attr(docsrs, doc(cfg(internal_doc)))]
-pub use visitor::{LayoutList, Visitor};
 
 /// Information on which axis is being resized
 ///

crates/kas-core/src/layout/storage.rs

@@ -5,10 +5,57 @@
 
 //! Layout solver — storage
 
-use super::SizeRules;
+use super::{AxisInfo, SizeRules};
+use crate::dir::Directional;
+use crate::geom::{Offset, Rect, Size};
+use crate::theme::{FrameStyle, SizeCx};
 use kas_macros::impl_scope;
 use std::fmt::Debug;
 
+/// Layout storage for pack
+#[derive(Clone, Default, Debug)]
+pub struct PackStorage {
+    /// Ideal size
+    pub size: Size,
+}
+
+/// Layout storage for frame
+#[derive(Clone, Default, Debug)]
+pub struct FrameStorage {
+    /// Size used by frame (sum of widths of borders)
+    pub size: Size,
+    /// Offset of frame contents from parent position
+    pub offset: Offset,
+    /// [`Rect`] assigned to whole frame
+    ///
+    /// NOTE: for a top-level layout component this is redundant with the
+    /// widget's rect. For frames deeper within a widget's layout we *could*
+    /// instead recalculate this (in every draw call etc.).
+    pub rect: Rect,
+}
+impl FrameStorage {
+    /// Calculate child's "other axis" size
+    pub fn child_axis(&self, mut axis: AxisInfo) -> AxisInfo {
+        axis.sub_other(self.size.extract(axis.flipped()));
+        axis
+    }
+
+    /// Generate [`SizeRules`]
+    pub fn size_rules(
+        &mut self,
+        sizer: SizeCx,
+        axis: AxisInfo,
+        child_rules: SizeRules,
+        style: FrameStyle,
+    ) -> SizeRules {
+        let frame_rules = sizer.frame(style, axis);
+        let (rules, offset, size) = frame_rules.surround(child_rules);
+        self.offset.set_component(axis, offset);
+        self.size.set_component(axis, size);
+        rules
+    }
+}
+
 /// Requirements of row solver storage type
 ///
 /// Usually this is set by a [`crate::layout::RowSolver`] from