Merge branch 'master' into theming

2022-07-08 19:31:45 +02:00 · 2022-07-08 19:31:45 +02:00 · fa55dff61d
commit fa55dff61d
parent 1dd1a2f97f 66eb626300
34 changed files with 444 additions and 337 deletions
--- a/graphics/src/widget/pure/canvas.rs
+++ b/graphics/src/widget/pure/canvas.rs
@ -111,7 +111,8 @@ where
    B: Backend,
 {
    fn tag(&self) -> tree::Tag {
-        tree::Tag::of::<P::State>()
+        struct Tag<T>(T);
+        tree::Tag::of::<Tag<P::State>>()
    }

    fn state(&self) -> tree::State {