switch away from handles to refs that must be upgraded once

src/bin/test/main.rs

@@ -21,7 +21,6 @@ impl DefaultAppState for Client {
             events: EventManager::default(),
         };
 
-        let info;
         let rrect = rect(Color::WHITE).radius(20);
         let pad_test = (
             rrect.color(Color::BLUE),
@@ -44,7 +43,7 @@ impl DefaultAppState for Client {
                 .width(rest(3)),
         )
             .span(Dir::RIGHT)
-            .handles(&mut rsc);
+            .add(&mut rsc);
 
         let span_test = (
             rrect.color(Color::GREEN).width(100),
@@ -57,15 +56,15 @@ impl DefaultAppState for Client {
             .span(Dir::LEFT)
             .add(&mut rsc);
 
-        let span_add = Span::empty(Dir::RIGHT).handles(&mut rsc);
+        let span_add = Span::empty(Dir::RIGHT).add(&mut rsc);
 
         let add_button = rect(Color::LIME)
             .radius(30)
             .on(CursorSense::click(), move |ctx| {
                 let child = image(include_bytes!("assets/sungals.png"))
                     .center()
-                    .add(ctx);
-                (span_add.r)(ctx).children.push(child);
+                    .add_strong(ctx);
+                span_add(ctx).children.push(child);
             })
             .sized((150, 150))
             .align(Align::BOT_RIGHT);
@@ -73,12 +72,12 @@ impl DefaultAppState for Client {
         let del_button = rect(Color::RED)
             .radius(30)
             .on(CursorSense::click(), move |ctx| {
-                (span_add.r)(ctx).children.pop();
+                span_add(ctx).children.pop();
             })
             .sized((150, 150))
             .align(Align::BOT_LEFT);
 
-        let span_add_test = (span_add.h, add_button, del_button).stack().add(&mut rsc);
+        let span_add_test = (span_add, add_button, del_button).stack().add(&mut rsc);
 
         let btext = |content| wtext(content).size(30);
 
@@ -103,8 +102,8 @@ impl DefaultAppState for Client {
             .span(Dir::DOWN)
             .add(&mut rsc);
 
-        let texts = Span::empty(Dir::DOWN).gap(10).handles(&mut rsc);
-        let msg_area = texts.h.scrollable().masked().background(rect(Color::SKY));
+        let texts = Span::empty(Dir::DOWN).gap(10).add(&mut rsc);
+        let msg_area = texts.scrollable().masked().background(rect(Color::SKY));
         let add_text = wtext("add")
             .editable(EditMode::MultiLine)
             .text_align(Align::LEFT)
@@ -119,19 +118,21 @@ impl DefaultAppState for Client {
                     .text_align(Align::LEFT)
                     .wrap(true)
                     .attr::<Selectable>(());
-                let msg_box = text.background(rect(Color::WHITE.darker(0.5))).add(ctx);
-                (texts.r)(ctx).children.push(msg_box);
+                let msg_box = text
+                    .background(rect(Color::WHITE.darker(0.5)))
+                    .add_strong(ctx);
+                texts(ctx).children.push(msg_box);
             })
-            .handles(&mut rsc);
+            .add(&mut rsc);
         let text_edit_scroll = (
             msg_area.height(rest(1)),
             (
                 Rect::new(Color::WHITE.darker(0.9)),
                 (
-                    add_text.h.width(rest(1)),
+                    add_text.width(rest(1)),
                     Rect::new(Color::GREEN)
                         .on(CursorSense::click(), move |ctx| {
-                            ctx.state.run_event::<Submit>(add_text.r, &mut ());
+                            ctx.state.run_event::<Submit>(add_text, &mut ());
                         })
                         .sized((40, 40)),
                 )
@@ -146,15 +147,16 @@ impl DefaultAppState for Client {
             .span(Dir::DOWN)
             .add(&mut rsc);
 
-        let main = WidgetPtr::new().handles(&mut rsc);
+        let main = WidgetPtr::new().add(&mut rsc);
 
         let vals = Rc::new(RefCell::new((0, Vec::new())));
-        let mut switch_button = |color, to: WidgetHandle, label| {
+        let mut switch_button = |color, to: WidgetRef, label| {
+            let to = to.upgrade(&mut rsc);
             let vec = &mut vals.borrow_mut().1;
             let i = vec.len();
             if vec.is_empty() {
                 vec.push(None);
-                rsc.ui[main.r].set(to);
+                rsc.ui[main].set(to);
             } else {
                 vec.push(Some(to));
             }
@@ -163,7 +165,7 @@ impl DefaultAppState for Client {
                 .on(CursorSense::click(), move |ctx| {
                     let (prev, vec) = &mut *vals.borrow_mut();
                     if let Some(h) = vec[i].take() {
-                        vec[*prev] = (main.r)(ctx).replace(h);
+                        vec[*prev] = main(ctx).replace(h);
                         *prev = i;
                     }
                     ctx.widget().color = color.darker(0.3);
@@ -181,7 +183,7 @@ impl DefaultAppState for Client {
         };
 
         let tabs = (
-            switch_button(Color::RED, pad_test.h, "pad"),
+            switch_button(Color::RED, pad_test, "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"),
@@ -193,10 +195,10 @@ impl DefaultAppState for Client {
         )
             .span(Dir::RIGHT);
 
-        info = wtext("").handles(&mut rsc);
-        let info_sect = info.h.pad(10).align(Align::RIGHT);
+        let info = wtext("").add(&mut rsc);
+        let info_sect = info.pad(10).align(Align::RIGHT);
 
-        ((tabs.height(40), main.h.pad(10)).span(Dir::DOWN), info_sect)
+        ((tabs.height(40), main.pad(10)).span(Dir::DOWN), info_sect)
             .stack()
             .set_root(&mut rsc);
 
@@ -204,7 +206,7 @@ impl DefaultAppState for Client {
             ui: rsc.ui,
             ui_state: rsc.ui_state,
             events: rsc.events,
-            info: info.r,
+            info,
         }
     }