Merge branch 'master' into virtual-widgets

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

View file

@ -10,7 +10,7 @@ use iced_native::renderer;
use iced_native::text;
use iced_native::widget::pick_list;
use iced_native::{
Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
};
use std::borrow::Cow;
@ -145,17 +145,6 @@ where
)
}
fn hash_layout(&self, state: &mut Hasher) {
pick_list::hash_layout(
state,
self.width,
self.padding,
self.text_size,
self.placeholder.as_ref().map(String::as_str),
&self.options,
)
}
fn on_event(
&mut self,
tree: &mut Tree,