Resolve deferred size comparisons before allocating span slots
This commit is contained in:
1 parent
de1eb7e406
commit
8780b40bb7
23 files changed
+1471
-130
No files matched your search
@@ -51,6 +51,8 @@ pub struct ActiveData {
|
|||||||
/// An owned mask holds one reference independently of its primitives.
|
/// An owned mask holds one reference independently of its primitives.
|
||||||
pub mask_region: Option<UiRegion>,
|
pub mask_region: Option<UiRegion>,
|
||||||
pub children: Vec<WidgetId>,
|
pub children: Vec<WidgetId>,
|
||||||
|
pub request_deps: Vec<WidgetId>,
|
||||||
|
pub(crate) scratch: DrawScratch,
|
||||||
/// The movable region its primitives are positioned through: its own when
|
/// The movable region its primitives are positioned through: its own when
|
||||||
/// opted in, otherwise the nearest ancestor's.
|
/// opted in, otherwise the nearest ancestor's.
|
||||||
pub move_idx: MoveIdx,
|
pub move_idx: MoveIdx,
|
||||||
@@ -101,3 +103,12 @@ pub struct Answer {
|
|||||||
pub size: Size,
|
pub size: Size,
|
||||||
pub holds: LayoutHolds,
|
pub holds: LayoutHolds,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default)]
|
||||||
|
pub(crate) struct DrawScratch {
|
||||||
|
pub children: Vec<WidgetId>,
|
||||||
|
pub size_deps: Vec<WidgetId>,
|
||||||
|
pub under: Vec<(WidgetId, LayoutHolds)>,
|
||||||
|
pub requests: Vec<crate::RequestedLen>,
|
||||||
|
pub lengths: Vec<crate::Px>,
|
||||||
|
}
|
||||||
+1
-1
@@ -20,7 +20,7 @@ pub use active::*;
|
|||||||
pub use holds::*;
|
pub use holds::*;
|
||||||
pub use layout_holds::*;
|
pub use layout_holds::*;
|
||||||
pub use painter::{Painter, PrimitiveLike};
|
pub use painter::{Painter, PrimitiveLike};
|
||||||
pub use place::{PlaceDesc, PlaceDescAxis, RetainedPrimitive};
|
pub use place::{PlaceDesc, PlaceDescAxis, PlaceFit, RetainedPrimitive};
|
||||||
pub use render_state::*;
|
pub use render_state::*;
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
|
|||||||
+161
-12
@@ -2,8 +2,9 @@
|
|||||||
use crate::layout_diagnostics::{self as diag, Counter};
|
use crate::layout_diagnostics::{self as diag, Counter};
|
||||||
use crate::{
|
use crate::{
|
||||||
Axis, Bounds, Declared, Holds, LayoutHolds, LayoutLen, Len, PlaceDesc, Px, PxVec2, RegionAlign,
|
Axis, Bounds, Declared, Holds, LayoutHolds, LayoutLen, Len, PlaceDesc, Px, PxVec2, RegionAlign,
|
||||||
Rel, RenderedText, RetainedPrimitive, Size, StrongWidget, TextAttrs, TextBuffer, TextureHandle,
|
Rel, RenderedText, RequestArena, RequestedLen, RetainedPrimitive, Size, SizeRequests,
|
||||||
UiRegion, UiRenderState, UiRsc, UiVec2, Weight, WidgetId, Widgets,
|
StrongWidget, TextAttrs, TextBuffer, TextureHandle, UiRegion, UiRenderState, UiRsc, UiVec2,
|
||||||
|
Weight, WidgetId, Widgets,
|
||||||
render::{
|
render::{
|
||||||
GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveInst, PrimitiveKind,
|
GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveInst, PrimitiveKind,
|
||||||
TexturePrimitive,
|
TexturePrimitive,
|
||||||
@@ -41,6 +42,8 @@ pub struct Painter<'a> {
|
|||||||
pub(super) children: Vec<WidgetId>,
|
pub(super) children: Vec<WidgetId>,
|
||||||
/// The children whose size this widget read while drawing.
|
/// The children whose size this widget read while drawing.
|
||||||
pub(super) size_deps: Vec<WidgetId>,
|
pub(super) size_deps: Vec<WidgetId>,
|
||||||
|
pub(super) request_deps: Vec<WidgetId>,
|
||||||
|
pub(super) scratch: crate::DrawScratch,
|
||||||
/// What this draw itself reads, as against what its children's drawings
|
/// What this draw itself reads, as against what its children's drawings
|
||||||
/// hold for: every window and every length of its own region until it
|
/// hold for: every window and every length of its own region until it
|
||||||
/// reads one, then that one unless it says otherwise, and the rel base or
|
/// reads one, then that one unless it says otherwise, and the rel base or
|
||||||
@@ -62,6 +65,106 @@ pub struct Painter<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Painter<'a> {
|
impl<'a> Painter<'a> {
|
||||||
|
/// Reuses this widget's allocation buffers across draws. Nested painters
|
||||||
|
/// have independent buffers, so discovering a child cannot overwrite them.
|
||||||
|
pub fn with_requests<T>(
|
||||||
|
&mut self,
|
||||||
|
f: impl FnOnce(&mut Self, &mut Vec<RequestedLen>, &mut Vec<Px>) -> T,
|
||||||
|
) -> T {
|
||||||
|
let mut requests = std::mem::take(&mut self.scratch.requests);
|
||||||
|
let mut lengths = std::mem::take(&mut self.scratch.lengths);
|
||||||
|
requests.clear();
|
||||||
|
lengths.clear();
|
||||||
|
let result = f(self, &mut requests, &mut lengths);
|
||||||
|
self.scratch.requests = requests;
|
||||||
|
self.scratch.lengths = lengths;
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Discovers a composable request without painting a provisional box.
|
||||||
|
pub fn size_request<W: ?Sized>(
|
||||||
|
&mut self,
|
||||||
|
child: &StrongWidget<W>,
|
||||||
|
axis: Axis,
|
||||||
|
) -> Option<RequestedLen> {
|
||||||
|
self.request_deps.push(child.id());
|
||||||
|
if self.rsc.widgets().size_rules(child.id())[axis].bound() == crate::Bound::ANY
|
||||||
|
&& let Some(len) = self.size_hint(child, axis)
|
||||||
|
{
|
||||||
|
return Some(len.into());
|
||||||
|
}
|
||||||
|
let rel_base = self.rel_base(axis);
|
||||||
|
let mut requests = SizeRequests {
|
||||||
|
arena: &mut self.state.requests,
|
||||||
|
measured: None,
|
||||||
|
widgets: self.rsc.widgets(),
|
||||||
|
dependencies: &mut self.request_deps,
|
||||||
|
rel_base,
|
||||||
|
};
|
||||||
|
let request = requests.widget(child, axis)?;
|
||||||
|
// An intrinsic fixed answer still draws in the offered room and is
|
||||||
|
// moved afterwards. Only a declaration or a share chooses its ask box.
|
||||||
|
(request.has_leftover()
|
||||||
|
|| matches!(
|
||||||
|
self.rsc.widgets().size_rules(child.id())[axis],
|
||||||
|
crate::SizeRule::Request(_)
|
||||||
|
))
|
||||||
|
.then_some(request)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Completes discovery after a child was measured. Only this call may use
|
||||||
|
/// drawn answers: before the ask they could belong to an obsolete box.
|
||||||
|
pub fn measured_request<W: ?Sized>(
|
||||||
|
&mut self,
|
||||||
|
child: &StrongWidget<W>,
|
||||||
|
axis: Axis,
|
||||||
|
len: LayoutLen,
|
||||||
|
) -> RequestedLen {
|
||||||
|
let rel_base = self.rel_base(axis);
|
||||||
|
let bound = self.rsc.widgets().size_rules(child.id())[axis].bound();
|
||||||
|
let mut requests = SizeRequests {
|
||||||
|
arena: &mut self.state.requests,
|
||||||
|
measured: Some(&self.state.active),
|
||||||
|
widgets: self.rsc.widgets(),
|
||||||
|
dependencies: &mut self.request_deps,
|
||||||
|
rel_base,
|
||||||
|
};
|
||||||
|
match requests.widget(child, axis) {
|
||||||
|
Some(request) if request.linear().is_none() && request.has_leftover() => request,
|
||||||
|
_ if len.leftover > Weight::ZERO => requests.bounded(len.into(), bound),
|
||||||
|
_ => len.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A deferred comparison reads this window when the allocation is solved.
|
||||||
|
pub fn allocate(
|
||||||
|
&mut self,
|
||||||
|
requests: &[RequestedLen],
|
||||||
|
room: Len,
|
||||||
|
axis: Axis,
|
||||||
|
output: &mut Vec<Px>,
|
||||||
|
) {
|
||||||
|
let window = self.window[axis];
|
||||||
|
self.own[axis].window = self.own[axis].window.and(Holds::at(window));
|
||||||
|
output.clear();
|
||||||
|
output.extend(
|
||||||
|
self.state
|
||||||
|
.requests
|
||||||
|
.allocate(requests, room.to_px(window), window),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn minimum_request(&mut self, request: &RequestedLen, axis: Axis) -> Len {
|
||||||
|
match request.linear() {
|
||||||
|
Some(len) => len.without_leftover(),
|
||||||
|
None => {
|
||||||
|
let window = self.window[axis];
|
||||||
|
self.own[axis].window = self.own[axis].window.and(Holds::at(window));
|
||||||
|
Len::from_parts(Rel::ZERO, self.state.requests.minimum(*request, window))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
|
fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
|
||||||
let kind = self.rsc.ui_mut().primitives.kind::<P>();
|
let kind = self.rsc.ui_mut().primitives.kind::<P>();
|
||||||
self.write(kind, primitive, region);
|
self.write(kind, primitive, region);
|
||||||
@@ -195,9 +298,15 @@ impl<'a> Painter<'a> {
|
|||||||
declared,
|
declared,
|
||||||
bounds,
|
bounds,
|
||||||
holds: ask_holds,
|
holds: ask_holds,
|
||||||
} = self
|
inputs,
|
||||||
.placing()
|
} = self.placing().ask(
|
||||||
.ask(self.rsc.widgets(), self.window, id.id(), offer);
|
self.rsc.widgets(),
|
||||||
|
&mut self.state.requests,
|
||||||
|
self.window,
|
||||||
|
id.id(),
|
||||||
|
offer,
|
||||||
|
);
|
||||||
|
self.own = self.own.and(inputs);
|
||||||
let region_node = self.rsc.widgets().is_region_node(id.id());
|
let region_node = self.rsc.widgets().is_region_node(id.id());
|
||||||
#[cfg(feature = "layout-diagnostics")]
|
#[cfg(feature = "layout-diagnostics")]
|
||||||
if region_node {
|
if region_node {
|
||||||
@@ -422,9 +531,10 @@ impl<'a> Painter<'a> {
|
|||||||
/// worth anything, since reading one is also what makes its own size
|
/// worth anything, since reading one is also what makes its own size
|
||||||
/// depend on it.
|
/// depend on it.
|
||||||
pub fn has_exact_size(&self, axis: Axis) -> bool {
|
pub fn has_exact_size(&self, axis: Axis) -> bool {
|
||||||
self.rsc.widgets().size_rules(self.id)[axis]
|
matches!(
|
||||||
.exact()
|
self.rsc.widgets().size_rules(self.id)[axis],
|
||||||
.is_some()
|
crate::SizeRule::Exact(_) | crate::SizeRule::Request(_)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This widget's own box in pixels. Reading it makes the drawing one
|
/// This widget's own box in pixels. Reading it makes the drawing one
|
||||||
@@ -667,6 +777,9 @@ impl Widgets {
|
|||||||
/// share included, since a share is a length only to whoever divides one,
|
/// share included, since a share is a length only to whoever divides one,
|
||||||
/// and that is the parent rather than this widget.
|
/// and that is the parent rather than this widget.
|
||||||
fn exact_len(&self, id: WidgetId, axis: Axis) -> Option<LayoutLen> {
|
fn exact_len(&self, id: WidgetId, axis: Axis) -> Option<LayoutLen> {
|
||||||
|
if matches!(self.size_rules(id)[axis], crate::SizeRule::Request(_)) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
self.size_rules(id)[axis].exact().or_else(|| {
|
self.size_rules(id)[axis].exact().or_else(|| {
|
||||||
// A hint still narrows the box where no rule does, which is how a
|
// A hint still narrows the box where no rule does, which is how a
|
||||||
// widget with a natural pixel size -- an image, a gap -- gets that
|
// widget with a natural pixel size -- an image, a gap -- gets that
|
||||||
@@ -706,6 +819,9 @@ pub(super) struct Ask {
|
|||||||
/// drawing it is part of. Kept on the widget asked about rather than on
|
/// drawing it is part of. Kept on the widget asked about rather than on
|
||||||
/// the asker because the root has no asker.
|
/// the asker because the root has no asker.
|
||||||
pub holds: LayoutHolds,
|
pub holds: LayoutHolds,
|
||||||
|
/// Inputs read against the parent before declarations choose a new base.
|
||||||
|
/// These belong to the asker; the widget's own holds describe its output box.
|
||||||
|
pub inputs: LayoutHolds,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Placing {
|
impl Placing {
|
||||||
@@ -719,6 +835,7 @@ impl Placing {
|
|||||||
pub(super) fn ask(
|
pub(super) fn ask(
|
||||||
&self,
|
&self,
|
||||||
widgets: &Widgets,
|
widgets: &Widgets,
|
||||||
|
requests: &mut RequestArena,
|
||||||
window: PxVec2,
|
window: PxVec2,
|
||||||
id: WidgetId,
|
id: WidgetId,
|
||||||
mut place: PlaceDesc,
|
mut place: PlaceDesc,
|
||||||
@@ -726,10 +843,33 @@ impl Placing {
|
|||||||
let align = widgets.alignment(id);
|
let align = widgets.alignment(id);
|
||||||
let rules = widgets.size_rules(id);
|
let rules = widgets.size_rules(id);
|
||||||
let mut holds = LayoutHolds::ANY;
|
let mut holds = LayoutHolds::ANY;
|
||||||
let declared = widgets.declared_lens(id);
|
let mut inputs = LayoutHolds::ANY;
|
||||||
|
let mut declared = widgets.declared_lens(id);
|
||||||
let mut bounds = Bounds::ANY;
|
let mut bounds = Bounds::ANY;
|
||||||
for axis in Axis::BOTH {
|
for axis in Axis::BOTH {
|
||||||
let base = place.base(axis, self.rel_base);
|
let base = place.base(axis, self.rel_base);
|
||||||
|
if let crate::SizeRule::Request(request) = &rules[axis] {
|
||||||
|
inputs[axis].rel_base = Some(self.rel_base[axis]);
|
||||||
|
inputs[axis].region_len = Some(self.region[axis].len());
|
||||||
|
inputs[axis].window = Holds::at(window[axis]);
|
||||||
|
let offer = place.of(self.region, align)[axis].len();
|
||||||
|
let len = if place[axis].fit == crate::PlaceFit::Allocated {
|
||||||
|
offer
|
||||||
|
} else {
|
||||||
|
let request = requests.import(request, base);
|
||||||
|
let len = requests
|
||||||
|
.allocate(&[request], offer.to_px(window[axis]), window[axis])
|
||||||
|
.next()
|
||||||
|
.unwrap();
|
||||||
|
holds[axis].window = Holds::at(window[axis]);
|
||||||
|
Len::from_parts(Rel::ZERO, len)
|
||||||
|
};
|
||||||
|
let len = Len::from_parts(Rel::ZERO, len.to_px(window[axis]));
|
||||||
|
place[axis].rel_base = RelBase::Len(len);
|
||||||
|
declared[axis] = Some(len);
|
||||||
|
holds[axis].rel_base = Some(len);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
// A share fills what the pixels and fraction beside it leave of
|
// A share fills what the pixels and fraction beside it leave of
|
||||||
// the box and overflows where they are longer, which is the rule
|
// the box and overflows where they are longer, which is the rule
|
||||||
// a span follows with one child. Only the overflow is a box of
|
// a span follows with one child. Only the overflow is a box of
|
||||||
@@ -748,7 +888,15 @@ impl Placing {
|
|||||||
// anything. Resolved here because only the ask knows the rel base
|
// anything. Resolved here because only the ask knows the rel base
|
||||||
// a fraction in it is of. `MaxSize` is the box version, and it is
|
// a fraction in it is of. `MaxSize` is the box version, and it is
|
||||||
// a widget because a widget is drawn again when its box changes.
|
// a widget because a widget is drawn again when its box changes.
|
||||||
bounds[axis] = rules[axis].bound().within_len(base);
|
let bound = rules[axis].bound();
|
||||||
|
if [bound.min, bound.max]
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.any(|len| len.rel != Rel::ZERO)
|
||||||
|
{
|
||||||
|
inputs[axis].rel_base = Some(self.rel_base[axis]);
|
||||||
|
}
|
||||||
|
bounds[axis] = bound.within_len(base);
|
||||||
}
|
}
|
||||||
let (rel_base, region) =
|
let (rel_base, region) =
|
||||||
place.rel_base_and_region(self.region, self.rel_base, declared, align);
|
place.rel_base_and_region(self.region, self.rel_base, declared, align);
|
||||||
@@ -759,6 +907,7 @@ impl Placing {
|
|||||||
declared,
|
declared,
|
||||||
bounds,
|
bounds,
|
||||||
holds,
|
holds,
|
||||||
|
inputs,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -785,7 +934,7 @@ impl Placing {
|
|||||||
// decided, and a parent that divides one has already given the share
|
// decided, and a parent that divides one has already given the share
|
||||||
// whatever it was owed. Only an offer -- a box with the answer still
|
// whatever it was owed. Only an offer -- a box with the answer still
|
||||||
// to be placed inside it -- is a box a share reads.
|
// to be placed inside it -- is a box a share reads.
|
||||||
if place[axis].fills {
|
if place[axis].fit.fills() {
|
||||||
return (None, Holds::ANY);
|
return (None, Holds::ANY);
|
||||||
}
|
}
|
||||||
// A share with nothing beside it is the box whatever the box is, so
|
// A share with nothing beside it is the box whatever the box is, so
|
||||||
@@ -838,7 +987,7 @@ impl PlaceDesc {
|
|||||||
let mut placed = region;
|
let mut placed = region;
|
||||||
for axis in Axis::BOTH {
|
for axis in Axis::BOTH {
|
||||||
let reported = size[axis];
|
let reported = size[axis];
|
||||||
if reported.fills(declared[axis], self[axis].fills) {
|
if reported.fills(declared[axis], self[axis].fit.fills()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
placed[axis] = placed[axis].place(reported.without_leftover(), align[axis]);
|
placed[axis] = placed[axis].place(reported.without_leftover(), align[axis]);
|
||||||
|
|||||||
+25
-5
@@ -12,10 +12,24 @@ use crate::{Axis, AxisAlign, Len, PrimitiveHandle, RegionAlign, UiRegion, UiSpan
|
|||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
pub struct PlaceDescAxis {
|
pub struct PlaceDescAxis {
|
||||||
pub span: PlaceSpan,
|
pub span: PlaceSpan,
|
||||||
pub fills: bool,
|
pub fit: PlaceFit,
|
||||||
pub rel_base: RelBase,
|
pub rel_base: RelBase,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
pub enum PlaceFit {
|
||||||
|
Align,
|
||||||
|
Fill,
|
||||||
|
/// The parent has already evaluated the child's size request.
|
||||||
|
Allocated,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PlaceFit {
|
||||||
|
pub fn fills(self) -> bool {
|
||||||
|
self != Self::Align
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
pub enum PlaceSpan {
|
pub enum PlaceSpan {
|
||||||
Within(UiSpan),
|
Within(UiSpan),
|
||||||
@@ -44,7 +58,13 @@ impl PlaceDescAxis {
|
|||||||
/// it again. A container uses it where it hands back exactly what the
|
/// it again. A container uses it where it hands back exactly what the
|
||||||
/// child asked for -- a row placing a child at the length it reported.
|
/// child asked for -- a row placing a child at the length it reported.
|
||||||
pub const fn fills(mut self) -> Self {
|
pub const fn fills(mut self) -> Self {
|
||||||
self.fills = true;
|
self.fit = PlaceFit::Fill;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A final allocation, including any comparisons in the child's request.
|
||||||
|
pub const fn allocated(mut self) -> Self {
|
||||||
|
self.fit = PlaceFit::Allocated;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +173,7 @@ impl UiSpan {
|
|||||||
pub const fn within_desc(self) -> PlaceDescAxis {
|
pub const fn within_desc(self) -> PlaceDescAxis {
|
||||||
PlaceDescAxis {
|
PlaceDescAxis {
|
||||||
span: PlaceSpan::Within(self),
|
span: PlaceSpan::Within(self),
|
||||||
fills: false,
|
fit: PlaceFit::Align,
|
||||||
rel_base: RelBase::WithRegion,
|
rel_base: RelBase::WithRegion,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -171,7 +191,7 @@ impl UiSpan {
|
|||||||
pub const fn shifted_desc(self) -> PlaceDescAxis {
|
pub const fn shifted_desc(self) -> PlaceDescAxis {
|
||||||
PlaceDescAxis {
|
PlaceDescAxis {
|
||||||
span: PlaceSpan::Shifted(self),
|
span: PlaceSpan::Shifted(self),
|
||||||
fills: false,
|
fit: PlaceFit::Align,
|
||||||
rel_base: RelBase::Inherit,
|
rel_base: RelBase::Inherit,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -185,7 +205,7 @@ impl Len {
|
|||||||
pub const fn as_desc(self) -> PlaceDescAxis {
|
pub const fn as_desc(self) -> PlaceDescAxis {
|
||||||
PlaceDescAxis {
|
PlaceDescAxis {
|
||||||
span: PlaceSpan::Sized(self),
|
span: PlaceSpan::Sized(self),
|
||||||
fills: false,
|
fit: PlaceFit::Align,
|
||||||
rel_base: RelBase::Len(self),
|
rel_base: RelBase::Len(self),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+100
-28
@@ -94,7 +94,10 @@ pub struct UiRenderState {
|
|||||||
deferred: crate::util::HashSet<WidgetId>,
|
deferred: crate::util::HashSet<WidgetId>,
|
||||||
/// What the walk has left to settle, deepest last. Ordered rather than
|
/// What the walk has left to settle, deepest last. Ordered rather than
|
||||||
/// searched for, so finding the next one is not a pass over the marks.
|
/// searched for, so finding the next one is not a pass over the marks.
|
||||||
pending: std::collections::BTreeSet<(usize, WidgetId)>,
|
pending: std::collections::BinaryHeap<(usize, WidgetId)>,
|
||||||
|
pub(super) requests: crate::RequestArena,
|
||||||
|
changed: Vec<WidgetId>,
|
||||||
|
request_readers: HashMap<WidgetId, crate::util::HashSet<WidgetId>>,
|
||||||
pub moves: Moves,
|
pub moves: Moves,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,6 +111,9 @@ impl UiRenderState {
|
|||||||
slots: Default::default(),
|
slots: Default::default(),
|
||||||
deferred: Default::default(),
|
deferred: Default::default(),
|
||||||
pending: Default::default(),
|
pending: Default::default(),
|
||||||
|
requests: Default::default(),
|
||||||
|
changed: Vec::new(),
|
||||||
|
request_readers: Default::default(),
|
||||||
moves: Default::default(),
|
moves: Default::default(),
|
||||||
resized: false,
|
resized: false,
|
||||||
}
|
}
|
||||||
@@ -194,6 +200,7 @@ impl UiRenderState {
|
|||||||
weak widgets: {all:#?}"
|
weak widgets: {all:#?}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
self.requests.reset();
|
||||||
let root = root.into();
|
let root = root.into();
|
||||||
if self.root_changed(root) {
|
if self.root_changed(root) {
|
||||||
self.redraw_all(root, rsc);
|
self.redraw_all(root, rsc);
|
||||||
@@ -211,8 +218,13 @@ impl UiRenderState {
|
|||||||
let _layout = diag::timer(TimerKind::FullLayout);
|
let _layout = diag::timer(TimerKind::FullLayout);
|
||||||
self.clear(rsc);
|
self.clear(rsc);
|
||||||
if let Some(id) = root {
|
if let Some(id) = root {
|
||||||
let ask =
|
let ask = Placing::WINDOW.ask(
|
||||||
Placing::WINDOW.ask(rsc.widgets(), self.output_size, id.id(), PlaceDesc::WHOLE);
|
rsc.widgets(),
|
||||||
|
&mut self.requests,
|
||||||
|
self.output_size,
|
||||||
|
id.id(),
|
||||||
|
PlaceDesc::WHOLE,
|
||||||
|
);
|
||||||
let info = self.root_info(&ask, rsc.widgets().is_region_node(id.id()));
|
let info = self.root_info(&ask, rsc.widgets().is_region_node(id.id()));
|
||||||
self.draw_inner(id.id(), info, None, rsc);
|
self.draw_inner(id.id(), info, None, rsc);
|
||||||
}
|
}
|
||||||
@@ -327,7 +339,19 @@ impl UiRenderState {
|
|||||||
let mask_slot = old
|
let mask_slot = old
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.and_then(|old| old.mask_region.map(|_| old.mask));
|
.and_then(|old| old.mask_region.map(|_| old.mask));
|
||||||
let old_children = old.map_or_else(Vec::new, |old| old.children);
|
let (mut old_children, textures, primitives, request_deps, mut scratch) = match old {
|
||||||
|
Some(old) => (
|
||||||
|
old.children,
|
||||||
|
old.textures,
|
||||||
|
old.primitives,
|
||||||
|
old.request_deps,
|
||||||
|
old.scratch,
|
||||||
|
),
|
||||||
|
None => Default::default(),
|
||||||
|
};
|
||||||
|
let children = std::mem::take(&mut scratch.children);
|
||||||
|
let size_deps = std::mem::take(&mut scratch.size_deps);
|
||||||
|
let under = std::mem::take(&mut scratch.under);
|
||||||
rsc.widgets_mut().needs_redraw.remove(&id);
|
rsc.widgets_mut().needs_redraw.remove(&id);
|
||||||
let window = self.output_size;
|
let window = self.output_size;
|
||||||
let mut painter = Painter {
|
let mut painter = Painter {
|
||||||
@@ -339,17 +363,19 @@ impl UiRenderState {
|
|||||||
layer: info.layer,
|
layer: info.layer,
|
||||||
own_layer: info.layer,
|
own_layer: info.layer,
|
||||||
id,
|
id,
|
||||||
textures: Vec::new(),
|
textures,
|
||||||
primitives: Vec::new(),
|
primitives,
|
||||||
mask_region: None,
|
mask_region: None,
|
||||||
mask_slot,
|
mask_slot,
|
||||||
children: Vec::new(),
|
children,
|
||||||
size_deps: Vec::new(),
|
size_deps,
|
||||||
|
request_deps,
|
||||||
|
scratch,
|
||||||
// What the ask holds for is part of what the drawing holds for:
|
// What the ask holds for is part of what the drawing holds for:
|
||||||
// a box the widget's own rule took past the offer was decided in
|
// a box the widget's own rule took past the offer was decided in
|
||||||
// this window, and at the root nobody else keeps that range.
|
// this window, and at the root nobody else keeps that range.
|
||||||
own: info.ask_holds,
|
own: info.ask_holds,
|
||||||
under: Vec::new(),
|
under,
|
||||||
answer_under: LayoutHolds::ANY,
|
answer_under: LayoutHolds::ANY,
|
||||||
depth: info.depth,
|
depth: info.depth,
|
||||||
move_idx,
|
move_idx,
|
||||||
@@ -381,8 +407,10 @@ impl UiRenderState {
|
|||||||
own,
|
own,
|
||||||
answer_under,
|
answer_under,
|
||||||
children,
|
children,
|
||||||
size_deps,
|
mut size_deps,
|
||||||
under,
|
request_deps,
|
||||||
|
mut scratch,
|
||||||
|
mut under,
|
||||||
move_idx,
|
move_idx,
|
||||||
layer,
|
layer,
|
||||||
own_layer: _,
|
own_layer: _,
|
||||||
@@ -402,14 +430,19 @@ impl UiRenderState {
|
|||||||
// resolved into the rel base when the widget was asked, and resolving
|
// resolved into the rel base when the widget was asked, and resolving
|
||||||
// it again here would take the fraction of a fraction.
|
// it again here would take the fraction of a fraction.
|
||||||
let rules = rsc.widgets().size_rules(id);
|
let rules = rsc.widgets().size_rules(id);
|
||||||
let ruled = |axis: Axis, reported: LayoutLen| match rules[axis].exact() {
|
let ruled = |axis: Axis, reported: LayoutLen| {
|
||||||
None => reported,
|
if matches!(rules[axis], crate::SizeRule::Request(_)) {
|
||||||
Some(len) if len.leftover == Weight::ZERO => LayoutLen {
|
return info.rel_base[axis].into();
|
||||||
rel: info.rel_base[axis].rel,
|
}
|
||||||
px: info.rel_base[axis].px,
|
match rules[axis].exact() {
|
||||||
leftover: Weight::ZERO,
|
None => reported,
|
||||||
},
|
Some(len) if len.leftover == Weight::ZERO => LayoutLen {
|
||||||
Some(len) => len.within_len(info.rel_base[axis]),
|
rel: info.rel_base[axis].rel,
|
||||||
|
px: info.rel_base[axis].px,
|
||||||
|
leftover: Weight::ZERO,
|
||||||
|
},
|
||||||
|
Some(len) => len.within_len(info.rel_base[axis]),
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let mut size = Size {
|
let mut size = Size {
|
||||||
x: ruled(Axis::X, size.x),
|
x: ruled(Axis::X, size.x),
|
||||||
@@ -483,8 +516,8 @@ impl UiRenderState {
|
|||||||
}
|
}
|
||||||
let answer_holds = own_holds.and(answer_under);
|
let answer_holds = own_holds.and(answer_under);
|
||||||
let holds = under
|
let holds = under
|
||||||
.into_iter()
|
.iter()
|
||||||
.fold(answer_holds, |holds, (_, child)| holds.and(child));
|
.fold(answer_holds, |holds, (_, child)| holds.and(*child));
|
||||||
debug_assert!(
|
debug_assert!(
|
||||||
holds.contains(self.output_size, info.rel_base, region),
|
holds.contains(self.output_size, info.rel_base, region),
|
||||||
"'{}' ({id:?}) drew in {}, outside the ranges it reported: {holds:?}",
|
"'{}' ({id:?}) drew in {}, outside the ranges it reported: {holds:?}",
|
||||||
@@ -520,6 +553,15 @@ impl UiRenderState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for &dep in &request_deps {
|
||||||
|
self.request_readers.entry(dep).or_default().insert(id);
|
||||||
|
}
|
||||||
|
old_children.clear();
|
||||||
|
size_deps.clear();
|
||||||
|
under.clear();
|
||||||
|
scratch.children = old_children;
|
||||||
|
scratch.size_deps = size_deps;
|
||||||
|
scratch.under = under;
|
||||||
let active = ActiveData {
|
let active = ActiveData {
|
||||||
id,
|
id,
|
||||||
placement: region,
|
placement: region,
|
||||||
@@ -539,6 +581,8 @@ impl UiRenderState {
|
|||||||
primitives,
|
primitives,
|
||||||
mask_region,
|
mask_region,
|
||||||
children,
|
children,
|
||||||
|
request_deps,
|
||||||
|
scratch,
|
||||||
declared: info.declared,
|
declared: info.declared,
|
||||||
bounds: info.bounds,
|
bounds: info.bounds,
|
||||||
own_align: rsc.widgets().alignment(id),
|
own_align: rsc.widgets().alignment(id),
|
||||||
@@ -585,6 +629,7 @@ impl UiRenderState {
|
|||||||
if !active.drawn
|
if !active.drawn
|
||||||
|| active.is_region_node() != info.region_node
|
|| active.is_region_node() != info.region_node
|
||||||
|| active.parent_move != info.parent_move
|
|| active.parent_move != info.parent_move
|
||||||
|
|| active.bounds != info.bounds
|
||||||
{
|
{
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
@@ -841,6 +886,11 @@ impl UiRenderState {
|
|||||||
fn remove(&mut self, id: WidgetId, undraw: bool, rsc: &mut dyn UiRsc) -> Option<ActiveData> {
|
fn remove(&mut self, id: WidgetId, undraw: bool, rsc: &mut dyn UiRsc) -> Option<ActiveData> {
|
||||||
let mut active = self.active.remove(&id);
|
let mut active = self.active.remove(&id);
|
||||||
if let Some(active) = &mut active {
|
if let Some(active) = &mut active {
|
||||||
|
for dep in active.request_deps.drain(..) {
|
||||||
|
if let Some(readers) = self.request_readers.get_mut(&dep) {
|
||||||
|
readers.remove(&id);
|
||||||
|
}
|
||||||
|
}
|
||||||
for primitive in &active.primitives {
|
for primitive in &active.primitives {
|
||||||
let mask = self.layers.free(&primitive.handle);
|
let mask = self.layers.free(&primitive.handle);
|
||||||
if mask != MaskIdx::NONE {
|
if mask != MaskIdx::NONE {
|
||||||
@@ -914,6 +964,8 @@ impl UiRenderState {
|
|||||||
primitives: Vec::new(),
|
primitives: Vec::new(),
|
||||||
mask_region: None,
|
mask_region: None,
|
||||||
children: Vec::new(),
|
children: Vec::new(),
|
||||||
|
request_deps: Vec::new(),
|
||||||
|
scratch: Default::default(),
|
||||||
move_idx: info.parent_move,
|
move_idx: info.parent_move,
|
||||||
declared: Declared::NONE,
|
declared: Declared::NONE,
|
||||||
bounds: Bounds::ANY,
|
bounds: Bounds::ANY,
|
||||||
@@ -927,6 +979,7 @@ impl UiRenderState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn clear(&mut self, rsc: &mut dyn UiRsc) {
|
fn clear(&mut self, rsc: &mut dyn UiRsc) {
|
||||||
|
self.request_readers.clear();
|
||||||
for (_, active) in self.active.drain() {
|
for (_, active) in self.active.drain() {
|
||||||
if active.drawn {
|
if active.drawn {
|
||||||
rsc.on_undraw(&active);
|
rsc.on_undraw(&active);
|
||||||
@@ -947,6 +1000,7 @@ impl UiRenderState {
|
|||||||
rsc.on_remove(id);
|
rsc.on_remove(id);
|
||||||
self.remove(id, true, rsc);
|
self.remove(id, true, rsc);
|
||||||
self.drop_slot(id);
|
self.drop_slot(id);
|
||||||
|
self.request_readers.remove(&id);
|
||||||
}
|
}
|
||||||
rsc.ui_mut().textures.free();
|
rsc.ui_mut().textures.free();
|
||||||
}
|
}
|
||||||
@@ -954,6 +1008,18 @@ impl UiRenderState {
|
|||||||
pub fn redraw_updates(&mut self, rsc: &mut dyn UiRsc) {
|
pub fn redraw_updates(&mut self, rsc: &mut dyn UiRsc) {
|
||||||
#[cfg(feature = "layout-diagnostics")]
|
#[cfg(feature = "layout-diagnostics")]
|
||||||
let _layout = diag::timer(TimerKind::IncrementalLayout);
|
let _layout = diag::timer(TimerKind::IncrementalLayout);
|
||||||
|
self.changed.clear();
|
||||||
|
self.changed
|
||||||
|
.extend(rsc.widgets().needs_redraw.iter().copied());
|
||||||
|
while let Some(id) = self.changed.pop() {
|
||||||
|
if let Some(readers) = self.request_readers.get(&id) {
|
||||||
|
for &reader in readers {
|
||||||
|
if rsc.widgets_mut().needs_redraw.insert(reader) {
|
||||||
|
self.changed.push(reader);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Deepest first, and strictly: a widget that cannot settle where it
|
// Deepest first, and strictly: a widget that cannot settle where it
|
||||||
// is defers to its parent rather than drawing the parent from
|
// is defers to its parent rather than drawing the parent from
|
||||||
// inside itself. It marks the parent, stays marked, and waits here
|
// inside itself. It marks the parent, stays marked, and waits here
|
||||||
@@ -965,21 +1031,21 @@ impl UiRenderState {
|
|||||||
// something below is about to change it -- which is the whole class
|
// something below is about to change it -- which is the whole class
|
||||||
// of defect where a widget settles inside its parent's draw, clears
|
// of defect where a widget settles inside its parent's draw, clears
|
||||||
// its mark there, and tells nobody its answer moved.
|
// its mark there, and tells nobody its answer moved.
|
||||||
// The queue is that set, ordered: a mark made while the walk runs
|
// A mark made while the walk runs queues itself through `mark`.
|
||||||
// queues itself through `mark`. What ends the walk is still the set
|
// What ends the walk is still the set
|
||||||
// being spent, not the queue, so a mark that reached it another way
|
// being spent, not the queue, so a mark that reached it another way
|
||||||
// cannot be left for the next frame.
|
// cannot be left for the next frame.
|
||||||
loop {
|
loop {
|
||||||
for &id in rsc.widgets().needs_redraw.iter() {
|
for &id in rsc.widgets().needs_redraw.iter() {
|
||||||
if !self.deferred.contains(&id) {
|
if !self.deferred.contains(&id) {
|
||||||
let depth = self.depth(id);
|
let depth = self.depth(id);
|
||||||
self.pending.insert((depth, id));
|
self.pending.push((depth, id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if self.pending.is_empty() {
|
if self.pending.is_empty() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
while let Some((depth, id)) = self.pending.pop_last() {
|
while let Some((depth, id)) = self.pending.pop() {
|
||||||
// Settled inside an ancestor's draw, or deferred to one,
|
// Settled inside an ancestor's draw, or deferred to one,
|
||||||
// since the mark that queued it.
|
// since the mark that queued it.
|
||||||
if self.deferred.contains(&id) || !rsc.widgets().needs_redraw.contains(&id) {
|
if self.deferred.contains(&id) || !rsc.widgets().needs_redraw.contains(&id) {
|
||||||
@@ -990,7 +1056,7 @@ impl UiRenderState {
|
|||||||
// depth it had under the parent it left.
|
// depth it had under the parent it left.
|
||||||
let now = self.depth(id);
|
let now = self.depth(id);
|
||||||
if now != depth {
|
if now != depth {
|
||||||
self.pending.insert((now, id));
|
self.pending.push((now, id));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#[cfg(feature = "layout-diagnostics")]
|
#[cfg(feature = "layout-diagnostics")]
|
||||||
@@ -1007,7 +1073,7 @@ impl UiRenderState {
|
|||||||
fn mark(&mut self, id: WidgetId, widgets: &mut Widgets) {
|
fn mark(&mut self, id: WidgetId, widgets: &mut Widgets) {
|
||||||
if widgets.needs_redraw.insert(id) && !self.deferred.contains(&id) {
|
if widgets.needs_redraw.insert(id) && !self.deferred.contains(&id) {
|
||||||
let depth = self.depth(id);
|
let depth = self.depth(id);
|
||||||
self.pending.insert((depth, id));
|
self.pending.push((depth, id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1114,7 +1180,13 @@ impl UiRenderState {
|
|||||||
Some(parent) => self.placing_of(parent, self.active[&parent].region),
|
Some(parent) => self.placing_of(parent, self.active[&parent].region),
|
||||||
None => Placing::WINDOW,
|
None => Placing::WINDOW,
|
||||||
};
|
};
|
||||||
let ask = at.ask(rsc.widgets(), self.output_size, id, active.asked);
|
let ask = at.ask(
|
||||||
|
rsc.widgets(),
|
||||||
|
&mut self.requests,
|
||||||
|
self.output_size,
|
||||||
|
id,
|
||||||
|
active.asked,
|
||||||
|
);
|
||||||
let active = &self.active[&id];
|
let active = &self.active[&id];
|
||||||
let declared_changed = ask.declared != active.declared;
|
let declared_changed = ask.declared != active.declared;
|
||||||
let alignment_changed = rsc.widgets().alignment(id) != active.own_align;
|
let alignment_changed = rsc.widgets().alignment(id) != active.own_align;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ use std::any::Any;
|
|||||||
mod data;
|
mod data;
|
||||||
mod handle;
|
mod handle;
|
||||||
mod like;
|
mod like;
|
||||||
|
mod request;
|
||||||
mod size_rule;
|
mod size_rule;
|
||||||
mod tag;
|
mod tag;
|
||||||
mod view;
|
mod view;
|
||||||
@@ -12,6 +13,7 @@ mod widgets;
|
|||||||
pub use data::*;
|
pub use data::*;
|
||||||
pub use handle::*;
|
pub use handle::*;
|
||||||
pub use like::*;
|
pub use like::*;
|
||||||
|
pub use request::*;
|
||||||
pub use size_rule::*;
|
pub use size_rule::*;
|
||||||
pub use tag::*;
|
pub use tag::*;
|
||||||
pub use view::*;
|
pub use view::*;
|
||||||
@@ -21,6 +23,12 @@ pub trait Widget: Any {
|
|||||||
/// Draws the widget, and returns what it used of the box it was given.
|
/// Draws the widget, and returns what it used of the box it was given.
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size;
|
fn draw(&mut self, painter: &mut Painter) -> Size;
|
||||||
|
|
||||||
|
/// Describes an axis before painting. Return `None` when discovering it
|
||||||
|
/// needs a concrete box or work performed by `draw`.
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
self.size_hint(axis).map(|len| requests.length(len))
|
||||||
|
}
|
||||||
|
|
||||||
/// An exact length the widget can give without a painter or its children.
|
/// An exact length the widget can give without a painter or its children.
|
||||||
/// Optional, and saves a draw rather than changing one: a hint that
|
/// Optional, and saves a draw rather than changing one: a hint that
|
||||||
/// disagrees with the eventual draw fails a debug assertion.
|
/// disagrees with the eventual draw fails a debug assertion.
|
||||||
|
|||||||
@@ -0,0 +1,438 @@
|
|||||||
|
use crate::{Axis, LayoutLen, Len, Px, StrongWidget, Weight, WidgetId, Widgets};
|
||||||
|
|
||||||
|
impl<N: crate::UiNum> From<N> for SizeRequest {
|
||||||
|
fn from(value: N) -> Self {
|
||||||
|
LayoutLen::px(value).into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LayoutLen {
|
||||||
|
pub fn min(self, other: impl Into<SizeRequest>) -> SizeRequest {
|
||||||
|
SizeRequest::from(self).min(other)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn max(self, other: impl Into<SizeRequest>) -> SizeRequest {
|
||||||
|
SizeRequest::from(self).max(other)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clamp(self, min: impl Into<SizeRequest>, max: impl Into<SizeRequest>) -> SizeRequest {
|
||||||
|
SizeRequest::from(self).clamp(min, max)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A size request before a container has divided its leftover space.
|
||||||
|
/// Comparisons keep both operands until the share is known.
|
||||||
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
|
pub enum SizeRequest {
|
||||||
|
Linear(LayoutLen),
|
||||||
|
Sum(std::sync::Arc<(Self, Self)>),
|
||||||
|
Min(std::sync::Arc<(Self, Self)>),
|
||||||
|
Max(std::sync::Arc<(Self, Self)>),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<LayoutLen> for SizeRequest {
|
||||||
|
fn from(len: LayoutLen) -> Self {
|
||||||
|
Self::Linear(len)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<Len> for SizeRequest {
|
||||||
|
fn from(len: Len) -> Self {
|
||||||
|
LayoutLen::from(len).into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SizeRequest {
|
||||||
|
pub fn min(self, other: impl Into<Self>) -> Self {
|
||||||
|
let other = other.into();
|
||||||
|
if let (Self::Linear(a), Self::Linear(b)) = (&self, &other)
|
||||||
|
&& let Some(order) = independent_order(*a, *b)
|
||||||
|
{
|
||||||
|
return if !order.is_gt() { self } else { other };
|
||||||
|
}
|
||||||
|
if self == other {
|
||||||
|
self
|
||||||
|
} else {
|
||||||
|
Self::Min(std::sync::Arc::new((self, other)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn max(self, other: impl Into<Self>) -> Self {
|
||||||
|
let other = other.into();
|
||||||
|
if let (Self::Linear(a), Self::Linear(b)) = (&self, &other)
|
||||||
|
&& let Some(order) = independent_order(*a, *b)
|
||||||
|
{
|
||||||
|
return if !order.is_lt() { self } else { other };
|
||||||
|
}
|
||||||
|
if self == other {
|
||||||
|
self
|
||||||
|
} else {
|
||||||
|
Self::Max(std::sync::Arc::new((self, other)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clamp(self, min: impl Into<Self>, max: impl Into<Self>) -> Self {
|
||||||
|
self.max(min).min(max)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::ops::Add for SizeRequest {
|
||||||
|
type Output = Self;
|
||||||
|
|
||||||
|
fn add(self, other: Self) -> Self {
|
||||||
|
match (self, other) {
|
||||||
|
(Self::Linear(a), Self::Linear(b)) => Self::Linear(a + b),
|
||||||
|
(a, b) => Self::Sum(std::sync::Arc::new((a, b))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A discovered length. Deferred values belong to the current layout pass;
|
||||||
|
/// widgets must not retain them. Ordinary requests remain inline lengths.
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
pub struct RequestedLen(RequestValue);
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
enum RequestValue {
|
||||||
|
Linear(LayoutLen),
|
||||||
|
Deferred {
|
||||||
|
index: usize,
|
||||||
|
epoch: u64,
|
||||||
|
leftover: bool,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<LayoutLen> for RequestedLen {
|
||||||
|
fn from(len: LayoutLen) -> Self {
|
||||||
|
Self(RequestValue::Linear(len))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl From<Len> for RequestedLen {
|
||||||
|
fn from(len: Len) -> Self {
|
||||||
|
LayoutLen::from(len).into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl RequestedLen {
|
||||||
|
pub fn linear(self) -> Option<LayoutLen> {
|
||||||
|
match self.0 {
|
||||||
|
RequestValue::Linear(len) => Some(len),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn has_leftover(self) -> bool {
|
||||||
|
match self.0 {
|
||||||
|
RequestValue::Linear(len) => len.leftover > Weight::ZERO,
|
||||||
|
RequestValue::Deferred { leftover, .. } => leftover,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
enum Op {
|
||||||
|
Sum,
|
||||||
|
Min,
|
||||||
|
Max,
|
||||||
|
}
|
||||||
|
struct Node {
|
||||||
|
op: Op,
|
||||||
|
a: RequestedLen,
|
||||||
|
b: RequestedLen,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub(crate) struct RequestArena {
|
||||||
|
nodes: Vec<Node>,
|
||||||
|
epoch: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RequestArena {
|
||||||
|
pub(crate) fn reset(&mut self) {
|
||||||
|
self.nodes.clear();
|
||||||
|
self.epoch = self
|
||||||
|
.epoch
|
||||||
|
.checked_add(1)
|
||||||
|
.expect("layout generation exhausted");
|
||||||
|
}
|
||||||
|
pub(crate) fn import(&mut self, request: &SizeRequest, base: Len) -> RequestedLen {
|
||||||
|
let (op, pair) = match request {
|
||||||
|
SizeRequest::Linear(len) => return len.within_len(base).into(),
|
||||||
|
SizeRequest::Sum(pair) => (Op::Sum, pair),
|
||||||
|
SizeRequest::Min(pair) => (Op::Min, pair),
|
||||||
|
SizeRequest::Max(pair) => (Op::Max, pair),
|
||||||
|
};
|
||||||
|
let a = self.import(&pair.0, base);
|
||||||
|
let b = self.import(&pair.1, base);
|
||||||
|
self.combine(op, a, b)
|
||||||
|
}
|
||||||
|
fn combine(&mut self, op: Op, a: RequestedLen, b: RequestedLen) -> RequestedLen {
|
||||||
|
if let (Some(x), Some(y)) = (a.linear(), b.linear()) {
|
||||||
|
if matches!(op, Op::Sum) {
|
||||||
|
return (x + y).into();
|
||||||
|
}
|
||||||
|
let order = independent_order(x, y);
|
||||||
|
if let Some(order) = order {
|
||||||
|
let take_a = match op {
|
||||||
|
Op::Min => !order.is_gt(),
|
||||||
|
_ => !order.is_lt(),
|
||||||
|
};
|
||||||
|
return if take_a { a } else { b };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if a == b && !matches!(op, Op::Sum) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
let index = self.nodes.len();
|
||||||
|
self.nodes.push(Node { op, a, b });
|
||||||
|
RequestedLen(RequestValue::Deferred {
|
||||||
|
index,
|
||||||
|
epoch: self.epoch,
|
||||||
|
leftover: a.has_leftover() || b.has_leftover(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
pub(crate) fn minimum(&self, request: RequestedLen, window: Px) -> Px {
|
||||||
|
Px::from_raw(self.segment(request, Ratio::ZERO, window).fixed as i32)
|
||||||
|
}
|
||||||
|
fn segment(&self, request: RequestedLen, at: Ratio, window: Px) -> Segment {
|
||||||
|
match request.0 {
|
||||||
|
RequestValue::Linear(len) => {
|
||||||
|
assert!(
|
||||||
|
len.leftover >= Weight::ZERO,
|
||||||
|
"a leftover weight cannot be negative"
|
||||||
|
);
|
||||||
|
Segment {
|
||||||
|
fixed: i64::from(len.without_leftover().to_px(window).raw()),
|
||||||
|
weight: i64::from(len.leftover.raw()),
|
||||||
|
end: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RequestValue::Deferred { index, epoch, .. } => {
|
||||||
|
assert_eq!(epoch, self.epoch, "request retained beyond its layout pass");
|
||||||
|
let Node { op, a, b } = self.nodes[index];
|
||||||
|
let a = self.segment(a, at, window);
|
||||||
|
let b = self.segment(b, at, window);
|
||||||
|
if matches!(op, Op::Sum) {
|
||||||
|
return a + b;
|
||||||
|
}
|
||||||
|
// At a crossing choose the branch to its right, so the next
|
||||||
|
// iteration advances rather than selecting that crossing again.
|
||||||
|
let order = a.value(at).cmp(&b.value(at)).then(a.weight.cmp(&b.weight));
|
||||||
|
let take_a = match op {
|
||||||
|
Op::Min => !order.is_gt(),
|
||||||
|
_ => !order.is_lt(),
|
||||||
|
};
|
||||||
|
let mut selected = if take_a { a } else { b };
|
||||||
|
selected.end = first(a.end, b.end);
|
||||||
|
if a.weight != b.weight {
|
||||||
|
let crossing = Ratio::new(b.fixed - a.fixed, a.weight - b.weight);
|
||||||
|
if crossing > at {
|
||||||
|
selected.end = first(selected.end, Some(crossing));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
selected
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Allocates one scope of nonnegative shares. Floors can overflow; caps
|
||||||
|
/// can leave unused room. Prefix rounding keeps adjacent slot edges equal.
|
||||||
|
pub(crate) fn allocate<'a>(
|
||||||
|
&'a self,
|
||||||
|
requests: &'a [RequestedLen],
|
||||||
|
room: Px,
|
||||||
|
window: Px,
|
||||||
|
) -> impl Iterator<Item = Px> + 'a {
|
||||||
|
let mut at = Ratio::ZERO;
|
||||||
|
loop {
|
||||||
|
let total = requests.iter().fold(Segment::ZERO, |total, request| {
|
||||||
|
total + self.segment(*request, at, window)
|
||||||
|
});
|
||||||
|
if total.value(at) >= i128::from(room.raw()) * i128::from(at.den) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if total.weight != 0 {
|
||||||
|
let solution = Ratio::new(i64::from(room.raw()) - total.fixed, total.weight);
|
||||||
|
if total.end.is_none_or(|end| solution <= end) {
|
||||||
|
at = solution;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match total.end {
|
||||||
|
Some(end) => at = end,
|
||||||
|
None => break,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut prefix = 0_i128;
|
||||||
|
let mut previous = 0_i128;
|
||||||
|
requests.iter().map(move |request| {
|
||||||
|
prefix += self.segment(*request, at, window).value(at);
|
||||||
|
let den = i128::from(at.den);
|
||||||
|
let edge = prefix.signum() * ((prefix.abs() + den / 2) / den);
|
||||||
|
let len = Px::from_raw((edge - previous) as i32);
|
||||||
|
previous = edge;
|
||||||
|
len
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, Eq)]
|
||||||
|
struct Ratio {
|
||||||
|
num: i64,
|
||||||
|
den: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialEq for Ratio {
|
||||||
|
fn eq(&self, other: &Self) -> bool {
|
||||||
|
self.cmp(other).is_eq()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Ratio {
|
||||||
|
const ZERO: Self = Self { num: 0, den: 1 };
|
||||||
|
|
||||||
|
fn new(num: i64, den: i64) -> Self {
|
||||||
|
assert_ne!(den, 0);
|
||||||
|
if den < 0 {
|
||||||
|
Self {
|
||||||
|
num: -num,
|
||||||
|
den: -den,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Self { num, den }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Ord for Ratio {
|
||||||
|
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
||||||
|
(i128::from(self.num) * i128::from(other.den))
|
||||||
|
.cmp(&(i128::from(other.num) * i128::from(self.den)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialOrd for Ratio {
|
||||||
|
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
|
||||||
|
Some(self.cmp(other))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct Segment {
|
||||||
|
fixed: i64,
|
||||||
|
weight: i64,
|
||||||
|
end: Option<Ratio>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Segment {
|
||||||
|
const ZERO: Self = Self {
|
||||||
|
fixed: 0,
|
||||||
|
weight: 0,
|
||||||
|
end: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
fn value(self, at: Ratio) -> i128 {
|
||||||
|
i128::from(self.fixed) * i128::from(at.den) + i128::from(self.weight) * i128::from(at.num)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::ops::Add for Segment {
|
||||||
|
type Output = Self;
|
||||||
|
fn add(self, other: Self) -> Self {
|
||||||
|
Self {
|
||||||
|
fixed: self.fixed + other.fixed,
|
||||||
|
weight: self.weight + other.weight,
|
||||||
|
end: first(self.end, other.end),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn first(a: Option<Ratio>, b: Option<Ratio>) -> Option<Ratio> {
|
||||||
|
match (a, b) {
|
||||||
|
(Some(a), Some(b)) => Some(a.min(b)),
|
||||||
|
(a, b) => a.or(b),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Read-only discovery of requests through a widget's children. A request is
|
||||||
|
/// expressed in window lengths; `rel_base` supplies the base for declarations.
|
||||||
|
pub struct SizeRequests<'a> {
|
||||||
|
pub(crate) arena: &'a mut RequestArena,
|
||||||
|
pub(crate) measured: Option<&'a crate::util::HashMap<WidgetId, crate::ActiveData>>,
|
||||||
|
pub(crate) widgets: &'a Widgets,
|
||||||
|
pub(crate) dependencies: &'a mut Vec<WidgetId>,
|
||||||
|
pub(crate) rel_base: Len,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SizeRequests<'_> {
|
||||||
|
pub fn sum(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
|
||||||
|
self.arena.combine(Op::Sum, a, b)
|
||||||
|
}
|
||||||
|
pub fn min(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
|
||||||
|
self.arena.combine(Op::Min, a, b)
|
||||||
|
}
|
||||||
|
pub fn max(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
|
||||||
|
self.arena.combine(Op::Max, a, b)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn widget<W: ?Sized>(
|
||||||
|
&mut self,
|
||||||
|
child: &StrongWidget<W>,
|
||||||
|
axis: Axis,
|
||||||
|
) -> Option<RequestedLen> {
|
||||||
|
self.dependencies.push(child.id());
|
||||||
|
let rules = self.widgets.size_rules(child.id());
|
||||||
|
let rule = &rules[axis];
|
||||||
|
if let crate::SizeRule::Request(request) = rule {
|
||||||
|
return Some(self.arena.import(request, self.rel_base));
|
||||||
|
}
|
||||||
|
if let Some(exact) = rule.exact() {
|
||||||
|
return Some(exact.within_len(self.rel_base).into());
|
||||||
|
}
|
||||||
|
let widget = self.widgets.get_dyn(child.id())?;
|
||||||
|
let request = widget.size_request(self, axis).or_else(|| {
|
||||||
|
self.measured?
|
||||||
|
.get(&child.id())?
|
||||||
|
.measured()
|
||||||
|
.map(|size| size[axis].into())
|
||||||
|
})?;
|
||||||
|
Some(self.bounded(request, rule.bound()))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn bounded(&mut self, request: RequestedLen, bound: crate::Bound) -> RequestedLen {
|
||||||
|
let bound = bound.within_len(self.rel_base);
|
||||||
|
let request = match bound.min {
|
||||||
|
Some(min) => self.max(request, min.into()),
|
||||||
|
None => request,
|
||||||
|
};
|
||||||
|
match bound.max {
|
||||||
|
Some(max) => self.min(request, max.into()),
|
||||||
|
None => request,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn length(&self, len: LayoutLen) -> RequestedLen {
|
||||||
|
len.within_len(self.rel_base).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn inset<W: ?Sized>(
|
||||||
|
&mut self,
|
||||||
|
child: &StrongWidget<W>,
|
||||||
|
axis: Axis,
|
||||||
|
padding: Px,
|
||||||
|
) -> Option<RequestedLen> {
|
||||||
|
let base = self.rel_base;
|
||||||
|
self.rel_base.px -= padding;
|
||||||
|
let request = self.widget(child, axis);
|
||||||
|
self.rel_base = base;
|
||||||
|
request.map(|request| self.sum(request, Len::from_parts(crate::Rel::ZERO, padding).into()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Equal fractions keep this valid even when padding makes a rel base negative.
|
||||||
|
fn independent_order(a: LayoutLen, b: LayoutLen) -> Option<std::cmp::Ordering> {
|
||||||
|
if a.rel == b.rel && a.leftover == b.leftover {
|
||||||
|
Some(a.px.cmp(&b.px))
|
||||||
|
} else if a.px == b.px && a.rel == b.rel {
|
||||||
|
Some(a.leftover.cmp(&b.leftover))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
use crate::util::impl_axis_index;
|
use crate::util::impl_axis_index;
|
||||||
use crate::{Axis, LayoutLen, Len, Rel};
|
use crate::{Axis, LayoutLen, Len, Rel, SizeRequest};
|
||||||
|
|
||||||
/// What a widget's length on one axis is, as a rule its parent applies where
|
/// What a widget's length on one axis is, as a rule its parent applies where
|
||||||
/// it draws it rather than an answer the widget gives about itself.
|
/// it draws it rather than an answer the widget gives about itself.
|
||||||
@@ -10,16 +10,17 @@ use crate::{Axis, LayoutLen, Len, Rel};
|
|||||||
/// nobody has drawn yet, and it is why a rule lives beside the widget rather
|
/// nobody has drawn yet, and it is why a rule lives beside the widget rather
|
||||||
/// than inside it -- the widget under the rule never has to know about it.
|
/// than inside it -- the widget under the rule never has to know about it.
|
||||||
///
|
///
|
||||||
/// A rule gives a length or bounds one, never both: a share that is also
|
/// Exact expressions can bound a share before allocation. Bounds on an
|
||||||
/// capped wants two widgets, one taking the share and one capping what is
|
/// intrinsic answer are applied after that answer becomes known.
|
||||||
/// inside it.
|
#[derive(Debug, Clone, PartialEq, Default)]
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Default)]
|
|
||||||
pub enum SizeRule {
|
pub enum SizeRule {
|
||||||
/// Whatever the widget reports from drawing.
|
/// Whatever the widget reports from drawing.
|
||||||
#[default]
|
#[default]
|
||||||
Free,
|
Free,
|
||||||
/// This length, whatever the widget reports.
|
/// This length, whatever the widget reports.
|
||||||
Exact(LayoutLen),
|
Exact(LayoutLen),
|
||||||
|
/// An exact request whose comparisons await the parent's allocation.
|
||||||
|
Request(std::sync::Arc<SizeRequest>),
|
||||||
/// At least this long, and otherwise whatever the box gives it.
|
/// At least this long, and otherwise whatever the box gives it.
|
||||||
Min(Len),
|
Min(Len),
|
||||||
/// At most this long.
|
/// At most this long.
|
||||||
@@ -33,7 +34,7 @@ impl SizeRule {
|
|||||||
/// outright.
|
/// outright.
|
||||||
pub fn bound(&self) -> Bound {
|
pub fn bound(&self) -> Bound {
|
||||||
match *self {
|
match *self {
|
||||||
Self::Free | Self::Exact(_) => Bound::ANY,
|
Self::Free | Self::Exact(_) | Self::Request(_) => Bound::ANY,
|
||||||
Self::Min(min) => Bound {
|
Self::Min(min) => Bound {
|
||||||
min: Some(min),
|
min: Some(min),
|
||||||
max: None,
|
max: None,
|
||||||
@@ -66,10 +67,8 @@ impl SizeRule {
|
|||||||
match *self {
|
match *self {
|
||||||
Self::Free | Self::Min(_) => Self::Min(min),
|
Self::Free | Self::Min(_) => Self::Min(min),
|
||||||
Self::Max(max) | Self::Clamp { max, .. } => Self::Clamp { min, max },
|
Self::Max(max) | Self::Clamp { max, .. } => Self::Clamp { min, max },
|
||||||
Self::Exact(len) => {
|
Self::Request(ref request) => request.as_ref().clone().max(min).into(),
|
||||||
debug_assert!(false, "{len:?} is a length, so bounding it says nothing");
|
Self::Exact(len) => len.max(min).into(),
|
||||||
Self::Min(min)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,10 +78,8 @@ impl SizeRule {
|
|||||||
match *self {
|
match *self {
|
||||||
Self::Free | Self::Max(_) => Self::Max(max),
|
Self::Free | Self::Max(_) => Self::Max(max),
|
||||||
Self::Min(min) | Self::Clamp { min, .. } => Self::Clamp { min, max },
|
Self::Min(min) | Self::Clamp { min, .. } => Self::Clamp { min, max },
|
||||||
Self::Exact(len) => {
|
Self::Request(ref request) => request.as_ref().clone().min(max).into(),
|
||||||
debug_assert!(false, "{len:?} is a length, so bounding it says nothing");
|
Self::Exact(len) => len.min(max).into(),
|
||||||
Self::Max(max)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,20 +97,18 @@ impl SizeRule {
|
|||||||
pub fn exact(&self) -> Option<LayoutLen> {
|
pub fn exact(&self) -> Option<LayoutLen> {
|
||||||
match self {
|
match self {
|
||||||
Self::Exact(len) => Some(*len),
|
Self::Exact(len) => Some(*len),
|
||||||
Self::Free | Self::Min(_) | Self::Max(_) | Self::Clamp { .. } => None,
|
Self::Free | Self::Request(_) | Self::Min(_) | Self::Max(_) | Self::Clamp { .. } => {
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// What a rule allows a length to be where it does not give one outright: a
|
/// What a rule allows a length to be where it does not give one outright: a
|
||||||
/// floor, a cap, or both. Each is a length of the rel base the widget is
|
/// floor, a cap, or both. Each is a length of the rel base the widget is
|
||||||
/// asked with, which is the base a declared length is a fraction of too, and
|
/// asked with, which is the base a declared length is a fraction of too.
|
||||||
/// a bound that binds is a declaration -- the box comes to what it says.
|
|
||||||
///
|
///
|
||||||
/// A bound is a [`Len`] and never a share. Which of a fixed and a relative
|
/// A bound is a [`Len`]. Comparisons involving shares are [`SizeRequest`]s.
|
||||||
/// child is longer, asked at the length the cap is itself deciding, admits
|
|
||||||
/// several self-sizing fixed points, so a cap containing `leftover` has no
|
|
||||||
/// one answer: see `docs/LAYOUT.md` under the failed hypotheses.
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Default)]
|
#[derive(Debug, Clone, Copy, PartialEq, Default)]
|
||||||
pub struct Bound {
|
pub struct Bound {
|
||||||
pub min: Option<Len>,
|
pub min: Option<Len>,
|
||||||
@@ -183,6 +178,15 @@ impl From<LayoutLen> for SizeRule {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<SizeRequest> for SizeRule {
|
||||||
|
fn from(request: SizeRequest) -> Self {
|
||||||
|
match request {
|
||||||
|
SizeRequest::Linear(len) => Self::Exact(len),
|
||||||
|
request => Self::Request(std::sync::Arc::new(request)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl From<Option<LayoutLen>> for SizeRule {
|
impl From<Option<LayoutLen>> for SizeRule {
|
||||||
fn from(len: Option<LayoutLen>) -> Self {
|
fn from(len: Option<LayoutLen>) -> Self {
|
||||||
len.map_or(Self::Free, Self::Exact)
|
len.map_or(Self::Free, Self::Exact)
|
||||||
@@ -191,7 +195,7 @@ impl From<Option<LayoutLen>> for SizeRule {
|
|||||||
|
|
||||||
/// One rule per axis, which is how a widget carries a length on one axis and
|
/// One rule per axis, which is how a widget carries a length on one axis and
|
||||||
/// leaves the other to whatever it draws.
|
/// leaves the other to whatever it draws.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Default)]
|
#[derive(Debug, Clone, PartialEq, Default)]
|
||||||
pub struct SizeRules {
|
pub struct SizeRules {
|
||||||
pub x: SizeRule,
|
pub x: SizeRule,
|
||||||
pub y: SizeRule,
|
pub y: SizeRule,
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ impl Widgets {
|
|||||||
|
|
||||||
/// The length rules whoever draws this widget applies to its box.
|
/// The length rules whoever draws this widget applies to its box.
|
||||||
pub fn size_rules(&self, id: impl IdLike) -> SizeRules {
|
pub fn size_rules(&self, id: impl IdLike) -> SizeRules {
|
||||||
self.data(id).unwrap().size
|
self.data(id).unwrap().size.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets one axis's rule. The widget is marked rather than its parent
|
/// Sets one axis's rule. The widget is marked rather than its parent
|
||||||
|
|||||||
+4
-4
@@ -292,7 +292,7 @@ impl Plan {
|
|||||||
align: None,
|
align: None,
|
||||||
..self.clone()
|
..self.clone()
|
||||||
}),
|
}),
|
||||||
self.size.map(|_| Plan {
|
self.size.as_ref().map(|_| Plan {
|
||||||
size: None,
|
size: None,
|
||||||
..self.clone()
|
..self.clone()
|
||||||
}),
|
}),
|
||||||
@@ -373,7 +373,7 @@ impl Plan {
|
|||||||
}
|
}
|
||||||
if plan.size.is_some() {
|
if plan.size.is_some() {
|
||||||
if let Some(lens) = edits.sizes.get(&sized) {
|
if let Some(lens) = edits.sizes.get(&sized) {
|
||||||
plan.size = Some(*lens);
|
plan.size = Some(lens.clone());
|
||||||
}
|
}
|
||||||
sized += 1;
|
sized += 1;
|
||||||
}
|
}
|
||||||
@@ -716,7 +716,7 @@ impl Sow<'_> {
|
|||||||
}
|
}
|
||||||
let idx = self.sized;
|
let idx = self.sized;
|
||||||
self.sized += 1;
|
self.sized += 1;
|
||||||
inner.size = Some(self.edits.sizes.get(&idx).copied().unwrap_or(lens));
|
inner.size = Some(self.edits.sizes.get(&idx).cloned().unwrap_or(lens));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// An alignment over some of the tree, kept where a test can change it.
|
/// An alignment over some of the tree, kept where a test can change it.
|
||||||
@@ -852,7 +852,7 @@ impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
|
|||||||
fn node(&mut self, plan: &Plan) -> StrongWidget {
|
fn node(&mut self, plan: &Plan) -> StrongWidget {
|
||||||
let built = self.kind(&plan.kind);
|
let built = self.kind(&plan.kind);
|
||||||
let id = built.id();
|
let id = built.id();
|
||||||
if let Some(lens) = plan.size {
|
if let Some(lens) = plan.size.clone() {
|
||||||
self.rsc.ui_mut().widgets.set_size_rules(id, lens.x, lens.y);
|
self.rsc.ui_mut().widgets.set_size_rules(id, lens.x, lens.y);
|
||||||
self.tree.sized.push(id);
|
self.tree.sized.push(id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ pub struct LayerOffset {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for LayerOffset {
|
impl Widget for LayerOffset {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
requests.widget(&self.inner, axis)
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
for _ in 0..self.offset {
|
for _ in 0..self.offset {
|
||||||
painter.next_layer();
|
painter.next_layer();
|
||||||
|
|||||||
@@ -30,6 +30,14 @@ impl MaxSize {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for MaxSize {
|
impl Widget for MaxSize {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
let inner = requests.widget(&self.inner, axis)?;
|
||||||
|
Some(match self.max(axis) {
|
||||||
|
Some(max) => requests.min(inner, max.into()),
|
||||||
|
None => inner,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
let align = painter.alignment();
|
let align = painter.alignment();
|
||||||
let mut region = UiRegion::FULL;
|
let mut region = UiRegion::FULL;
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ pub struct Offset {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for Offset {
|
impl Widget for Offset {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
requests.widget(&self.inner, axis)
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
painter
|
painter
|
||||||
.widget_at(&self.inner, UiRegion::FULL.offset(self.amt))
|
.widget_at(&self.inner, UiRegion::FULL.offset(self.amt))
|
||||||
|
|||||||
@@ -6,6 +6,14 @@ pub struct Pad {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for Pad {
|
impl Widget for Pad {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
let padding = match axis {
|
||||||
|
Axis::X => self.padding.left + self.padding.right,
|
||||||
|
Axis::Y => self.padding.top + self.padding.bottom,
|
||||||
|
};
|
||||||
|
requests.inset(&self.inner, axis, padding)
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
// The inner's own alignment, not the near edge. This reports the
|
// The inner's own alignment, not the near edge. This reports the
|
||||||
// inner's size plus the padding, so where the box is that answer the
|
// inner's size plus the padding, so where the box is that answer the
|
||||||
|
|||||||
+109
-49
@@ -8,57 +8,79 @@ pub struct Span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for Span {
|
impl Widget for Span {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
if axis != self.dir.axis {
|
||||||
|
// A share can be hidden when the other axis has no room. Its
|
||||||
|
// cross-axis length then contributes nothing to the drawn answer.
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let mut total = RequestedLen::from(Len::from_parts(
|
||||||
|
Rel::ZERO,
|
||||||
|
self.gap
|
||||||
|
.mul_int(self.children.len().saturating_sub(1) as i32),
|
||||||
|
));
|
||||||
|
for child in &self.children {
|
||||||
|
let child = requests.widget(child, axis)?;
|
||||||
|
total = requests.sum(total, child);
|
||||||
|
}
|
||||||
|
Some(total)
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
|
painter.with_requests(|painter, lens, values| self.layout(painter, lens, values))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Span {
|
||||||
|
fn layout(
|
||||||
|
&self,
|
||||||
|
painter: &mut Painter,
|
||||||
|
lens: &mut Vec<RequestedLen>,
|
||||||
|
values: &mut Vec<Px>,
|
||||||
|
) -> Size {
|
||||||
let axis = self.dir.axis;
|
let axis = self.dir.axis;
|
||||||
// The row this span lays its children out along, as a length of the
|
// The row this span lays its children out along, as a length of the
|
||||||
// rel base they are laid out against. Where it starts is nothing's
|
// rel base they are laid out against. Where it starts is nothing's
|
||||||
// business -- a slot is a length from there -- so what this reads is
|
// business -- a slot is a length from there -- so what this reads is
|
||||||
// the length alone.
|
// the length alone.
|
||||||
let row = painter.region_len(axis);
|
let row = painter.region_len(axis);
|
||||||
// A length for every child before their final slots are chosen: from
|
self.collect(painter, row, lens, true);
|
||||||
// a hint where one says, and from drawing otherwise. The rel base passes
|
|
||||||
// through unchanged, so `rel(0.5)` is half the area this span was
|
|
||||||
// given whatever else is in it and wherever this child sits among
|
|
||||||
// them; what a drawn child is asked in is the room left from the
|
|
||||||
// cursor, because a text has to wrap at the width actually there.
|
|
||||||
let mut cursor = Len::ZERO;
|
|
||||||
let mut lens = Vec::with_capacity(self.children.len());
|
|
||||||
for child in &self.children {
|
|
||||||
let len = match painter.size_hint(child, axis) {
|
|
||||||
Some(len) => len,
|
|
||||||
None => {
|
|
||||||
// Across itself the child sits where its own alignment
|
|
||||||
// says, in the whole of the row: a span is what contains
|
|
||||||
// its children there, and nothing divides that axis.
|
|
||||||
let room = self.slot(row, cursor, row).shifted_desc().on_axis(axis);
|
|
||||||
painter.widget_at(child, room).len(axis)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
cursor += len.without_leftover();
|
|
||||||
cursor.px += self.gap;
|
|
||||||
lens.push(len);
|
|
||||||
}
|
|
||||||
|
|
||||||
let gaps = self
|
let gaps = self
|
||||||
.gap
|
.gap
|
||||||
.mul_int(self.children.len().saturating_sub(1) as i32);
|
.mul_int(self.children.len().saturating_sub(1) as i32);
|
||||||
let total = lens.iter().fold(
|
let fixed = lens
|
||||||
LayoutLen {
|
.iter()
|
||||||
px: gaps,
|
.try_fold(Len::from_parts(Rel::ZERO, gaps), |sum, len| {
|
||||||
|
Some(sum + len.linear()?.without_leftover())
|
||||||
|
});
|
||||||
|
if let Some(fixed) = fixed
|
||||||
|
&& lens.iter().any(|len| len.has_leftover())
|
||||||
|
&& !painter.longer_than(row, fixed, axis)
|
||||||
|
{
|
||||||
|
// With no share to assign, intrinsic drawings keep the remaining
|
||||||
|
// offer, including overflow. Their answer is only moved into a slot.
|
||||||
|
self.collect(painter, row, lens, false);
|
||||||
|
}
|
||||||
|
let nonlinear = lens.iter().any(|len| len.linear().is_none());
|
||||||
|
if nonlinear {
|
||||||
|
painter.allocate(lens, row - Len::from_parts(Rel::ZERO, gaps), axis, values);
|
||||||
|
}
|
||||||
|
let allocated = nonlinear.then_some(&values);
|
||||||
|
let total = match &allocated {
|
||||||
|
Some(allocated) => LayoutLen {
|
||||||
|
px: allocated.iter().fold(gaps, |sum, len| sum + *len),
|
||||||
..LayoutLen::ZERO
|
..LayoutLen::ZERO
|
||||||
},
|
},
|
||||||
|sum, len| sum + *len,
|
None => lens.iter().fold(
|
||||||
);
|
LayoutLen {
|
||||||
|
px: gaps,
|
||||||
// What is left for the shares to divide: the row less everything
|
..LayoutLen::ZERO
|
||||||
// fixed, as a length of the rel base rather than a number of pixels.
|
},
|
||||||
|
|sum, len| sum + len.linear().unwrap(),
|
||||||
|
),
|
||||||
|
};
|
||||||
let all_fixed = total.without_leftover();
|
let all_fixed = total.without_leftover();
|
||||||
let room = row - all_fixed;
|
let room = row - all_fixed;
|
||||||
// The three cases a rounded division needed -- the fixed parts
|
|
||||||
// growing slower than the box, faster, or exactly with it -- are the
|
|
||||||
// sign of `room.rel`, which the range `longer_than` keeps already
|
|
||||||
// reads. What the generated oracle checks is the consequence, since
|
|
||||||
// which children exist at all turns on this.
|
|
||||||
let any_leftover = total.leftover > Weight::ZERO;
|
let any_leftover = total.leftover > Weight::ZERO;
|
||||||
let has_room = any_leftover && painter.longer_than(row, all_fixed, axis);
|
let has_room = any_leftover && painter.longer_than(row, all_fixed, axis);
|
||||||
|
|
||||||
@@ -83,17 +105,30 @@ impl Widget for Span {
|
|||||||
false => fixed,
|
false => fixed,
|
||||||
true => fixed + room.scale(Rel::ratio(taken, total.leftover)),
|
true => fixed + room.scale(Rel::ratio(taken, total.leftover)),
|
||||||
};
|
};
|
||||||
for (child, &len) in self.children.iter().zip(&lens) {
|
for (index, (child, request)) in self.children.iter().zip(lens.iter()).enumerate() {
|
||||||
|
let len = match &allocated {
|
||||||
|
Some(allocated) => LayoutLen {
|
||||||
|
px: allocated[index],
|
||||||
|
..LayoutLen::ZERO
|
||||||
|
},
|
||||||
|
None => request.linear().unwrap(),
|
||||||
|
};
|
||||||
|
let shares = match &allocated {
|
||||||
|
Some(_) => request.has_leftover(),
|
||||||
|
None => len.leftover > Weight::ZERO && has_room,
|
||||||
|
};
|
||||||
// A child asking for nothing but a part of what is left over,
|
// A child asking for nothing but a part of what is left over,
|
||||||
// when nothing is, is not drawn at all. One that also asked for
|
// when nothing is, is not drawn at all. One that also asked for
|
||||||
// pixels or a fraction keeps those and overflows.
|
// pixels or a fraction keeps those and overflows.
|
||||||
if len.is_only_leftover() && !has_room {
|
if (len.is_only_leftover() && !has_room)
|
||||||
|
|| (allocated.is_some() && shares && len.px == Px::ZERO)
|
||||||
|
{
|
||||||
painter.undraw(child);
|
painter.undraw(child);
|
||||||
fixed.px += self.gap;
|
fixed.px += self.gap;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let from = reached(fixed, taken);
|
let from = reached(fixed, taken);
|
||||||
if len.leftover > Weight::ZERO && has_room {
|
if shares {
|
||||||
taken += len.leftover;
|
taken += len.leftover;
|
||||||
}
|
}
|
||||||
fixed += len.without_leftover();
|
fixed += len.without_leftover();
|
||||||
@@ -106,8 +141,8 @@ impl Widget for Span {
|
|||||||
// fixed child's slot is its own answer, so a drawing made in the
|
// fixed child's slot is its own answer, so a drawing made in the
|
||||||
// room is put there as it is, and one not made yet is made here.
|
// room is put there as it is, and one not made yet is made here.
|
||||||
let slot = self.slot(row, from, to);
|
let slot = self.slot(row, from, to);
|
||||||
let mut place = slot.shifted_desc().fills().on_axis(axis);
|
let mut place = slot.shifted_desc().allocated().on_axis(axis);
|
||||||
if len.leftover > Weight::ZERO && has_room {
|
if shares {
|
||||||
place = place.rel_base(axis, slot.len());
|
place = place.rel_base(axis, slot.len());
|
||||||
}
|
}
|
||||||
let used = painter.place_at(child, place).len(!axis);
|
let used = painter.place_at(child, place).len(!axis);
|
||||||
@@ -125,13 +160,8 @@ impl Widget for Span {
|
|||||||
fixed.px += self.gap;
|
fixed.px += self.gap;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Carried whole rather than collapsed to one share: a span that sizes
|
// Discovery carries nested requests to the allocating ancestor. The
|
||||||
// from its children does not resolve `leftover`, it passes the weight up,
|
// draw still returns an ordinary Size for callers measuring content.
|
||||||
// so nesting spans divides the same space rather than re-dividing a
|
|
||||||
// share of it. Four `leftover(1)` children under two spans under one span
|
|
||||||
// get a quarter each, which collapsing to `leftover(1)` per level does
|
|
||||||
// not give. Resolution happens at the nearest ancestor with a length,
|
|
||||||
// and the root always has one.
|
|
||||||
let ortho = match shrinks {
|
let ortho = match shrinks {
|
||||||
true => ortho,
|
true => ortho,
|
||||||
false => LayoutLen::rel(1.0),
|
false => LayoutLen::rel(1.0),
|
||||||
@@ -141,6 +171,36 @@ impl Widget for Span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Span {
|
impl Span {
|
||||||
|
fn collect(
|
||||||
|
&self,
|
||||||
|
painter: &mut Painter,
|
||||||
|
row: Len,
|
||||||
|
lens: &mut Vec<RequestedLen>,
|
||||||
|
discover: bool,
|
||||||
|
) {
|
||||||
|
let axis = self.dir.axis;
|
||||||
|
let mut cursor = Len::ZERO;
|
||||||
|
lens.clear();
|
||||||
|
for child in &self.children {
|
||||||
|
let request = if discover {
|
||||||
|
painter.size_request(child, axis)
|
||||||
|
} else {
|
||||||
|
painter.size_hint(child, axis).map(Into::into)
|
||||||
|
};
|
||||||
|
let len = match request {
|
||||||
|
Some(len) => len,
|
||||||
|
None => {
|
||||||
|
let room = self.slot(row, cursor, row).shifted_desc().on_axis(axis);
|
||||||
|
let len = painter.widget_at(child, room).len(axis);
|
||||||
|
painter.measured_request(child, axis, len)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
cursor += painter.minimum_request(&len, axis);
|
||||||
|
cursor.px += self.gap;
|
||||||
|
lens.push(len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// The stretch of the row between two distances from where this span
|
/// The stretch of the row between two distances from where this span
|
||||||
/// starts laying children out, as a span of its own box. A negative
|
/// starts laying children out, as a span of its own box. A negative
|
||||||
/// direction lays out from the far end, so the same two distances mirror
|
/// direction lays out from the far end, so the same two distances mirror
|
||||||
|
|||||||
@@ -8,6 +8,16 @@ pub struct Stack {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Widget for Stack {
|
impl Widget for Stack {
|
||||||
|
fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
|
||||||
|
match self.size {
|
||||||
|
StackSize::Default => Some(LayoutLen::LEFTOVER.into()),
|
||||||
|
StackSize::Child(i) => match self.children.get(i) {
|
||||||
|
Some(child) => requests.widget(child, axis),
|
||||||
|
None => Some(LayoutLen::LEFTOVER.into()),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
let sizing = match self.size {
|
let sizing = match self.size {
|
||||||
StackSize::Default => None,
|
StackSize::Default => None,
|
||||||
|
|||||||
@@ -59,14 +59,14 @@ widget_trait! {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn width(self, len: impl Into<LayoutLen>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
fn width(self, len: impl Into<SizeRequest>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
||||||
let len = len.into();
|
let len = len.into();
|
||||||
move |state| {
|
move |state| {
|
||||||
let id = self.add(state);
|
let id = self.add(state);
|
||||||
state
|
state
|
||||||
.ui_mut()
|
.ui_mut()
|
||||||
.widgets
|
.widgets
|
||||||
.set_size_rule(id, Axis::X, SizeRule::Exact(len));
|
.set_size_rule(id, Axis::X, SizeRule::from(len));
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,14 +115,14 @@ widget_trait! {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn height(self, len: impl Into<LayoutLen>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
fn height(self, len: impl Into<SizeRequest>) -> impl WidgetIdFn<Rsc, WL::Widget> {
|
||||||
let len = len.into();
|
let len = len.into();
|
||||||
move |state| {
|
move |state| {
|
||||||
let id = self.add(state);
|
let id = self.add(state);
|
||||||
state
|
state
|
||||||
.ui_mut()
|
.ui_mut()
|
||||||
.widgets
|
.widgets
|
||||||
.set_size_rule(id, Axis::Y, SizeRule::Exact(len));
|
.set_size_rule(id, Axis::Y, SizeRule::from(len));
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
use iris::{harness::Harness, prelude::*};
|
||||||
|
use std::{
|
||||||
|
alloc::{GlobalAlloc, Layout, System},
|
||||||
|
cell::Cell,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Counting;
|
||||||
|
thread_local! {
|
||||||
|
static COUNT: Cell<Option<usize>> = const { Cell::new(None) };
|
||||||
|
}
|
||||||
|
fn count() {
|
||||||
|
COUNT.with(|count| {
|
||||||
|
if let Some(n) = count.get() {
|
||||||
|
count.set(Some(n + 1));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// The wrapper preserves System's allocation and deallocation contracts;
|
||||||
|
// observing calls here also counts allocations hidden inside layout helpers.
|
||||||
|
unsafe impl GlobalAlloc for Counting {
|
||||||
|
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
|
||||||
|
count();
|
||||||
|
unsafe { System.alloc(layout) }
|
||||||
|
}
|
||||||
|
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
|
||||||
|
unsafe { System.dealloc(ptr, layout) }
|
||||||
|
}
|
||||||
|
unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, size: usize) -> *mut u8 {
|
||||||
|
count();
|
||||||
|
unsafe { System.realloc(ptr, layout, size) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[global_allocator]
|
||||||
|
static ALLOCATOR: Counting = Counting;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unchanged_tree_reuses_layout_storage() {
|
||||||
|
for deferred in [false, true] {
|
||||||
|
let mut h = Harness::new((600, 200));
|
||||||
|
let mut children: Vec<StrongWidget> = Vec::new();
|
||||||
|
for _ in 0..8 {
|
||||||
|
let a = rect(Color::RED).add(&mut h.rsc);
|
||||||
|
if deferred {
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(a, Axis::X, leftover(1).clamp(20, 80).into());
|
||||||
|
}
|
||||||
|
let row = (a, rect(Color::BLUE))
|
||||||
|
.span(Dir::RIGHT)
|
||||||
|
.add_strong(&mut h.rsc);
|
||||||
|
children.push(row);
|
||||||
|
}
|
||||||
|
let root = h.rsc.widgets_mut().add_strong(Span {
|
||||||
|
children,
|
||||||
|
dir: Dir::DOWN,
|
||||||
|
gap: Px::ZERO,
|
||||||
|
});
|
||||||
|
h.state.root = Some(root);
|
||||||
|
h.frame();
|
||||||
|
let ids: Vec<_> = h.render.active.keys().copied().collect();
|
||||||
|
for frame in 0..8 {
|
||||||
|
for &id in &ids {
|
||||||
|
h.rsc.widgets_mut().mark_for_redraw(id);
|
||||||
|
}
|
||||||
|
h.resize((600 + frame % 2, 200));
|
||||||
|
h.frame();
|
||||||
|
}
|
||||||
|
COUNT.set(Some(0));
|
||||||
|
for frame in 0..100 {
|
||||||
|
for &id in &ids {
|
||||||
|
h.rsc.widgets_mut().mark_for_redraw(id);
|
||||||
|
}
|
||||||
|
h.resize((600 + frame % 2, 200));
|
||||||
|
h.frame();
|
||||||
|
}
|
||||||
|
let allocations = COUNT.replace(None).unwrap();
|
||||||
|
println!("deferred={deferred}: {allocations} allocations over 100 resize frames");
|
||||||
|
assert_eq!(allocations, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,381 @@
|
|||||||
|
use std::{cell::Cell, rc::Rc};
|
||||||
|
|
||||||
|
use iris::harness::{Harness, assert_corners};
|
||||||
|
use iris::prelude::*;
|
||||||
|
|
||||||
|
struct Counted {
|
||||||
|
draws: Rc<Cell<usize>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Widget for Counted {
|
||||||
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
|
self.draws.set(self.draws.get() + 1);
|
||||||
|
painter.px_size();
|
||||||
|
painter.primitive(RectPrimitive::color(Color::RED));
|
||||||
|
Size::LEFTOVER
|
||||||
|
}
|
||||||
|
|
||||||
|
fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
|
||||||
|
Some(LayoutLen::LEFTOVER)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_capped_share_returns_room_to_its_sibling() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let first = rect(Color::RED).max_width(80).add(&mut h.rsc);
|
||||||
|
let second = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((first, second).span(Dir::RIGHT));
|
||||||
|
assert_corners!(h, first, (0, 0), (80, 100));
|
||||||
|
assert_corners!(h, second, (80, 0), (300, 100));
|
||||||
|
h.resize((100, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, first, (0, 0), (50, 100));
|
||||||
|
assert_corners!(h, second, (50, 0), (100, 100));
|
||||||
|
h.resize((300, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, first, (0, 0), (80, 100));
|
||||||
|
assert_corners!(h, second, (80, 0), (300, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn nested_shares_are_discovered_without_provisional_paint() {
|
||||||
|
let mut h = Harness::new((400, 100));
|
||||||
|
let draws = Rc::new(Cell::new(0));
|
||||||
|
let leaf = h.rsc.ui_mut().widgets.add_strong(Counted {
|
||||||
|
draws: draws.clone(),
|
||||||
|
});
|
||||||
|
let leaf_id = leaf.id();
|
||||||
|
let mut inner: StrongWidget = leaf;
|
||||||
|
for _ in 0..8 {
|
||||||
|
let sibling = rect(Color::BLUE).add_strong(&mut h.rsc);
|
||||||
|
inner = h.rsc.ui_mut().widgets.add_strong(Span {
|
||||||
|
children: vec![inner, sibling],
|
||||||
|
dir: Dir::RIGHT,
|
||||||
|
gap: Px::ZERO,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
h.state.root = Some(inner);
|
||||||
|
h.frame();
|
||||||
|
assert_eq!(draws.get(), 1);
|
||||||
|
assert!(h.region(&leaf_id).is_some());
|
||||||
|
h.resize((800, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_eq!(draws.get(), 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn nested_bounds_are_resolved_in_the_outer_allocation() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = rect(Color::RED).max_width(40).add(&mut h.rsc);
|
||||||
|
let b = rect(Color::GREEN).max_width(60).add(&mut h.rsc);
|
||||||
|
let inner = (a, b).span(Dir::RIGHT).add(&mut h.rsc);
|
||||||
|
let tail = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((inner, tail).span(Dir::RIGHT));
|
||||||
|
assert_corners!(h, a, (0, 0), (40, 100));
|
||||||
|
assert_corners!(h, b, (40, 0), (100, 100));
|
||||||
|
assert_corners!(h, tail, (100, 0), (300, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn request_edits_in_a_nested_child_reach_the_allocator() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = rect(Color::RED).max_width(80).add(&mut h.rsc);
|
||||||
|
let inner = (a,).span(Dir::RIGHT).add(&mut h.rsc);
|
||||||
|
let tail = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((inner, tail).span(Dir::RIGHT));
|
||||||
|
h.rsc.ui_mut().widgets.get_mut(&a).unwrap().x = Some(Len::px(40.0));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, a, (0, 0), (40, 100));
|
||||||
|
assert_corners!(h, tail, (40, 0), (300, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn adding_a_bound_to_a_previously_unbounded_share_reallocates_the_row() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = rect(Color::RED).add(&mut h.rsc);
|
||||||
|
let b = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((a, b).span(Dir::RIGHT));
|
||||||
|
h.resize((400, 100));
|
||||||
|
h.frame();
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(a, Axis::X, SizeRule::Max(Len::px(80.0)));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, a, (0, 0), (80, 100));
|
||||||
|
assert_corners!(h, b, (80, 0), (400, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_deferred_comparison_can_compare_two_different_weights() {
|
||||||
|
let a = SizeRequest::from(leftover(1.0) + px(30.0)).min(leftover(2.0));
|
||||||
|
let b = SizeRequest::from(leftover(1.0)).clamp(px(20.0), px(100.0));
|
||||||
|
let mut h = Harness::new((60, 100));
|
||||||
|
let a = rect(Color::RED).width(a).add(&mut h.rsc);
|
||||||
|
let b = rect(Color::BLUE).width(b).add(&mut h.rsc);
|
||||||
|
h.set_root((a, b).span(Dir::RIGHT));
|
||||||
|
assert_corners!(h, a, (0, 0), (40, 100));
|
||||||
|
assert_corners!(h, b, (40, 0), (60, 100));
|
||||||
|
h.resize((300, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, a, (0, 0), (200, 100));
|
||||||
|
assert_corners!(h, b, (200, 0), (300, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_length_expression_is_resolved_before_wrapping_text() {
|
||||||
|
let mut h = Harness::new((300, 500));
|
||||||
|
let text = wtext("one two three four five six seven eight nine ten")
|
||||||
|
.size(16)
|
||||||
|
.wrap(true)
|
||||||
|
.width(leftover(1).clamp(40, 80))
|
||||||
|
.add(&mut h.rsc);
|
||||||
|
let other = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((text, other).span(Dir::RIGHT));
|
||||||
|
let box_ = h.region(&text).unwrap();
|
||||||
|
assert_eq!(box_.top_left.x, Px::ZERO);
|
||||||
|
assert_eq!(box_.bot_right.x, Px::from_int(80));
|
||||||
|
assert!(box_.bot_right.y - box_.top_left.y > Px::from_int(30));
|
||||||
|
assert_corners!(h, other, (80, 0), (300, 500));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn relative_bounds_keep_the_allocators_base() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let head = rect(Color::BLUE).width(30).add(&mut h.rsc);
|
||||||
|
let bounded = rect(Color::RED)
|
||||||
|
.width(leftover(1).min(rel(0.25)))
|
||||||
|
.add(&mut h.rsc);
|
||||||
|
let tail = rect(Color::GREEN).add(&mut h.rsc);
|
||||||
|
h.set_root((head, bounded, tail).span(Dir::RIGHT));
|
||||||
|
assert_corners!(h, bounded, (30, 0), (105, 100));
|
||||||
|
assert_corners!(h, tail, (105, 0), (300, 100));
|
||||||
|
h.resize((400, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, bounded, (30, 0), (130, 100));
|
||||||
|
assert_corners!(h, tail, (130, 0), (400, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_root_resolves_a_deferred_request_again_after_resize() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let bounded = rect(Color::RED)
|
||||||
|
.width(leftover(1).min(rel(0.25)))
|
||||||
|
.add(&mut h.rsc);
|
||||||
|
h.set_root(bounded);
|
||||||
|
assert_corners!(h, bounded, (112.5, 0), (187.5, 100));
|
||||||
|
h.resize((400, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, bounded, (150, 0), (250, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn filling_a_stack_does_not_mean_its_sizing_child_was_already_allocated() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let child = rect(Color::RED).width(leftover(1).min(80)).add(&mut h.rsc);
|
||||||
|
let overlay = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
let children: Vec<StrongWidget> =
|
||||||
|
vec![child.add_strong(&mut h.rsc), overlay.add_strong(&mut h.rsc)];
|
||||||
|
h.set_root(Stack {
|
||||||
|
children,
|
||||||
|
size: StackSize::Child(0),
|
||||||
|
});
|
||||||
|
assert_corners!(h, child, (110, 0), (190, 100));
|
||||||
|
assert_corners!(h, overlay, (110, 0), (190, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Unhinted;
|
||||||
|
impl Widget for Unhinted {
|
||||||
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
|
painter.px_size();
|
||||||
|
painter.primitive(RectPrimitive::color(Color::RED));
|
||||||
|
Size::LEFTOVER
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bounds_also_apply_to_shares_discovered_by_drawing() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = h.rsc.widgets_mut().add_strong(Unhinted);
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(a.id(), Axis::X, SizeRule::Max(Len::px(80.0)));
|
||||||
|
let id = a.id();
|
||||||
|
let b = rect(Color::BLUE).add_strong(&mut h.rsc);
|
||||||
|
let b_id = b.id();
|
||||||
|
h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
|
||||||
|
children: vec![a, b],
|
||||||
|
dir: Dir::RIGHT,
|
||||||
|
gap: Px::ZERO,
|
||||||
|
}));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, id, (0, 0), (80, 100));
|
||||||
|
assert_corners!(h, b_id, (80, 0), (300, 100));
|
||||||
|
h.resize((100, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, id, (0, 0), (50, 100));
|
||||||
|
assert_corners!(h, b_id, (50, 0), (100, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn comparisons_with_a_known_order_remain_plain_lengths() {
|
||||||
|
assert_eq!(leftover(2).max(leftover(5)), SizeRequest::from(leftover(5)));
|
||||||
|
assert_eq!(leftover(2).min(leftover(5)), SizeRequest::from(leftover(2)));
|
||||||
|
assert_eq!(
|
||||||
|
(px(10) + rel(0.5)).max(px(30) + rel(0.5)),
|
||||||
|
SizeRequest::from(px(30) + rel(0.5))
|
||||||
|
);
|
||||||
|
assert_eq!(LayoutLen::px(10).clamp(20, 80), SizeRequest::from(20));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_measured_nested_share_keeps_its_comparison_for_the_outer_span() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = h.rsc.widgets_mut().add_strong(Unhinted);
|
||||||
|
let a_id = a.id();
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(a_id, Axis::X, SizeRule::Max(Len::px(80.0)));
|
||||||
|
let b = rect(Color::BLUE).add_strong(&mut h.rsc);
|
||||||
|
let b_id = b.id();
|
||||||
|
let inner = h.rsc.widgets_mut().add_strong(Span {
|
||||||
|
children: vec![a, b],
|
||||||
|
dir: Dir::RIGHT,
|
||||||
|
gap: Px::ZERO,
|
||||||
|
});
|
||||||
|
let c = rect(Color::GREEN).add_strong(&mut h.rsc);
|
||||||
|
let c_id = c.id();
|
||||||
|
h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
|
||||||
|
children: vec![inner, c],
|
||||||
|
dir: Dir::RIGHT,
|
||||||
|
gap: Px::ZERO,
|
||||||
|
}));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, a_id, (0, 0), (80, 100));
|
||||||
|
assert_corners!(h, b_id, (80, 0), (190, 100));
|
||||||
|
assert_corners!(h, c_id, (190, 0), (300, 100));
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.mark_for_redraw(h.state.root.as_ref().unwrap().id());
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, c_id, (190, 0), (300, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Natural;
|
||||||
|
impl Widget for Natural {
|
||||||
|
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||||
|
painter.primitive(RectPrimitive::color(Color::RED));
|
||||||
|
Size::from_axis(Axis::X, LayoutLen::px(64), LayoutLen::px(64))
|
||||||
|
}
|
||||||
|
fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
|
||||||
|
Some(LayoutLen::px(64))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn relative_bounds_on_a_hinted_child_track_the_offer_before_its_declared_size() {
|
||||||
|
fn tree(h: &mut Harness) -> WidgetId {
|
||||||
|
let natural = h.rsc.widgets_mut().add_strong(Natural);
|
||||||
|
let id = natural.id();
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(id, Axis::X, SizeRule::Max(Len::rel(0.75)));
|
||||||
|
h.rsc.widgets_mut().set_size_rule(
|
||||||
|
id,
|
||||||
|
Axis::Y,
|
||||||
|
SizeRule::Clamp {
|
||||||
|
min: Len::rel(0.25),
|
||||||
|
max: Len::rel(0.75),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let inner = h.rsc.widgets_mut().add_strong(Stack {
|
||||||
|
children: vec![natural],
|
||||||
|
size: StackSize::Child(0),
|
||||||
|
});
|
||||||
|
let inner_id = inner.id();
|
||||||
|
let fill = rect(Color::BLUE).add_strong(&mut h.rsc);
|
||||||
|
let overlay = h.rsc.widgets_mut().add_strong(Stack {
|
||||||
|
children: vec![fill, inner],
|
||||||
|
size: StackSize::Child(0),
|
||||||
|
});
|
||||||
|
let share = rect(Color::GREEN).add_strong(&mut h.rsc);
|
||||||
|
let bounded = rect(Color::GREEN).add_strong(&mut h.rsc);
|
||||||
|
h.rsc.widgets_mut().set_size_rule(
|
||||||
|
bounded.id(),
|
||||||
|
Axis::X,
|
||||||
|
SizeRule::Clamp {
|
||||||
|
min: Len::rel(0.25),
|
||||||
|
max: Len::rel(0.75),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let fixed = wtext("one line, overflowing whatever it is given")
|
||||||
|
.size(16)
|
||||||
|
.wrap(false)
|
||||||
|
.add_strong(&mut h.rsc);
|
||||||
|
h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
|
||||||
|
children: vec![share, bounded, fixed, overlay],
|
||||||
|
dir: Dir::LEFT,
|
||||||
|
gap: Px::from_int(8),
|
||||||
|
}));
|
||||||
|
h.rsc.widgets_mut().set_size_rule(
|
||||||
|
h.state.root.as_ref().unwrap().id(),
|
||||||
|
Axis::Y,
|
||||||
|
LayoutLen::rel(1).into(),
|
||||||
|
);
|
||||||
|
h.frame();
|
||||||
|
inner_id
|
||||||
|
}
|
||||||
|
let mut warm = Harness::new((1920, 1200));
|
||||||
|
let a = tree(&mut warm);
|
||||||
|
warm.resize((640, 900));
|
||||||
|
warm.frame();
|
||||||
|
let mut cold = Harness::new((640, 900));
|
||||||
|
let b = tree(&mut cold);
|
||||||
|
assert_eq!(warm.region(&a), cold.region(&b));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_bound_can_extend_an_explicit_share_request() {
|
||||||
|
let mut h = Harness::new((300, 100));
|
||||||
|
let a = rect(Color::RED)
|
||||||
|
.width(leftover(1))
|
||||||
|
.min_width(100)
|
||||||
|
.add(&mut h.rsc);
|
||||||
|
let b = rect(Color::BLUE).add(&mut h.rsc);
|
||||||
|
h.set_root((a, b).span(Dir::RIGHT));
|
||||||
|
assert_corners!(h, a, (0, 0), (150, 100));
|
||||||
|
h.resize((120, 100));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, a, (0, 0), (100, 100));
|
||||||
|
assert_corners!(h, b, (100, 0), (120, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn moving_scroll_content_preserves_its_resolved_expression_size() {
|
||||||
|
let mut h = Harness::new((300, 300));
|
||||||
|
let leaf = rect(Color::BLUE).add_strong(&mut h.rsc);
|
||||||
|
let leaf_id = leaf.id();
|
||||||
|
let content = h.rsc.widgets_mut().add_strong(Stack {
|
||||||
|
children: vec![leaf],
|
||||||
|
size: StackSize::Child(0),
|
||||||
|
});
|
||||||
|
let content_id = content.id();
|
||||||
|
h.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.set_size_rule(content_id, Axis::Y, leftover(1).min(120).into());
|
||||||
|
let scroll = h
|
||||||
|
.rsc
|
||||||
|
.widgets_mut()
|
||||||
|
.add_strong(Scroll::new(content, Axis::Y));
|
||||||
|
let scroll_id = scroll.id();
|
||||||
|
h.state.root = Some(scroll);
|
||||||
|
for _ in 0..3 {
|
||||||
|
h.rsc.widgets_mut().mark_for_redraw(scroll_id);
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, content_id, (0, 90), (300, 210));
|
||||||
|
assert_corners!(h, leaf_id, (0, 90), (300, 210));
|
||||||
|
}
|
||||||
|
h.resize((300, 600));
|
||||||
|
h.frame();
|
||||||
|
assert_corners!(h, leaf_id, (0, 240), (300, 360));
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
#[path = "scenario/mod.rs"]
|
||||||
|
mod scenario;
|
||||||
|
|
||||||
|
use iris::prelude::*;
|
||||||
|
use iris::random::{Edits, Plan, plan};
|
||||||
|
|
||||||
|
fn check_requests(edit: impl Fn(&mut Plan) + Sync) {
|
||||||
|
let count = scenario::env("IRIS_DEFERRED_SEEDS", 20_u64);
|
||||||
|
let depth = scenario::env("IRIS_DEFERRED_DEPTH", 4_usize);
|
||||||
|
let seeds = std::env::var("IRIS_DEFERRED_SEED")
|
||||||
|
.ok()
|
||||||
|
.and_then(|seed| seed.parse().ok())
|
||||||
|
.map_or_else(|| (1..=count).collect(), |seed| vec![seed]);
|
||||||
|
scenario::over_seeds(seeds, |seed| {
|
||||||
|
let mut grown = plan(seed, depth, &Edits::default());
|
||||||
|
edit(&mut grown);
|
||||||
|
for case in scenario::ALL {
|
||||||
|
if let Some(how) = scenario::diverges(&grown, case, seed) {
|
||||||
|
panic!(
|
||||||
|
"request seed {seed} depth {depth} after {}: {how}",
|
||||||
|
case.name()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn deferred_requests_agree_warm_and_cold() {
|
||||||
|
check_requests(|grown| {
|
||||||
|
let mut index = 0;
|
||||||
|
grown.walk_mut(&mut |node| {
|
||||||
|
if let Some(rules) = &mut node.size {
|
||||||
|
for axis in Axis::BOTH {
|
||||||
|
index += 1;
|
||||||
|
rules[axis] = match index % 7 {
|
||||||
|
0 => leftover(1).clamp(20, 120).into(),
|
||||||
|
1 => leftover(1).min(rel(0.5)).into(),
|
||||||
|
2 => (leftover(1) + px(30)).min(leftover(2)).into(),
|
||||||
|
_ => rules[axis].clone(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn relative_intrinsic_bounds_agree_warm_and_cold() {
|
||||||
|
check_requests(|grown| {
|
||||||
|
grown.walk_mut(&mut |node| {
|
||||||
|
if let Some(rules) = &mut node.size {
|
||||||
|
for axis in Axis::BOTH {
|
||||||
|
rules[axis] = match rules[axis] {
|
||||||
|
SizeRule::Min(_) => SizeRule::Min(Len::rel(0.25)),
|
||||||
|
SizeRule::Max(_) => SizeRule::Max(Len::rel(0.75)),
|
||||||
|
SizeRule::Clamp { .. } => SizeRule::Clamp {
|
||||||
|
min: Len::rel(0.25),
|
||||||
|
max: Len::rel(0.75),
|
||||||
|
},
|
||||||
|
ref rule => rule.clone(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
+15
-2
@@ -11,7 +11,8 @@
|
|||||||
//! it is not drawn.
|
//! it is not drawn.
|
||||||
|
|
||||||
use iris::harness::Harness;
|
use iris::harness::Harness;
|
||||||
use iris::random::{Edits, grow};
|
use iris::prelude::{Axis, Bound, SizeRule};
|
||||||
|
use iris::random::{Edits, build, plan};
|
||||||
|
|
||||||
fn env<T: std::str::FromStr>(name: &str, fallback: T) -> T {
|
fn env<T: std::str::FromStr>(name: &str, fallback: T) -> T {
|
||||||
std::env::var(name)
|
std::env::var(name)
|
||||||
@@ -28,7 +29,19 @@ fn every_cold_layout_is_printed() {
|
|||||||
let mut out = String::new();
|
let mut out = String::new();
|
||||||
for seed in 1..=seeds {
|
for seed in 1..=seeds {
|
||||||
let mut harness = Harness::new((1920.0, 1200.0));
|
let mut harness = Harness::new((1920.0, 1200.0));
|
||||||
let (root, tree) = grow(&mut harness.rsc, seed, depth, &Edits::default());
|
let mut plan = plan(seed, depth, &Edits::default());
|
||||||
|
if std::env::var_os("IRIS_DUMP_UNBOUNDED").is_some() {
|
||||||
|
plan.walk_mut(&mut |node| {
|
||||||
|
if let Some(rules) = &mut node.size {
|
||||||
|
for axis in Axis::BOTH {
|
||||||
|
if rules[axis].bound() != Bound::ANY {
|
||||||
|
rules[axis] = SizeRule::Free;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let (root, tree) = build(&mut harness.rsc, &plan);
|
||||||
harness.state.root = Some(root);
|
harness.state.root = Some(root);
|
||||||
harness.frame();
|
harness.frame();
|
||||||
for (index, id) in tree.ids.iter().enumerate() {
|
for (index, id) in tree.ids.iter().enumerate() {
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ fn resize_one(warm: &mut Harness, tree: &Tree, idx: usize, rng: &mut Rng) -> Siz
|
|||||||
};
|
};
|
||||||
warm.rsc
|
warm.rsc
|
||||||
.widgets_mut()
|
.widgets_mut()
|
||||||
.set_size_rules(tree.sized[idx], lens.x, lens.y);
|
.set_size_rules(tree.sized[idx], lens.x.clone(), lens.y.clone());
|
||||||
lens
|
lens
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -362,6 +362,7 @@ fn describe(id: WidgetId, h: &Harness) -> String {
|
|||||||
let rule = |r: SizeRule| match r {
|
let rule = |r: SizeRule| match r {
|
||||||
SizeRule::Free => "-".into(),
|
SizeRule::Free => "-".into(),
|
||||||
SizeRule::Exact(len) => format!("{len}"),
|
SizeRule::Exact(len) => format!("{len}"),
|
||||||
|
SizeRule::Request(request) => format!("{request:?}"),
|
||||||
SizeRule::Min(min) => format!(">{}", LayoutLen::from(min)),
|
SizeRule::Min(min) => format!(">{}", LayoutLen::from(min)),
|
||||||
SizeRule::Max(max) => format!("<{}", LayoutLen::from(max)),
|
SizeRule::Max(max) => format!("<{}", LayoutLen::from(max)),
|
||||||
SizeRule::Clamp { min, max } => {
|
SizeRule::Clamp { min, max } => {
|
||||||
@@ -383,7 +384,7 @@ fn describe(id: WidgetId, h: &Harness) -> String {
|
|||||||
// A rule and an alignment are properties of whatever carries them, so
|
// A rule and an alignment are properties of whatever carries them, so
|
||||||
// they print with that widget rather than as widgets of their own.
|
// they print with that widget rather than as widgets of their own.
|
||||||
let mut out = describe_widget(id, h);
|
let mut out = describe_widget(id, h);
|
||||||
if (rules.x, rules.y) != (SizeRule::Free, SizeRule::Free) {
|
if rules != SizeRules::default() {
|
||||||
out += &format!("[x:{},y:{}]", rule(rules.x), rule(rules.y));
|
out += &format!("[x:{},y:{}]", rule(rules.x), rule(rules.y));
|
||||||
}
|
}
|
||||||
if align != RegionAlign::default() {
|
if align != RegionAlign::default() {
|
||||||
|
|||||||
@@ -32,3 +32,6 @@ mod tasks;
|
|||||||
mod text_edit;
|
mod text_edit;
|
||||||
#[path = "cases/unsettled.rs"]
|
#[path = "cases/unsettled.rs"]
|
||||||
mod unsettled;
|
mod unsettled;
|
||||||
|
|
||||||
|
#[path = "cases/deferred.rs"]
|
||||||
|
mod deferred;
|
||||||
Reference in new issue
Block a user