`UiScalar` was `Len` without the `leftover` weight, which is the separation canonical `main` already had as `Len` beside `LayoutLen` and this branch collapsed. It is needed back for the queued clamp: a cap may not contain a share, because a cap has to read the report a rule otherwise makes moot, and a share puts the container's division into the same equation -- two self-consistent assignments, which is the multiple-fixed-point failure generated seed 13 punished for orthogonal sizing. `min(report, cap)` is not a `LayoutLen` either: it is a sum of parts, and the smaller of two of them is not one. So `UiScalar` is `Len`, what was `Len` is `LayoutLen`, and the two say in their docs which is which: a `Len` is pixels plus a fraction of a box -- a position being the length from the box's start, which is why a span is two of them -- and a `LayoutLen` is a `Len` plus a claim only a container dividing its room can answer. `From<Len> for LayoutLen` is the one-way step between them. Names only; the shader's `UiScalar` is renamed with them. Checked: fmt, clippy, 105 tests, and `tabs`, `minimal`, `view`, `text` and `random` byte-identical at 1920x1200. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
49 lines
1.0 KiB
Rust
49 lines
1.0 KiB
Rust
use crate::prelude::*;
|
|
|
|
#[derive(Clone, Copy)]
|
|
pub struct Rect {
|
|
pub color: UiColor,
|
|
pub radius: f32,
|
|
pub thickness: f32,
|
|
pub inner_radius: f32,
|
|
}
|
|
|
|
impl Rect {
|
|
pub fn new(color: UiColor) -> Self {
|
|
Self {
|
|
color,
|
|
radius: 0.0,
|
|
inner_radius: 0.0,
|
|
thickness: 0.0,
|
|
}
|
|
}
|
|
pub fn color(mut self, color: UiColor) -> Self {
|
|
self.color = color;
|
|
self
|
|
}
|
|
pub fn radius(mut self, radius: impl UiNum) -> Self {
|
|
self.radius = radius.to_f32();
|
|
self
|
|
}
|
|
}
|
|
|
|
impl Widget for Rect {
|
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
|
painter.primitive(RectPrimitive {
|
|
color: self.color,
|
|
radius: self.radius,
|
|
thickness: self.thickness,
|
|
inner_radius: self.inner_radius,
|
|
});
|
|
Size::LEFTOVER
|
|
}
|
|
|
|
fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
|
|
Some(LayoutLen::LEFTOVER)
|
|
}
|
|
}
|
|
|
|
pub fn rect(color: UiColor) -> Rect {
|
|
Rect::new(color)
|
|
}
|