Merge branch 'master' into virtual-widgets
This commit is contained in:
commit
c35496d80f
58 changed files with 446 additions and 909 deletions
|
|
@ -3,7 +3,7 @@ use crate::{Element, Tree, Widget};
|
|||
use iced_native::layout::{self, Layout};
|
||||
use iced_native::renderer;
|
||||
use iced_native::text;
|
||||
use iced_native::{Hasher, Length, Point, Rectangle};
|
||||
use iced_native::{Length, Point, Rectangle};
|
||||
|
||||
pub use iced_native::widget::Text;
|
||||
|
||||
|
|
@ -47,12 +47,6 @@ where
|
|||
viewport,
|
||||
)
|
||||
}
|
||||
|
||||
fn hash_layout(&self, state: &mut Hasher) {
|
||||
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
|
||||
self, state,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue