iris-aiandClaude Opus 5
d21a21524f
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>
51 lines
1.3 KiB
Rust
51 lines
1.3 KiB
Rust
use crate::prelude::*;
|
|
use std::marker::Unsize;
|
|
|
|
/// One widget in a box of its own, doing as little as possible on the way:
|
|
/// it draws its child in the whole of its box and reports back what the child
|
|
/// said. It exists because 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
|
|
/// -- the two lengths need two widgets, and this is the smaller one.
|
|
///
|
|
/// Its child is optional so it can also be the swappable slot a tab bar
|
|
/// needs, which is what it was written for.
|
|
pub struct Wrapper {
|
|
pub inner: Option<StrongWidget>,
|
|
}
|
|
|
|
impl Widget for Wrapper {
|
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
|
match &self.inner {
|
|
Some(id) => painter.widget(id).size(),
|
|
None => Size::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Wrapper {
|
|
pub fn new() -> Self {
|
|
Self::default()
|
|
}
|
|
pub fn empty() -> Self {
|
|
Self {
|
|
inner: Default::default(),
|
|
}
|
|
}
|
|
pub fn set<W: ?Sized + Unsize<dyn Widget>>(&mut self, to: StrongWidget<W>) {
|
|
self.inner = Some(to)
|
|
}
|
|
|
|
pub fn replace<W: ?Sized + Unsize<dyn Widget>>(
|
|
&mut self,
|
|
to: StrongWidget<W>,
|
|
) -> Option<StrongWidget> {
|
|
self.inner.replace(to)
|
|
}
|
|
}
|
|
|
|
impl Default for Wrapper {
|
|
fn default() -> Self {
|
|
Self::empty()
|
|
}
|
|
}
|