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

23
native/src/widget/text_input.rs
View file

@ -20,8 +20,8 @@ use crate::renderer;
use crate::text::{self, Text};
use crate::touch;
use crate::{
Clipboard, Color, Element, Hasher, Layout, Length, Padding, Point,
Rectangle, Shell, Size, Vector, Widget,
Clipboard, Color, Element, Layout, Length, Padding, Point, Rectangle,
Shell, Size, Vector, Widget,
};
pub use iced_style::text_input::{Style, StyleSheet};
@ -725,21 +725,6 @@ pub fn mouse_interaction(
}
}
/// Hashes the layout attributes of a [`TextInput`].
pub fn hash_layout(
state: &mut Hasher,
width: Length,
padding: Padding,
size: Option<u16>,
) {
use std::hash::Hash;
std::any::TypeId::of::<State>().hash(state);
width.hash(state);
padding.hash(state);
size.hash(state);
}
impl<'a, Message, Renderer> Widget<Message, Renderer>
for TextInput<'a, Message, Renderer>
where
@ -819,10 +804,6 @@ where
self.style_sheet.as_ref(),
)
}
fn hash_layout(&self, state: &mut Hasher) {
hash_layout(state, self.width, self.padding, self.size)
}
}
impl<'a, Message, Renderer> From<TextInput<'a, Message, Renderer>>