me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Widget::tag implementation of pure::Canvas

Browse source 
Using `P::State` can cause a panic if the `Canvas` has `()` as
`P::State` and replaces a stateless widget in a future `view` call.
This commit is contained in:
Héctor Ramón Jiménez 2022-07-01 03:37:28 +02:00
parent 799a7e501d
commit 9330a83775
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
graphics/src/widget/pure/canvas.rs
View file

@ -109,7 +109,8 @@ where
B: Backend, B: Backend,
{ {
fn tag(&self) -> tree::Tag { 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 { fn state(&self) -> tree::State {

3
lazy/src/pure/component.rs
View file

@ -70,8 +70,6 @@ where
}) })
} }
struct Tag<T>(T);
struct Instance<'a, Message, Renderer, Event, S> { struct Instance<'a, Message, Renderer, Event, S> {
state: RefCell<Option<State<'a, Message, Renderer, Event, S>>>, state: RefCell<Option<State<'a, Message, Renderer, Event, S>>>,
} }
@ -132,6 +130,7 @@ where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
struct Tag<T>(T);
tree::Tag::of::<Tag<S>>() tree::Tag::of::<Tag<S>>()
} }