idk work (r + h)

src/bin/test/main.rs

@@ -10,7 +10,7 @@ fn main() {
 }
 
 pub struct Client {
-    info: WidgetView<Text>,
+    info: WidgetRef<Text>,
 }
 
 event_ctx!(Client);
@@ -56,24 +56,24 @@ impl DefaultAppState for Client {
 
         let add_button = rect(Color::LIME)
             .radius(30)
-            .on(CursorSense::click(), move |ctx| {
+            .on(CursorSense::click(), move |mut ctx| {
                 let child = ctx
                     .ui
                     .add(image(include_bytes!("assets/sungals.png")).center());
-                ctx.ui[span_add.1].children.push(child);
+                ctx[span_add.r].children.push(child);
             })
             .sized((150, 150))
             .align(Align::BOT_RIGHT);
 
         let del_button = rect(Color::RED)
             .radius(30)
-            .on(CursorSense::click(), move |ctx| {
-                ctx.ui[span_add.1].children.pop();
+            .on(CursorSense::click(), move |mut ctx| {
+                ctx[span_add.r].children.pop();
             })
             .sized((150, 150))
             .align(Align::BOT_LEFT);
 
-        let span_add_test = (span_add.0, add_button, del_button).stack().add(ui);
+        let span_add_test = (span_add.h, add_button, del_button).stack().add(ui);
 
         let btext = |content| wtext(content).size(30);
 
@@ -99,14 +99,14 @@ impl DefaultAppState for Client {
             .add(ui);
 
         let texts = Span::empty(Dir::DOWN).gap(10).handles(ui);
-        let msg_area = texts.0.scroll().masked().background(rect(Color::SKY));
+        let msg_area = texts.h.scroll().masked().background(rect(Color::SKY));
         let add_text = wtext("add")
             .editable(false)
             .text_align(Align::LEFT)
             .size(30)
             .attr::<Selectable>(())
             .on(Submit, move |ctx| {
-                let content = ctx.id.edit(ctx.ui).take();
+                let content = ctx.widget.edit(ctx.ui).take();
                 let text = wtext(content)
                     .editable(false)
                     .size(30)
@@ -114,7 +114,7 @@ impl DefaultAppState for Client {
                     .wrap(true)
                     .attr::<Selectable>(());
                 let msg_box = text.background(rect(Color::WHITE.darker(0.5))).add(ctx.ui);
-                ctx.ui[texts.1].children.push(msg_box);
+                ctx.ui[texts.r].children.push(msg_box);
             })
             .handles(ui);
         let text_edit_scroll = (
@@ -122,10 +122,10 @@ impl DefaultAppState for Client {
             (
                 Rect::new(Color::WHITE.darker(0.9)),
                 (
-                    add_text.0.width(rest(1)),
+                    add_text.h.width(rest(1)),
                     Rect::new(Color::GREEN)
                         .on(CursorSense::click(), move |ctx| {
-                            ctx.ui.run_event(ctx.state, add_text.1, Submit, ());
+                            ctx.ui.run_event(ctx.state, add_text.r, Submit, ());
                         })
                         .sized((40, 40)),
                 )
@@ -148,34 +148,34 @@ impl DefaultAppState for Client {
             let i = vec.len();
             if vec.is_empty() {
                 vec.push(None);
-                ui[main.1].set(to);
+                ui[main.r].set(to);
             } else {
                 vec.push(Some(to));
             }
             let vals = vals.clone();
             let rect = rect(color)
-                .on(CursorSense::click(), move |ctx| {
+                .on(CursorSense::click(), move |mut ctx| {
                     let (prev, vec) = &mut *vals.borrow_mut();
                     if let Some(h) = vec[i].take() {
-                        vec[*prev] = ctx.ui[main.1].replace(h);
+                        vec[*prev] = ctx[main.r].replace(h);
                         *prev = i;
                     }
-                    ctx.ui[ctx.id].color = color.darker(0.3);
+                    ctx.widget().color = color.darker(0.3);
                 })
                 .on(
                     CursorSense::HoverStart | CursorSense::unclick(),
-                    move |ctx| {
-                        ctx.ui[ctx.id].color = color.brighter(0.2);
+                    move |mut ctx| {
+                        ctx.widget().color = color.brighter(0.2);
                     },
                 )
-                .on(CursorSense::HoverEnd, move |ctx| {
-                    ctx.ui[ctx.id].color = color;
+                .on(CursorSense::HoverEnd, move |mut ctx| {
+                    ctx.widget().color = color;
                 });
             (rect, wtext(label).size(30).text_align(Align::CENTER)).stack()
         };
 
         let tabs = (
-            switch_button(Color::RED, pad_test.0, "pad"),
+            switch_button(Color::RED, pad_test.h, "pad"),
             switch_button(Color::GREEN, span_test, "span"),
             switch_button(Color::BLUE, span_add_test, "image span"),
             switch_button(Color::MAGENTA, text_test, "text layout"),
@@ -188,13 +188,13 @@ impl DefaultAppState for Client {
             .span(Dir::RIGHT);
 
         let info = wtext("").handles(ui);
-        let info_sect = info.0.pad(10).align(Align::RIGHT);
+        let info_sect = info.h.pad(10).align(Align::RIGHT);
 
-        ((tabs.height(40), main.0.pad(10)).span(Dir::DOWN), info_sect)
+        ((tabs.height(40), main.h.pad(10)).span(Dir::DOWN), info_sect)
             .stack()
             .set_root(ui);
 
-        Self { info: info.1 }
+        Self { info: info.r }
     }
 
     fn window_event(&mut self, _: WindowEvent, ui: &mut Ui, state: &UiState) {