Bryan's call, 2026-09-16: a length and an alignment are properties of one widget, so a widget cannot both be 100 wide and take two shares of a row -- that needs two widgets, and the second one should do as little as possible. `WidgetPtr` already was that widget: it draws its child in the whole of its box and reports what the child said. It only lacked a name that says so and a way to make one around an existing widget. `Wrapper` rather than `Wrap` so it cannot be read as the text setting, and `.wrapper()` rather than `.wrapped()` for the same reason. Its child stays optional, since being a swappable slot is what it was written for and what the tab bar still uses it as. `set_ptr` is deleted rather than renamed. It had no caller, and putting a widget into an existing wrapper is what `Wrapper::set` already does. `tabs` draws its centred square again: `.sized((100, 100)).center() .wrapper().width(leftover(2))` is two widgets where the chain without `.wrapper()` was one, and `.width` was overwriting what `.sized` set. That was the last of the three ways `tabs` had drifted from canonical `main` unnoticed; what is left between them is the truncated multiply's antialiased edges and the widget count itself. `widget_trait!` takes no attributes, so `.wrapper()` carries an ordinary comment and the explanation lives on `Wrapper`. Checked: fmt, clippy, 83 suite tests, 17 core unit tests, the release oracle at 100 seeds, and `tabs` rendered at 1920x1200 against `main`'s own. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
162 lines
5.0 KiB
Rust
162 lines
5.0 KiB
Rust
use super::*;
|
|
use crate::prelude::*;
|
|
|
|
// these methods should "not require any context" (require unit) because they're in core
|
|
widget_trait! {
|
|
pub trait CoreWidget<Rsc: UiRsc + 'static>;
|
|
|
|
fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Rsc, Pad> {
|
|
|state| Pad {
|
|
padding: padding.into(),
|
|
inner: self.add_strong(state),
|
|
}
|
|
}
|
|
|
|
fn align(self, align: impl Into<Align>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
// An axis left out keeps whatever it had, which is centered unless
|
|
// something else set it.
|
|
let align = align.into();
|
|
move |state| {
|
|
let id = self.add(state);
|
|
let widgets = &mut state.ui_mut().widgets;
|
|
for (axis, align) in [(Axis::X, align.x), (Axis::Y, align.y)] {
|
|
if let Some(align) = align {
|
|
widgets.set_alignment(id, axis, align);
|
|
}
|
|
}
|
|
id
|
|
}
|
|
}
|
|
|
|
fn center(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
self.align(Align::CENTER)
|
|
}
|
|
|
|
fn label(self, label: impl Into<String>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
|state| {
|
|
let id = self.add(state);
|
|
state.ui_mut().widgets.set_label(id, label.into());
|
|
id
|
|
}
|
|
}
|
|
|
|
fn region_node(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
|state| {
|
|
let id = self.add(state);
|
|
state.ui_mut().widgets.set_region_node(id, true);
|
|
id
|
|
}
|
|
}
|
|
|
|
fn sized(self, size: impl Into<Size>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
let size = size.into();
|
|
move |state| {
|
|
let id = self.add(state);
|
|
let widgets = &mut state.ui_mut().widgets;
|
|
widgets.set_size_rule(id, Axis::X, SizeRule::Exact(size.x));
|
|
widgets.set_size_rule(id, Axis::Y, SizeRule::Exact(size.y));
|
|
id
|
|
}
|
|
}
|
|
|
|
fn width(self, len: impl Into<LayoutLen>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
let len = len.into();
|
|
move |state| {
|
|
let id = self.add(state);
|
|
state
|
|
.ui_mut()
|
|
.widgets
|
|
.set_size_rule(id, Axis::X, SizeRule::Exact(len));
|
|
id
|
|
}
|
|
}
|
|
|
|
fn height(self, len: impl Into<LayoutLen>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
|
let len = len.into();
|
|
move |state| {
|
|
let id = self.add(state);
|
|
state
|
|
.ui_mut()
|
|
.widgets
|
|
.set_size_rule(id, Axis::Y, SizeRule::Exact(len));
|
|
id
|
|
}
|
|
}
|
|
|
|
fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<Rsc, Offset> {
|
|
move |state| Offset {
|
|
inner: self.add_strong(state),
|
|
amt: amt.into(),
|
|
}
|
|
}
|
|
|
|
fn scrollable(self) -> impl WidgetIdFn<Rsc, Scroll> where Rsc: HasEvents {
|
|
move |state| {
|
|
let inner = self.add(state);
|
|
state.ui_mut().widgets.set_region_node(inner, true);
|
|
Scroll::new(inner.upgrade(state), Axis::Y)
|
|
.on(CursorSense::Scroll, |ctx, rsc| {
|
|
let delta = ctx.data.scroll_delta.y * 50.0;
|
|
ctx.widget(rsc).scroll(delta);
|
|
})
|
|
.add(state)
|
|
}
|
|
}
|
|
|
|
fn masked(self) -> impl WidgetFn<Rsc, Masked> {
|
|
move |state| Masked {
|
|
inner: self.add_strong(state),
|
|
}
|
|
}
|
|
|
|
fn background<T>(self, w: impl WidgetLike<Rsc, T>) -> impl WidgetFn<Rsc, Stack> {
|
|
move |state| Stack {
|
|
children: vec![w.add_strong(state), self.add_strong(state)],
|
|
size: StackSize::Child(1),
|
|
}
|
|
}
|
|
|
|
fn foreground<T>(self, w: impl WidgetLike<Rsc, T>) -> impl WidgetFn<Rsc, Stack> {
|
|
move |state| Stack {
|
|
children: vec![self.add_strong(state), w.add_strong(state)],
|
|
size: StackSize::Child(0),
|
|
}
|
|
}
|
|
|
|
fn layer_offset(self, offset: usize) -> impl WidgetFn<Rsc, LayerOffset> {
|
|
move |state| LayerOffset {
|
|
inner: self.add_strong(state),
|
|
offset,
|
|
}
|
|
}
|
|
|
|
fn to_any(self) -> impl WidgetIdFn<Rsc> {
|
|
|state| self.add(state)
|
|
}
|
|
|
|
// Named for the type it makes rather than as `wrapped`, which would read
|
|
// as the text setting. `widget_trait!` takes no attributes, so what it is
|
|
// for is on `Wrapper` itself.
|
|
fn wrapper(self) -> impl WidgetFn<Rsc, Wrapper> {
|
|
|state| Wrapper {
|
|
inner: Some(self.add_strong(state)),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub trait CoreWidgetArr<Rsc, const LEN: usize, Wa: WidgetArrLike<Rsc, LEN, Tag>, Tag> {
|
|
fn span(self, dir: Dir) -> SpanBuilder<Rsc, LEN, Wa, Tag>;
|
|
fn stack(self) -> StackBuilder<Rsc, LEN, Wa, Tag>;
|
|
}
|
|
|
|
impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
|
|
CoreWidgetArr<State, LEN, Wa, Tag> for Wa
|
|
{
|
|
fn span(self, dir: Dir) -> SpanBuilder<State, LEN, Wa, Tag> {
|
|
SpanBuilder::new(self, dir)
|
|
}
|
|
fn stack(self) -> StackBuilder<State, LEN, Wa, Tag> {
|
|
StackBuilder::new(self)
|
|
}
|
|
}
|