Make alignment a widget property

tests/unsettled.rs

@@ -16,14 +16,13 @@ fn plant(h: &mut Harness) -> Vec<WidgetId> {
     let plain = wtext("Wrapping").size(16).wrap(false).add(&mut h.rsc);
     let wrapped = wtext("Wrapping shapes").size(16).wrap(true).add(&mut h.rsc);
     let sized = wrapped.width(76).add(&mut h.rsc);
-    let aligned = Aligned {
-        inner: sized.add_strong(&mut h.rsc),
-        align: Align {
-            x: Some(AxisAlign::Pos),
-            y: Some(AxisAlign::Pos),
-        },
-    }
-    .add(&mut h.rsc);
+    let aligned = sized;
+    h.rsc
+        .widgets_mut()
+        .set_alignment(sized, Axis::X, AxisAlign::POS);
+    h.rsc
+        .widgets_mut()
+        .set_alignment(sized, Axis::Y, AxisAlign::POS);
     let stack = Stack {
         children: vec![plain.add_strong(&mut h.rsc), aligned.add_strong(&mut h.rsc)],
         size: StackSize::Child(0),
@@ -96,14 +95,10 @@ fn repainting_everything_moves_nothing() {
 fn plant_fixed(h: &mut Harness) -> Vec<WidgetId> {
     let words = "Wrapping shapes one source into as many lines as the box leaves";
     let text = wtext(words).size(16).wrap(true).add(&mut h.rsc);
-    let aligned = Aligned {
-        inner: text.add_strong(&mut h.rsc),
-        align: Align {
-            x: Some(AxisAlign::Neg),
-            y: None,
-        },
-    }
-    .add(&mut h.rsc);
+    let aligned = text;
+    h.rsc
+        .widgets_mut()
+        .set_alignment(text, Axis::X, AxisAlign::NEG);
     let inner = (aligned,).span(Dir::RIGHT).add(&mut h.rsc);
     let sized = inner.sized((189, 176)).add(&mut h.rsc);
     let filler = rect(Color::RED).add(&mut h.rsc);
@@ -167,14 +162,10 @@ fn plant_pair(h: &mut Harness, swapped: bool) -> (Vec<WidgetId>, WeakWidget<Span
     }
     .add(&mut h.rsc);
     let span_handle = span;
-    let aligned = Aligned {
-        inner: span.add_strong(&mut h.rsc),
-        align: Align {
-            x: Some(AxisAlign::Center),
-            y: None,
-        },
-    }
-    .add(&mut h.rsc);
+    let aligned = span;
+    h.rsc
+        .widgets_mut()
+        .set_alignment(span, Axis::X, AxisAlign::CENTER);
     h.state.root = Some(aligned.add_strong(&mut h.rsc));
     (
         vec![wrapped.id(), plain.id(), span.id(), aligned.id()],
@@ -300,14 +291,10 @@ impl Widget for Wider {
 fn plant_wider(h: &mut Harness, extra: f32) -> (WeakWidget<Wider>, WidgetId) {
     let content = Wider { extra }.add(&mut h.rsc);
     let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X).add(&mut h.rsc);
-    let root = Aligned {
-        inner: scroll.add_strong(&mut h.rsc),
-        align: Align {
-            x: Some(AxisAlign::Neg),
-            y: None,
-        },
-    }
-    .add(&mut h.rsc);
+    let root = scroll;
+    h.rsc
+        .widgets_mut()
+        .set_alignment(scroll, Axis::X, AxisAlign::NEG);
     h.set_root(root);
     (content, scroll.id())
 }