diff --git a/core/src/ui/place.rs b/core/src/ui/place.rs index 19ffae6..c821d91 100644 --- a/core/src/ui/place.rs +++ b/core/src/ui/place.rs @@ -50,7 +50,7 @@ impl PlaceDescAxis { /// a container dividing one axis says, since nothing divides the other. /// [`PlaceDesc::from_axis`] says the across one where it is not the /// whole. - pub const fn axis(self, axis: Axis) -> PlaceDesc { + pub const fn on_axis(self, axis: Axis) -> PlaceDesc { PlaceDesc::from_axis(axis, self, Self::WHOLE) } diff --git a/src/random.rs b/src/random.rs index 6bf939c..2f37937 100644 --- a/src/random.rs +++ b/src/random.rs @@ -120,7 +120,7 @@ impl Widget for Branch { let cut = Len::from_parts(Rel::ZERO, Px::from_int(40)); let top = UiSpan::new(Len::ZERO, cut).shifted_desc(); let measured = painter - .widget_at(&self.probe, top.axis(Axis::Y)) + .widget_at(&self.probe, top.on_axis(Axis::Y)) .len(Axis::X); let len = measured.apply_leftover(); let px = painter.to_px(len, Axis::X); @@ -135,7 +135,7 @@ impl Widget for Branch { painter.window_holds(Axis::X, holds.through(len)); let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc(); - let place = below.axis(Axis::Y); + let place = below.on_axis(Axis::Y); match px > threshold { true => painter.widget_at(&self.wide, place), false => painter.widget_at(&self.narrow, place), diff --git a/src/widget/position/scroll.rs b/src/widget/position/scroll.rs index 7e66cc8..f8973ef 100644 --- a/src/widget/position/scroll.rs +++ b/src/widget/position/scroll.rs @@ -62,7 +62,7 @@ impl Widget for Scroll { // reports is a fraction of what is on screen rather than of the // content box its own answer decided. Where it goes is the content // box, scrolled: its drawing moved there, not made again there. - painter.place_at(&self.inner, content.axis(self.axis).fills()); + painter.place_at(&self.inner, content.on_axis(self.axis).fills()); // What it occupies is its box, on both axes: it clips its content to // that box, so it can neither take less of one nor honestly ask for // more. The content's length is what it scrolls through, not what it diff --git a/src/widget/position/span.rs b/src/widget/position/span.rs index b99ef0b..0a3b822 100644 --- a/src/widget/position/span.rs +++ b/src/widget/position/span.rs @@ -33,7 +33,7 @@ impl Widget for Span { // 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 = along(cursor, far).shifted_desc().axis(axis); + let room = along(cursor, far).shifted_desc().on_axis(axis); painter.widget_at(child, room).len(axis) } }; @@ -119,7 +119,7 @@ impl Widget for Span { // 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. let slot = along(from, start); - let mut place = slot.shifted_desc().fills().axis(axis); + let mut place = slot.shifted_desc().fills().on_axis(axis); if len.leftover > Weight::ZERO && shares { place = place.rel_base(axis, slot.len()); } diff --git a/tests/cases/determinism.rs b/tests/cases/determinism.rs index fd98eb3..8a5bfe1 100644 --- a/tests/cases/determinism.rs +++ b/tests/cases/determinism.rs @@ -24,12 +24,12 @@ impl Widget for BranchesOnMeasurement { let cut = Len::from_parts(Rel::ZERO, Px::from_int(40)); let top = UiSpan::new(Len::ZERO, cut).shifted_desc(); let measured = painter - .widget_at(&self.probe, top.axis(Axis::Y)) + .widget_at(&self.probe, top.on_axis(Axis::Y)) .len(Axis::X); let px = painter.to_px(measured.apply_leftover(), Axis::X); let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc(); - let place = below.axis(Axis::Y); + let place = below.on_axis(Axis::Y); match px > Px::from_f32(self.threshold) { true => painter.widget_at(&self.wide, place), false => painter.widget_at(&self.narrow, place), diff --git a/tests/cases/retained.rs b/tests/cases/retained.rs index c95f213..019a0fb 100644 --- a/tests/cases/retained.rs +++ b/tests/cases/retained.rs @@ -214,7 +214,7 @@ impl Widget for FromHint { fn draw(&mut self, painter: &mut Painter) -> Size { let len = painter.size_hint(&self.inner, Axis::Y).unwrap(); let top = UiSpan::new(Len::ZERO, Len::from_parts(Rel::ZERO, len.px)); - painter.widget_at(&self.inner, top.shifted_desc().axis(Axis::Y)); + painter.widget_at(&self.inner, top.shifted_desc().on_axis(Axis::Y)); Size::LEFTOVER } }