Merge pull request #1830 from iced-rs/advanced-text

Advanced text

1 files changed, 17 insertions, 17 deletions

diff --git a/lazy/src/component.rs b/widget/src/lazy/component.rs
index 4a43223d..49ae68af 100644
--- a/lazy/src/component.rs
+++ b/widget/src/lazy/component.rs
@@ -1,13 +1,13 @@
 //! Build and reuse custom widgets using The Elm Architecture.
-use iced_native::event;
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::overlay;
-use iced_native::renderer;
-use iced_native::widget;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::{
-    Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
+use crate::core::event;
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
+    self, Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
 
 use ouroboros::self_referencing;
@@ -70,7 +70,7 @@ where
     C: Component<Message, Renderer> + 'a,
     C::State: 'static,
     Message: 'a,
-    Renderer: iced_native::Renderer + 'a,
+    Renderer: core::Renderer + 'a,
 {
     Element::new(Instance {
         state: RefCell::new(Some(
@@ -106,7 +106,7 @@ struct State<'a, Message: 'a, Renderer: 'a, Event: 'a, S: 'a> {
 impl<'a, Message, Renderer, Event, S> Instance<'a, Message, Renderer, Event, S>
 where
     S: Default + 'static,
-    Renderer: iced_native::Renderer,
+    Renderer: renderer::Renderer,
 {
     fn diff_self(&self) {
         self.with_element(|element| {
@@ -216,7 +216,7 @@ impl<'a, Message, Renderer, Event, S> Widget<Message, Renderer>
     for Instance<'a, Message, Renderer, Event, S>
 where
     S: 'static + Default,
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn tag(&self) -> tree::Tag {
         tree::Tag::of::<Tag<S>>()
@@ -263,7 +263,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: core::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -546,7 +546,7 @@ impl<'a, 'b, Message, Renderer, Event, S>
 impl<'a, 'b, Message, Renderer, Event, S> overlay::Overlay<Message, Renderer>
     for OverlayInstance<'a, 'b, Message, Renderer, Event, S>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
     S: 'static + Default,
 {
     fn layout(
@@ -596,13 +596,13 @@ where
 
     fn on_event(
         &mut self,
-        event: iced_native::Event,
+        event: core::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
-    ) -> iced_native::event::Status {
+    ) -> event::Status {
         let mut local_messages = Vec::new();
         let mut local_shell = Shell::new(&mut local_messages);
 
@@ -617,7 +617,7 @@ where
                     &mut local_shell,
                 )
             })
-            .unwrap_or(iced_native::event::Status::Ignored);
+            .unwrap_or(event::Status::Ignored);
 
         local_shell.revalidate_layout(|| shell.invalidate_layout());