update

.github/workflows/gh-pages.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup mdBook
       uses: peaceiris/actions-mdbook@v1
       with:
-        mdbook-version: '0.3.5'
+        mdbook-version: '0.4.5'
 
     - run: mdbook build docs
 

AUTHORS

@@ -14,3 +14,4 @@ Andrey Kabylin
 Garrett Risley
 Robert Wittams
 Jaap Aarts
+Maximilian Köstler

CHANGELOG.md

@@ -1,12 +1,49 @@
 # Changelog
 
-The latest published Druid release is [0.6.0](#060---2020-06-01) which was released on 2020-06-01.
-You can find its changes [documented below](#060---2020-06-01).
+The latest published Druid release is [0.7.0](#070---2021-01-01) which was released on 2021-01-01.
+You can find its changes [documented below](#070---2021-01-01).
 
-## [Unreleased]
+# Unreleased
 
 ### Highlights
 
+### Added
+- Sub windows: Allow opening windows that share state with arbitrary parts of the widget hierarchy ([#1254] by [@rjwittams])
+- WindowCloseRequested/WindowDisconnected event when a window is closing ([#1254] by [@rjwittams])
+- RichTextBuilder ([#1520] by [@Maan2003])
+- `get_external_handle` on `DelegateCtx` ([#1526] by [@Maan2003])
+- `AppLauncher::localization_resources` to use custom l10n resources. ([#1528] by [@edwin0cheng])
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- Fixed docs of derived Lens ([#1523] by [@Maan2003])
+
+### Visual
+
+### Docs
+
+### Examples
+
+### Maintenance
+
+- Updated to x11rb 0.8.0. ([#1519] by [@psychon])
+
+### Outside News
+
+## [0.7.0] - 2021-01-01
+
+### Highlights
+
+- Text improvements: `TextLayout` type ([#1182]) and rich text support ([#1245])
+- The `Formatter` trait provides more flexible handling of converions between
+values and their textual representations. ([#1377])
+
 ### Added
 
 - Windows: Added Screen module to get information about monitors and the screen. ([#1037] by [@rhzk])
@@ -56,6 +93,9 @@ You can find its changes [documented below](#060---2020-06-01).
 - `WidgetPod::is_initialized` to check if a widget has received `WidgetAdded`. ([#1259] by [@finnerale])
 - `TextBox::with_text_alignment` and `TextBox::set_text_alignment` ([#1371] by [@cmyr])
 - Add default minimum size to `WindowConfig`. ([#1438] by [@colinfruit])
+- Open and save dialogs send configurable commands. ([#1463] by [@jneem])
+- Windows: Dialogs now respect the parameter passed to `force_starting_directory()` ([#1452] by [@MaximilianKoestler])
+- Value formatting with the `Formatter` trait ([#1377] by [@cmyr])
 
 ### Changed
 
@@ -83,8 +123,10 @@ You can find its changes [documented below](#060---2020-06-01).
 - `TextBox` selects all contents when tabbed to on macOS ([#1283] by [@cmyr])
 - All Image formats are now optional, reducing compile time and binary size by default ([#1340] by [@JAicewizard])
 - The `Cursor` API has changed to a stateful one ([#1433] by [@jneem])
+- Part of the `SAVE_FILE` command is now `SAVE_FILE_AS` ([#1463] by [@jneem])
 
 ### Deprecated
+- Parse widget (replaced with `Formatter` trait) ([#1377] by [@cmyr])
 
 ### Removed
 
@@ -93,6 +135,7 @@ You can find its changes [documented below](#060---2020-06-01).
 
 ### Fixed
 
+- `ClipBox` should forward events if any child is active, not just the immediate child. ([#1448] by [@derekdreery])
 - macOS: Timers not firing during modal loop. ([#1028] by [@xStrom])
 - GTK: Directory selection now properly ignores file filters. ([#957] by [@xStrom])
 - GTK: Don't crash when receiving an external command while a file dialog is visible. ([#1043] by [@jneem])
@@ -126,6 +169,7 @@ You can find its changes [documented below](#060---2020-06-01).
 - Ensure that `LifeCycle::WidgetAdded` is the first thing a widget sees. ([#1259] by [@finnerale])
 - Fix a missed call to `CloseClipboard` on Windows. ([#1410] by [@andrewhickman])
 - WidgetPod: change not laid out `debug_panic` to warning ([#1441] by [@Maan2003])
+
 ### Visual
 
 - `TextBox` stroke remains inside its `paint_rect`. ([#1007] by [@jneem])
@@ -359,6 +403,8 @@ Last release without a changelog :(
 [@andrewhickman]: https://github.com/andrewhickman
 [@colinfruit]: https://github.com/colinfruit
 [@Maan2003]: https://github.com/Maan2003
+[@derekdreery]: https://github.com/derekdreery
+[@MaximilianKoestler]: https://github.com/MaximilianKoestler
 
 [#599]: https://github.com/linebender/druid/pull/599
 [#611]: https://github.com/linebender/druid/pull/611
@@ -546,6 +592,12 @@ Last release without a changelog :(
 [#1433]: https://github.com/linebender/druid/pull/1433
 [#1438]: https://github.com/linebender/druid/pull/1438
 [#1441]: https://github.com/linebender/druid/pull/1441
+[#1448]: https://github.com/linebender/druid/pull/1448
+[#1463]: https://github.com/linebender/druid/pull/1463
+[#1452]: https://github.com/linebender/druid/pull/1452
+[#1520]: https://github.com/linebender/druid/pull/1520
+[#1523]: https://github.com/linebender/druid/pull/1523
+[#1526]: https://github.com/linebender/druid/pull/1523
 
 [Unreleased]: https://github.com/linebender/druid/compare/v0.6.0...master
 [0.6.0]: https://github.com/linebender/druid/compare/v0.5.0...v0.6.0

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "docs/book_examples",
     "druid/examples/web",
     "druid/examples/hello_web",
+    "druid/examples/value_formatting",
 ]
 default-members = [
     "druid",

README.md

@@ -76,7 +76,7 @@ a lone dependency (it re-exports all the parts of `druid-shell`, `piet`, and `ku
 that you'll need):
 
 ```toml
-druid = "0.6.0"
+druid = "0.7.0"
 ```
 
 Since Druid is currently in fast-evolving state, you might prefer to drink from
@@ -301,14 +301,14 @@ active and friendly community.
 [Zulip chat instance]: https://xi.zulipchat.com
 [non-`druid` examples]: ./druid-shell/examples/shello.rs
 [crates.io]: https://crates.io/crates/druid
-[EventCtx]: https://docs.rs/druid/0.6.0/druid/struct.EventCtx.html
-[LifeCycleCtx]: https://docs.rs/druid/0.6.0/druid/struct.LifeCycleCtx.html
-[LayoutCtx]: https://docs.rs/druid/0.6.0/druid/struct.LayoutCtx.html
-[PaintCtx]: https://docs.rs/druid/0.6.0/druid/struct.PaintCtx.html
-[UpdateCtx]: https://docs.rs/druid/0.6.0/druid/struct.UpdateCtx.html
-[Widget trait]: https://docs.rs/druid/0.6.0/druid/trait.Widget.html
-[Data trait]: https://docs.rs/druid/0.6.0/druid/trait.Data.html
-[Lens datatype]: https://docs.rs/druid/0.6.0/druid/trait.Lens.html
+[EventCtx]: https://docs.rs/druid/0.7.0/druid/struct.EventCtx.html
+[LifeCycleCtx]: https://docs.rs/druid/0.7.0/druid/struct.LifeCycleCtx.html
+[LayoutCtx]: https://docs.rs/druid/0.7.0/druid/struct.LayoutCtx.html
+[PaintCtx]: https://docs.rs/druid/0.7.0/druid/struct.PaintCtx.html
+[UpdateCtx]: https://docs.rs/druid/0.7.0/druid/struct.UpdateCtx.html
+[Widget trait]: https://docs.rs/druid/0.7.0/druid/trait.Widget.html
+[Data trait]: https://docs.rs/druid/0.7.0/druid/trait.Data.html
+[Lens datatype]: https://docs.rs/druid/0.7.0/druid/trait.Lens.html
 [Druid book]: https://linebender.org/druid/
 [Iced]: https://github.com/hecrj/iced
 [Conrod]: https://github.com/PistonDevelopers/conrod

docs/src/custom_widgets.md

@@ -80,10 +80,10 @@ v controller, painter
 - request paint & request layout
 - changing widgets at runtime
 
-[`Controller`]: https://docs.rs/druid/0.6.0/druid/widget/trait.Controller.html
+[`Controller`]: https://docs.rs/druid/0.7.0/druid/widget/trait.Controller.html
 [`Widget`]: ./widget.md
-[`Painter`]: https://docs.rs/druid/0.6.0/druid/widget/struct.Painter.html
-[`SizedBox`]: https://docs.rs/druid/0.6.0/druid/widget/struct.SizedBox.html
-[`Container`]: https://docs.rs/druid/0.6.0/druid/widget/struct.Container.html
-[`WidgetExt`]: https://docs.rs/druid/0.6.0/druid/trait.WidgetExt.html
-[`background`]: https://docs.rs/druid/0.6.0/druid/trait.WidgetExt.html#background
+[`Painter`]: https://docs.rs/druid/0.7.0/druid/widget/struct.Painter.html
+[`SizedBox`]: https://docs.rs/druid/0.7.0/druid/widget/struct.SizedBox.html
+[`Container`]: https://docs.rs/druid/0.7.0/druid/widget/struct.Container.html
+[`WidgetExt`]: https://docs.rs/druid/0.7.0/druid/trait.WidgetExt.html
+[`background`]: https://docs.rs/druid/0.7.0/druid/trait.WidgetExt.html#background

docs/src/env.md

@@ -84,15 +84,15 @@ In general, you should not need to worry about localization directly. See the
 [localization] chapter for an overview of localization in Druid.
 
 
-[`Env`]: https://docs.rs/druid/0.6.0/druid/struct.Env.html
-[`Key`]: https://docs.rs/druid/0.6.0/druid/struct.Key.html
-[`Value`]: https://docs.rs/druid/0.6.0/druid/struct.Value.html
-[`LocalizedString`]: https://docs.rs/druid/0.6.0/druid/struct.LocalizedString.html
-[`resolve`]: https://docs.rs/druid/0.6.0/druid/struct.LocalizedString.html#method.resolve
+[`Env`]: https://docs.rs/druid/0.7.0/druid/struct.Env.html
+[`Key`]: https://docs.rs/druid/0.7.0/druid/struct.Key.html
+[`Value`]: https://docs.rs/druid/0.7.0/druid/struct.Value.html
+[`LocalizedString`]: https://docs.rs/druid/0.7.0/druid/struct.LocalizedString.html
+[`resolve`]: https://docs.rs/druid/0.7.0/druid/struct.LocalizedString.html#method.resolve
 [localization]: ./localization.md
 [reverse-DNS]: https://en.wikipedia.org/wiki/Reverse_domain_name_notation
-[`AppLauncher::configure_env`]: https://docs.rs/druid/0.6.0/druid/struct.AppLauncher.html#method.configure_env
-[`KeyOrValue`]: https://docs.rs/druid/0.6.0/druid/enum.KeyOrValue.html
-[`EnvScope`]: https://docs.rs/druid/0.6.0/druid/widget/struct.EnvScope.html
-[`WidgetExt`]: https://docs.rs/druid/0.6.0/druid/trait.WidgetExt.html
-[`env_scope`]: https://docs.rs/druid/0.6.0/druid/trait.WidgetExt.html#method.env_scope
+[`AppLauncher::configure_env`]: https://docs.rs/druid/0.7.0/druid/struct.AppLauncher.html#method.configure_env
+[`KeyOrValue`]: https://docs.rs/druid/0.7.0/druid/enum.KeyOrValue.html
+[`EnvScope`]: https://docs.rs/druid/0.7.0/druid/widget/struct.EnvScope.html
+[`WidgetExt`]: https://docs.rs/druid/0.7.0/druid/trait.WidgetExt.html
+[`env_scope`]: https://docs.rs/druid/0.7.0/druid/trait.WidgetExt.html#method.env_scope

docs/src/get_started.md

@@ -13,7 +13,7 @@ Setting up a project is a simple as creating a new Rust project;
 And then adding Druid as a dependency to Cargo.toml
 ```toml
 [dependencies]
-druid = "0.6.0"
+druid = "0.7.0"
 ```
 
 To show a minimal window with a label replace `main.rs` with this;
@@ -70,7 +70,7 @@ fn build_ui() -> impl Widget<()> {
                     .with_flex_child(Label::new("top left"), 1.0)
                     .with_flex_child(Align::centered(Label::new("bottom left")), 1.0),
                 1.0)
-            .with_child(
+            .with_flex_child(
                 Flex::column()
                     .with_flex_child(Label::new("top right"), 1.0)
                     .with_flex_child(Align::centered(Label::new("bottom right")), 1.0),

docs/src/setup.md

@@ -32,7 +32,7 @@ cargo new my-application
 and adding the druid dependency to your Cargo.toml
 ```no_compile
 [dependencies]
-druid = "0.6.0"
+druid = "0.7.0"
 // or to be on the bleeding edge:
 druid = { git = "https://github.com/linebender/druid.git" }
 ```

druid-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "druid-derive"
-version = "0.3.1"
+version = "0.4.0"
 license = "Apache-2.0"
 authors = ["Druid authors"]
 description = "derive impls for druid, a Rust UI toolkit."
@@ -20,6 +20,6 @@ quote = "1.0.7"
 proc-macro2 = "1.0.19"
 
 [dev-dependencies]
-druid = { version = "0.6.0", path = "../druid" }
+druid = { version = "0.7.0", path = "../druid" }
 
 float-cmp = { version = "0.8.0", features = ["std"], default-features = false }

druid-derive/src/lens.rs

@@ -66,9 +66,12 @@ fn derive_struct(input: &syn::DeriveInput) -> Result<proc_macro2::TokenStream, s
     // Define lens types for each field
     let defs = fields.iter().filter(|f| !f.attrs.ignore).map(|f| {
         let field_name = &f.ident.unwrap_named();
-
+        let docs = format!(
+            "Lens for the field `{}` on [`{1}`](super::{1})",
+            field_name, ty
+        );
         quote! {
-            /// Lens for the field on #ty
+            #[doc = #docs]
             #[allow(non_camel_case_types)]
             #[derive(Debug, Copy, Clone)]
             pub struct #field_name;

druid-shell/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "druid-shell"
-version = "0.6.0"
+version = "0.7.0"
 license = "Apache-2.0"
 authors = ["Raph Levien <[email protected]>"]
 description = "Platform abstracting application shell used for druid toolkit."
@@ -38,13 +38,13 @@ hdr = ["piet-common/hdr"]
 [dependencies]
 # NOTE: When changing the piet or kurbo versions, ensure that
 #       the kurbo version included in piet is compatible with the kurbo version specified here.
-piet-common = "=0.2.0-pre6"
-kurbo = "0.7.0"
+piet-common = "=0.3.2"
+kurbo = "0.7.1"
 
 log = "0.4.11"
 lazy_static = "1.4.0"
 time = "0.2.16"
-cfg-if = "0.1.10"
+cfg-if = "1.0.0"
 instant = { version = "0.1.6", features = ["wasm-bindgen"] }
 anyhow = "1.0.32"
 keyboard-types = { version = "0.5.0", default_features = false }
@@ -60,11 +60,12 @@ wio = "0.2.2"
 version = "0.3.9"
 features = ["d2d1_1", "dwrite", "winbase", "libloaderapi", "errhandlingapi", "winuser",
             "shellscalingapi", "shobjidl", "combaseapi", "synchapi", "dxgi1_3", "dcomp",
-            "d3d11", "dwmapi", "wincon", "fileapi", "processenv", "winbase", "handleapi"]
+            "d3d11", "dwmapi", "wincon", "fileapi", "processenv", "winbase", "handleapi",
+            "shellapi"]
 
 [target.'cfg(target_os="macos")'.dependencies]
 block = "0.1.6"
-cocoa = "0.23.0"
+cocoa = "0.24.0"
 objc = "0.2.7"
 core-graphics = "0.22.0"
 foreign-types = "0.3.2"
@@ -84,7 +85,7 @@ glib = { version = "0.10.1", optional = true }
 glib-sys = { version = "0.10.0", optional = true }
 gtk-sys = { version = "0.10.0", optional = true }
 nix = { version = "0.18.0", optional = true }
-x11rb = { version = "0.6.0", features = ["allow-unsafe-code", "present", "randr", "xfixes"], optional = true }
+x11rb = { version = "0.8.0", features = ["allow-unsafe-code", "present", "randr", "xfixes"], optional = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]
 wasm-bindgen = "0.2.67"
@@ -95,6 +96,6 @@ version = "0.3.44"
 features = ["Window", "MouseEvent", "CssStyleDeclaration", "WheelEvent", "KeyEvent", "KeyboardEvent"]
 
 [dev-dependencies]
-piet-common = { version = "=0.2.0-pre6", features = ["png"] }
+piet-common = { version = "=0.3.2", features = ["png"] }
 simple_logger = { version = "1.9.0", default-features = false }
 static_assertions = "1.1.0"

druid-shell/src/application.rs

@@ -75,9 +75,9 @@ impl Application {
     ///
     /// [druid#771]: https://github.com/linebender/druid/issues/771
     pub fn new() -> Result<Application, Error> {
-        if APPLICATION_CREATED.compare_and_swap(false, true, Ordering::AcqRel) {
-            return Err(Error::ApplicationAlreadyExists);
-        }
+        APPLICATION_CREATED
+            .compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire)
+            .map_err(|_| Error::ApplicationAlreadyExists)?;
         util::claim_main_thread();
         let platform_app = platform::Application::new()?;
         let state = Rc::new(RefCell::new(State { running: false }));