Update Calculator

Author: dhardy

src/calculator.md

@@ -6,12 +6,13 @@
 
 ```rust
 # extern crate kas;
-use kas::event::NamedKey;
-use kas::prelude::*;
-use kas::widgets::{AccessLabel, Adapt, Button, EditBox};
 use std::num::ParseFloatError;
 use std::str::FromStr;
 
+use kas::event::NamedKey;
+use kas::prelude::*;
+use kas::widgets::{AccessLabel, Adapt, Button, EditBox, column, grid};
+
 type Key = kas::event::Key<kas::event::SmolStr>;
 
 fn key_button(label: &str) -> Button<AccessLabel> {
@@ -23,15 +24,14 @@ fn key_button_with(label: &str, key: Key) -> Button<AccessLabel> {
     Button::label_msg(label, key.clone()).with_access_key(key)
 }
 
-fn calc_ui() -> impl Widget<Data = ()> {
+fn calc_ui() -> Window<()> {
     // We could use kas::widget::Text, but EditBox looks better.
     let display = EditBox::string(|calc: &Calculator| calc.display())
         .with_multi_line(true)
-        .with_lines(3, 3)
+        .with_lines(3.0, 3.0)
         .with_width_em(5.0, 10.0);
 
-    // We use map_any to avoid passing input data (not wanted by buttons):
-    let buttons = kas::grid! {
+    let buttons = grid! {
         // Key bindings: C, Del
         (0, 0) => Button::label_msg("&clear", Key::Named(NamedKey::Clear))
             .with_access_key(NamedKey::Delete.into()),
@@ -57,22 +57,22 @@ fn calc_ui() -> impl Widget<Data = ()> {
     }
     .map_any();
 
-    Adapt::new(kas::column![display, buttons], Calculator::new())
-        .on_message(|_, calc, key| calc.handle(key))
-        .on_configure(|cx, _| {
-            cx.disable_nav_focus(true);
-            cx.enable_alt_bypass(true);
-        })
+    let ui = Adapt::new(column![display, buttons], Calculator::new())
+        .on_message(|_, calc, key| calc.handle(key));
+
+    Window::new(ui, "Calculator")
+        .escapable()
+        .with_alt_bypass()
+        .without_nav_focus()
 }
 
-fn main() -> kas::app::Result<()> {
+fn main() -> kas::runner::Result<()> {
     env_logger::init();
 
-    let theme = kas_wgpu::ShadedTheme::new().with_font_size(16.0);
-    kas::app::Default::with_theme(theme)
-        .build(())?
-        .with(Window::new(calc_ui(), "Calculator"))
-        .run()
+    let theme = kas_wgpu::ShadedTheme::new();
+    let mut app = kas::runner::Runner::with_theme(theme).build(())?;
+    let _ = app.config_mut().font.set_size(24.0);
+    app.with(calc_ui()).run()
 }
 
 #[derive(Clone, Debug)]
@@ -139,7 +139,7 @@ fn key_button_with(label: &str, key: Key) -> Button<AccessLabel> {
 
 ### Navigation focus and <kbd>Alt</kbd>-bypass
 
-Normally, access keys are only active while holding <kbd>Alt</kbd>. To avoid this requirement we call [`enable_alt_bypass`]. Further, we disable <kbd>Tab</kbd> key navigation with [`disable_nav_focus`].
+Normally, access keys are only active while holding <kbd>Alt</kbd>. To avoid this requirement we call [`with_alt_bypass`]. Further, we disable <kbd>Tab</kbd> key navigation with [`without_nav_focus`] and ensure that the window can be closed with the <kbd>Esc</kbd> key.
 ```rust
 # extern crate kas;
 # use kas::{Widget, widgets::{label_any, Adapt}};
@@ -150,21 +150,18 @@ Normally, access keys are only active while holding <kbd>Alt</kbd>. To avoid thi
 #   fn handle(&mut self, _key: ()) {}
 # }
 # fn ui() -> impl Widget<Data = ()> {
-# let display = label_any("");
-# let buttons = label_any("");
-Adapt::new(kas::column![display, buttons], Calculator::new())
-    .on_message(|_, calc, key| calc.handle(key))
-    .on_configure(|cx, _| {
-        cx.disable_nav_focus(true);
-        cx.enable_alt_bypass(true);
-    })
+# let ui = label_any("");
+    Window::new(ui, "Calculator")
+        .escapable()
+        .with_alt_bypass()
+        .without_nav_focus()
 # }
 ```
 
 
 ## Grid layout
 
-We already saw column and row layouts. This time, we'll use [`kas::grid!`] for layout.
+We already saw column and row layouts. This time, we'll use [`grid!`] for layout.
 ```rust
 # extern crate kas;
 # use kas::event::NamedKey;
@@ -180,36 +177,36 @@ We already saw column and row layouts. This time, we'll use [`kas::grid!`] for l
 #     Button::label_msg(label, key.clone()).with_access_key(key)
 # }
 # fn ui() -> impl Widget<Data = i32> {
-let buttons = kas::grid! {
-    // Key bindings: C, Del
-    (0, 0) => Button::label_msg("&clear", Key::Named(NamedKey::Clear))
-        .with_access_key(NamedKey::Delete.into()),
-    // Widget is hidden but has key binding.
-    // TODO(opt): exclude from layout & drawing.
-    (0, 0) => key_button_with("", NamedKey::Backspace.into()),
-    (1, 0) => key_button_with("&÷", Key::Character("/".into())),
-    (2, 0) => key_button_with("&×", Key::Character("*".into())),
-    (3, 0) => key_button_with("&−", Key::Character("-".into())),
-    (0, 1) => key_button("&7"),
-    (1, 1) => key_button("&8"),
-    (2, 1) => key_button("&9"),
-    (3, 1..3) => key_button("&+"),
-    (0, 2) => key_button("&4"),
-    (1, 2) => key_button("&5"),
-    (2, 2) => key_button("&6"),
-    (0, 3) => key_button("&1"),
-    (1, 3) => key_button("&2"),
-    (2, 3) => key_button("&3"),
-    (3, 3..5) => key_button_with("&=", NamedKey::Enter.into()),
-    (0..2, 4) => key_button("&0"),
-    (2, 4) => key_button("&."),
-}
-.map_any();
+    let buttons = grid! {
+        // Key bindings: C, Del
+        (0, 0) => Button::label_msg("&clear", Key::Named(NamedKey::Clear))
+            .with_access_key(NamedKey::Delete.into()),
+        // Widget is hidden but has key binding.
+        // TODO(opt): exclude from layout & drawing.
+        (0, 0) => key_button_with("", NamedKey::Backspace.into()),
+        (1, 0) => key_button_with("&÷", Key::Character("/".into())),
+        (2, 0) => key_button_with("&×", Key::Character("*".into())),
+        (3, 0) => key_button_with("&−", Key::Character("-".into())),
+        (0, 1) => key_button("&7"),
+        (1, 1) => key_button("&8"),
+        (2, 1) => key_button("&9"),
+        (3, 1..3) => key_button("&+"),
+        (0, 2) => key_button("&4"),
+        (1, 2) => key_button("&5"),
+        (2, 2) => key_button("&6"),
+        (0, 3) => key_button("&1"),
+        (1, 3) => key_button("&2"),
+        (2, 3) => key_button("&3"),
+        (3, 3..5) => key_button_with("&=", NamedKey::Enter.into()),
+        (0..2, 4) => key_button("&0"),
+        (2, 4) => key_button("&."),
+    }
+    .map_any();
 # buttons
 # }
 ```
 
-Worth noting is our hidden `Backspace` button. This is just another cell, but hidden under the `clear` button. Yes, this is a sub-optimal hack (the widget is still sized and drawn); it works but might see a less hacky solution in the future.
+Worth noting is our hidden `Backspace` button. This is just another cell, but hidden under the `clear` button. Yes, this is a sub-optimal hack.
 
 Again, we use <code>.[map_any][]()</code> to make our buttons (input `Data = ()`) compatible with the parent UI element (input `Data = Calculator`).
 
@@ -220,7 +217,7 @@ Again, we use <code>.[map_any][]()</code> to make our buttons (input `Data = ()`
 [`Button`]: https://docs.rs/kas/latest/kas/widgets/struct.Button.html
 [`Button::with_access_key`]: https://docs.rs/kas/latest/kas/widgets/struct.Button.html#method.with_access_key
 [`Activate`]: https://docs.rs/kas/latest/kas/messages/struct.Activate.html
-[`disable_nav_focus`]: https://docs.rs/kas/latest/kas/event/struct.ConfigCx.html#method.disable_nav_focus
-[`enable_alt_bypass`]: https://docs.rs/kas/latest/kas/event/struct.EventState.html#method.enable_alt_bypass
-[`kas::grid!`]: https://docs.rs/kas/latest/kas/macro.grid.html
+[`without_nav_focus`]: https://docs.rs/kas/latest/kas/window/struct.Window.html#method.without_nav_focus
+[`with_alt_bypass`]: https://docs.rs/kas/latest/kas/window/struct.Window.html#method.with_alt_bypass
+[`grid!`]: https://docs.rs/kas/latest/kas/widgets/macro.grid.html
 [map_any]: https://docs.rs/kas/latest/kas/widgets/trait.AdaptWidgetAny.html#method.map_any