Merge pull request #595 from kas-gui/push-yormommnwkxl

Use Viewport in ScrollRegion

Author: dhardy

crates/kas-core/src/theme/flat_theme.rs

@@ -265,7 +265,7 @@ where
     }
 
     fn colors(&self) -> &ColorsLinear {
-        &self.cols
+        self.cols
     }
 
     fn draw_rounded(&mut self) -> Option<&mut dyn DrawRounded> {

crates/kas-core/src/theme/simple_theme.rs

@@ -214,7 +214,7 @@ where
     }
 
     fn colors(&self) -> &ColorsLinear {
-        &self.cols
+        self.cols
     }
 
     fn draw_rounded(&mut self) -> Option<&mut dyn DrawRounded> {

crates/kas-macros/src/lib.rs

@@ -424,11 +424,28 @@ pub fn layout(_: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// ```ignore
 /// #[impl_self]
-/// mod ScrollBarRegion {
-///     #[autoimpl(Deref, DerefMut using self.0)]
-///     #[derive(Clone, Default)]
+/// mod Align {
+///     /// Apply an alignment hint
 ///     #[derive_widget]
-///     pub struct ScrollBarRegion<W: Widget>(#[widget] ScrollBars<ScrollRegion<W>>);
+///     pub struct Align<W: Widget> {
+///         #[widget]
+///         pub inner: W,
+///         hints: AlignHints,
+///     }
+///
+///     impl Self {
+///         /// Construct
+///         #[inline]
+///         pub fn new(inner: W, hints: AlignHints) -> Self {
+///             Align { inner, hints }
+///         }
+///     }
+///
+///     impl Layout for Self {
+///         fn set_rect(&mut self, cx: &mut SizeCx, rect: Rect, hints: AlignHints) {
+///             self.inner.set_rect(cx, rect, self.hints.combine(hints));
+///         }
+///     }
 /// }
 /// ```
 ///

crates/kas-macros/src/make_layout.rs

@@ -614,7 +614,7 @@ impl Layout {
                 // Note that try_probe_recurse fails on non-widget fields though these might still
                 // be valid layout targets; if not then the requirement for an explicit fn probe
                 // may be confusing without this error.
-                if !fields.iter().any(|ident| *ident == expr.member) {
+                if !fields.contains(&expr.member) {
                     emit_error!(expr, "not a field of self")
                 }
             }

crates/kas-wgpu/src/shaded_theme.rs

@@ -183,7 +183,7 @@ where
     }
 
     fn colors(&self) -> &ColorsLinear {
-        &self.cols
+        self.cols
     }
 
     fn draw_rounded(&mut self) -> Option<&mut dyn DrawRounded> {

crates/kas-widgets/src/lib.rs

@@ -22,7 +22,7 @@
 //! ## Container widgets
 //!
 //! -   [`Frame`]: a frame around content
-//! -   [`ScrollRegion`], [`ScrollBarRegion`]: larger on the inside
+//! -   [`ClipRegion`], [`ScrollRegion`]: larger on the inside
 //! -   [`Stack`], [`TabStack`]: a stack of widgets in the same rect
 //! -   [`List`]: a row / column of children
 //! -   [`Splitter`]: like [`List`] but with resizing handles
@@ -104,8 +104,8 @@ pub use grip::{GripMsg, GripPart};
 pub use list::*;
 pub use progress::ProgressBar;
 pub use radio_box::{RadioBox, RadioButton};
-pub use scroll::ScrollRegion;
-pub use scroll_bar::{ScrollBar, ScrollBarMode, ScrollBarRegion, ScrollBars, ScrollMsg};
+pub use scroll::{ClipRegion, ScrollRegion};
+pub use scroll_bar::{ScrollBar, ScrollBarMode, ScrollBars, ScrollMsg};
 pub use scroll_label::{ScrollLabel, ScrollText, SelectableLabel, SelectableText};
 pub use separator::Separator;
 pub use slider::{Slider, SliderValue};