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

Merge branch 'master' into virtual-widgets

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-03-07 15:29:43 +07:00
commit c35496d80f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
58 changed files with 446 additions and 909 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pure/src/widget/container.rs
View file

@ -9,10 +9,9 @@ use iced_native::overlay;
use iced_native::renderer;
use iced_native::widget::container;
use iced_native::{
Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
};
use std::hash::Hash;
use std::u32;
pub use iced_style::container::{Style, StyleSheet};
@ -224,21 +223,6 @@ where
);
}
fn hash_layout(&self, state: &mut Hasher) {
struct Marker;
std::any::TypeId::of::<Marker>().hash(state);
self.padding.hash(state);
self.width.hash(state);
self.height.hash(state);
self.max_width.hash(state);
self.max_height.hash(state);
self.horizontal_alignment.hash(state);
self.vertical_alignment.hash(state);
self.content.as_widget().hash_layout(state);
}
fn overlay<'b>(
&'b self,
tree: &'b mut Tree,