Merge branch 'main' into feature/world-coords

.crate-docs.md

@@ -16,24 +16,28 @@ reactive data models work, consider this example that displays a button that
 increments its own label:
 
 ```rust,ignore
-// Create a dynamic usize.
-let count = Dynamic::new(0_usize);
-
-// Create a new button with a label that is produced by mapping the contents
-// of `count`.
-Button::new(count.map_each(ToString::to_string))
-    // Set the `on_click` callback to a closure that increments the counter.
-    .on_click(count.with_clone(|count| move |_| count.set(count.get() + 1)))
-    // Run the button as an an application.
-    .run()
+fn main() -> gooey::Result {
+    // Create a dynamic usize.
+    let count = Dynamic::new(0_isize);
+    // Create a dynamic that contains `count.to_string()`
+    let count_label = count.map_each(ToString::to_string);
+
+    // Create a new button whose text is our dynamic string.
+    count_label
+        .into_button()
+        // Set the `on_click` callback to a closure that increments the counter.
+        .on_click(count.with_clone(|count| move |_| count.set(count.get() + 1)))
+        // Run the application
+        .run()
+}
 ```
 
 [widget]: crate::widget::Widget
 [kludgine]: https://github.com/khonsulabs/kludgine
 [wgpu]: https://github.com/gfx-rs/wgpu
 [winit]: https://github.com/rust-windowing/winit
 [widgets]: mod@crate::widgets
-[button-example]: https://github.com/khonsulabs/gooey/tree/main/examples/button.rs
+[button-example]: https://github.com/khonsulabs/gooey/tree/main/examples/basic-button.rs
 
 ## Open-source Licenses
 

.rustme/docs.md

@@ -16,12 +16,12 @@ reactive data models work, consider this example that displays a button that
 increments its own label:
 
 ```rust,ignore
-$../examples/button.rs:readme$
+$../examples/basic-button.rs:readme$
 ```
 
 [widget]: $widget$
 [kludgine]: https://github.com/khonsulabs/kludgine
 [wgpu]: https://github.com/gfx-rs/wgpu
 [winit]: https://github.com/rust-windowing/winit
 [widgets]: $widgets$
-[button-example]: https://github.com/khonsulabs/gooey/tree/$ref-name$/examples/button.rs
+[button-example]: https://github.com/khonsulabs/gooey/tree/$ref-name$/examples/basic-button.rs