diff options
| author | 2022-03-07 15:29:43 +0700 | |
|---|---|---|
| committer | 2022-03-07 15:29:43 +0700 | |
| commit | c35496d80fc542c9beeea39dec98eb5cdef07aaa (patch) | |
| tree | 62f28fabf631f33a1a94fb25fa076b44140adbe4 /graphics | |
| parent | 820d332736205c7485d08352841b705205130f38 (diff) | |
| parent | af7cbf0003496d757696ea6e15ea32f0649cf8f9 (diff) | |
| download | iced-c35496d80fc542c9beeea39dec98eb5cdef07aaa.tar.gz iced-c35496d80fc542c9beeea39dec98eb5cdef07aaa.tar.bz2 iced-c35496d80fc542c9beeea39dec98eb5cdef07aaa.zip | |
Merge branch 'master' into virtual-widgets
Diffstat (limited to '')
| -rw-r--r-- | graphics/src/widget/canvas.rs | 13 | ||||
| -rw-r--r-- | graphics/src/widget/qr_code.rs | 9 | 
2 files changed, 3 insertions, 19 deletions
| diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs index 1016bbe3..157aa25c 100644 --- a/graphics/src/widget/canvas.rs +++ b/graphics/src/widget/canvas.rs @@ -9,10 +9,9 @@ use crate::{Backend, Primitive};  use iced_native::layout;  use iced_native::mouse;  use iced_native::{ -    Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Shell, Size, -    Vector, Widget, +    Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, +    Widget,  }; -use std::hash::Hash;  use std::marker::PhantomData;  pub mod event; @@ -226,14 +225,6 @@ where              });          });      } - -    fn hash_layout(&self, state: &mut Hasher) { -        struct Marker; -        std::any::TypeId::of::<Marker>().hash(state); - -        self.width.hash(state); -        self.height.hash(state); -    }  }  impl<'a, Message, P, B> From<Canvas<Message, P>> diff --git a/graphics/src/widget/qr_code.rs b/graphics/src/widget/qr_code.rs index 285b8622..907794b7 100644 --- a/graphics/src/widget/qr_code.rs +++ b/graphics/src/widget/qr_code.rs @@ -5,8 +5,7 @@ use crate::Backend;  use iced_native::layout;  use iced_native::{ -    Color, Element, Hasher, Layout, Length, Point, Rectangle, Size, Vector, -    Widget, +    Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,  };  use thiserror::Error; @@ -74,12 +73,6 @@ where          ))      } -    fn hash_layout(&self, state: &mut Hasher) { -        use std::hash::Hash; - -        self.state.contents.hash(state); -    } -      fn draw(          &self,          renderer: &mut Renderer<B>, | 
