Remove `widget` module re-exports in `iced_native`

22 files changed, 34 insertions, 34 deletions

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index b8ff5d21..4692ced1 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -1,7 +1,7 @@
 //! Write a graphics backend.
-use iced_native::image;
-use iced_native::svg;
-use iced_native::text;
+use iced_native::widget::image;
+use iced_native::widget::svg;
+use iced_native::widget::text;
 use iced_native::{Font, Point, Size};
 
 /// The graphics backend of a [`Renderer`].
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index b984feaa..16046387 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,6 +1,6 @@
-use iced_native::{
-    image, svg, Background, Color, Font, Rectangle, Size, Vector,
-};
+use iced_native::widget::image;
+use iced_native::widget::svg;
+use iced_native::{Background, Color, Font, Rectangle, Size, Vector};
 
 use crate::alignment;
 use crate::triangle;
diff --git a/graphics/src/widget/button.rs b/graphics/src/widget/button.rs
index 3d3e6675..7b40c47b 100644
--- a/graphics/src/widget/button.rs
+++ b/graphics/src/widget/button.rs
@@ -3,10 +3,10 @@
 //! A [`Button`] has some local [`State`].
 use crate::Renderer;
 
-pub use iced_native::button::{State, Style, StyleSheet};
+pub use iced_native::widget::button::{State, Style, StyleSheet};
 
 /// A widget that produces a message when clicked.
 ///
 /// This is an alias of an `iced_native` button with an `iced_wgpu::Renderer`.
 pub type Button<'a, Message, Backend> =
-    iced_native::Button<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Button<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/checkbox.rs b/graphics/src/widget/checkbox.rs
index a458d85c..0d2e93f9 100644
--- a/graphics/src/widget/checkbox.rs
+++ b/graphics/src/widget/checkbox.rs
@@ -7,4 +7,4 @@ pub use iced_style::checkbox::{Style, StyleSheet};
 ///
 /// This is an alias of an `iced_native` checkbox with an `iced_wgpu::Renderer`.
 pub type Checkbox<'a, Message, Backend> =
-    iced_native::Checkbox<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Checkbox<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/column.rs b/graphics/src/widget/column.rs
index 567529e5..561681d5 100644
--- a/graphics/src/widget/column.rs
+++ b/graphics/src/widget/column.rs
@@ -2,4 +2,4 @@ use crate::Renderer;
 
 /// A container that distributes its contents vertically.
 pub type Column<'a, Message, Backend> =
-    iced_native::Column<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Column<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/container.rs b/graphics/src/widget/container.rs
index c4c4e5ba..99996f3b 100644
--- a/graphics/src/widget/container.rs
+++ b/graphics/src/widget/container.rs
@@ -8,4 +8,4 @@ pub use iced_style::container::{Style, StyleSheet};
 /// This is an alias of an `iced_native` container with a default
 /// `Renderer`.
 pub type Container<'a, Message, Backend> =
-    iced_native::Container<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Container<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/image.rs b/graphics/src/widget/image.rs
index 242d36d7..0131dd82 100644
--- a/graphics/src/widget/image.rs
+++ b/graphics/src/widget/image.rs
@@ -4,9 +4,9 @@ pub mod viewer;
 use crate::backend::{self, Backend};
 use crate::{Primitive, Rectangle, Renderer};
 
-use iced_native::image;
+use iced_native::widget::image;
 
-pub use iced_native::image::{Handle, Image, Viewer};
+pub use iced_native::widget::image::{Handle, Image, Viewer};
 
 impl<B> image::Renderer for Renderer<B>
 where
diff --git a/graphics/src/widget/image/viewer.rs b/graphics/src/widget/image/viewer.rs
index ea7d8591..9260990a 100644
--- a/graphics/src/widget/image/viewer.rs
+++ b/graphics/src/widget/image/viewer.rs
@@ -1,2 +1,2 @@
 //! Zoom and pan on an image.
-pub use iced_native::image::Viewer;
+pub use iced_native::widget::image::Viewer;
diff --git a/graphics/src/widget/pane_grid.rs b/graphics/src/widget/pane_grid.rs
index 4dc42e41..95189920 100644
--- a/graphics/src/widget/pane_grid.rs
+++ b/graphics/src/widget/pane_grid.rs
@@ -9,7 +9,7 @@
 //! [`pane_grid` example]: https://github.com/hecrj/iced/tree/0.3/examples/pane_grid
 use crate::Renderer;
 
-pub use iced_native::pane_grid::{
+pub use iced_native::widget::pane_grid::{
     Axis, Configuration, Content, Direction, DragEvent, Node, Pane,
     ResizeEvent, Split, State, TitleBar,
 };
@@ -23,4 +23,4 @@ pub use iced_style::pane_grid::{Line, StyleSheet};
 ///
 /// This is an alias of an `iced_native` pane grid with an `iced_wgpu::Renderer`.
 pub type PaneGrid<'a, Message, Backend> =
-    iced_native::PaneGrid<'a, Message, Renderer<Backend>>;
+    iced_native::widget::PaneGrid<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/pick_list.rs b/graphics/src/widget/pick_list.rs
index b5cb0a44..f3ac12b8 100644
--- a/graphics/src/widget/pick_list.rs
+++ b/graphics/src/widget/pick_list.rs
@@ -1,9 +1,9 @@
 //! Display a dropdown list of selectable values.
 use crate::Renderer;
 
-pub use iced_native::pick_list::State;
+pub use iced_native::widget::pick_list::State;
 pub use iced_style::pick_list::{Style, StyleSheet};
 
 /// A widget allowing the selection of a single value from a list of options.
 pub type PickList<'a, T, Message, Backend> =
-    iced_native::PickList<'a, T, Message, Renderer<Backend>>;
+    iced_native::widget::PickList<'a, T, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/progress_bar.rs b/graphics/src/widget/progress_bar.rs
index df4f5ec6..3666ecfd 100644
--- a/graphics/src/widget/progress_bar.rs
+++ b/graphics/src/widget/progress_bar.rs
@@ -2,4 +2,4 @@
 //!
 //! A [`ProgressBar`] has a range of possible values and a current value,
 //! as well as a length, height and style.
-pub use iced_native::progress_bar::*;
+pub use iced_native::widget::progress_bar::*;
diff --git a/graphics/src/widget/radio.rs b/graphics/src/widget/radio.rs
index 4185bd61..20d72747 100644
--- a/graphics/src/widget/radio.rs
+++ b/graphics/src/widget/radio.rs
@@ -8,4 +8,4 @@ pub use iced_style::radio::{Style, StyleSheet};
 /// This is an alias of an `iced_native` radio button with an
 /// `iced_wgpu::Renderer`.
 pub type Radio<'a, Message, Backend> =
-    iced_native::Radio<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Radio<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/row.rs b/graphics/src/widget/row.rs
index 55960c04..5bee3fd5 100644
--- a/graphics/src/widget/row.rs
+++ b/graphics/src/widget/row.rs
@@ -2,4 +2,4 @@ use crate::Renderer;
 
 /// A container that distributes its contents horizontally.
 pub type Row<'a, Message, Backend> =
-    iced_native::Row<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Row<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/rule.rs b/graphics/src/widget/rule.rs
index 57f4a530..b96924fa 100644
--- a/graphics/src/widget/rule.rs
+++ b/graphics/src/widget/rule.rs
@@ -1,3 +1,3 @@
 //! Display a horizontal or vertical rule for dividing content.
 
-pub use iced_native::rule::*;
+pub use iced_native::widget::rule::*;
diff --git a/graphics/src/widget/scrollable.rs b/graphics/src/widget/scrollable.rs
index 61eae587..3fdaf668 100644
--- a/graphics/src/widget/scrollable.rs
+++ b/graphics/src/widget/scrollable.rs
@@ -1,7 +1,7 @@
 //! Navigate an endless amount of content with a scrollbar.
 use crate::Renderer;
 
-pub use iced_native::scrollable::State;
+pub use iced_native::widget::scrollable::State;
 pub use iced_style::scrollable::{Scrollbar, Scroller, StyleSheet};
 
 /// A widget that can vertically display an infinite amount of content
@@ -10,4 +10,4 @@ pub use iced_style::scrollable::{Scrollbar, Scroller, StyleSheet};
 /// This is an alias of an `iced_native` scrollable with a default
 /// `Renderer`.
 pub type Scrollable<'a, Message, Backend> =
-    iced_native::Scrollable<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Scrollable<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/slider.rs b/graphics/src/widget/slider.rs
index 766ecbb6..96dc6ec4 100644
--- a/graphics/src/widget/slider.rs
+++ b/graphics/src/widget/slider.rs
@@ -1,5 +1,5 @@
 //! Display an interactive selector of a single value from a range of values.
 //!
 //! A [`Slider`] has some local [`State`].
-pub use iced_native::slider::{Slider, State};
+pub use iced_native::widget::slider::{Slider, State};
 pub use iced_style::slider::{Handle, HandleShape, Style, StyleSheet};
diff --git a/graphics/src/widget/space.rs b/graphics/src/widget/space.rs
index a4d60d4b..77e93dbb 100644
--- a/graphics/src/widget/space.rs
+++ b/graphics/src/widget/space.rs
@@ -1 +1 @@
-pub use iced_native::Space;
+pub use iced_native::widget::Space;
diff --git a/graphics/src/widget/svg.rs b/graphics/src/widget/svg.rs
index 621f1a85..64a2b461 100644
--- a/graphics/src/widget/svg.rs
+++ b/graphics/src/widget/svg.rs
@@ -1,9 +1,9 @@
 //! Display vector graphics in your application.
 use crate::backend::{self, Backend};
 use crate::{Primitive, Rectangle, Renderer};
-use iced_native::svg;
+use iced_native::widget::svg;
 
-pub use iced_native::svg::{Handle, Svg};
+pub use iced_native::widget::svg::{Handle, Svg};
 
 impl<B> svg::Renderer for Renderer<B>
 where
diff --git a/graphics/src/widget/text.rs b/graphics/src/widget/text.rs
index ec0349f9..43516fca 100644
--- a/graphics/src/widget/text.rs
+++ b/graphics/src/widget/text.rs
@@ -4,4 +4,4 @@ use crate::Renderer;
 /// A paragraph of text.
 ///
 /// This is an alias of an `iced_native` text with an `iced_wgpu::Renderer`.
-pub type Text<Backend> = iced_native::Text<Renderer<Backend>>;
+pub type Text<Backend> = iced_native::widget::Text<Renderer<Backend>>;
diff --git a/graphics/src/widget/text_input.rs b/graphics/src/widget/text_input.rs
index ebb9138f..87384d7e 100644
--- a/graphics/src/widget/text_input.rs
+++ b/graphics/src/widget/text_input.rs
@@ -3,11 +3,11 @@
 //! A [`TextInput`] has some local [`State`].
 use crate::Renderer;
 
-pub use iced_native::text_input::State;
+pub use iced_native::widget::text_input::State;
 pub use iced_style::text_input::{Style, StyleSheet};
 
 /// A field that can be filled with text.
 ///
 /// This is an alias of an `iced_native` text input with an `iced_wgpu::Renderer`.
 pub type TextInput<'a, Message, Backend> =
-    iced_native::TextInput<'a, Message, Renderer<Backend>>;
+    iced_native::widget::TextInput<'a, Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/toggler.rs b/graphics/src/widget/toggler.rs
index 60d8a347..0cabd027 100644
--- a/graphics/src/widget/toggler.rs
+++ b/graphics/src/widget/toggler.rs
@@ -7,4 +7,4 @@ pub use iced_style::toggler::{Style, StyleSheet};
 ///
 /// This is an alias of an `iced_native` toggler with an `iced_wgpu::Renderer`.
 pub type Toggler<Message, Backend> =
-    iced_native::Toggler<Message, Renderer<Backend>>;
+    iced_native::widget::Toggler<Message, Renderer<Backend>>;
diff --git a/graphics/src/widget/tooltip.rs b/graphics/src/widget/tooltip.rs
index 867f0437..7dc12ed4 100644
--- a/graphics/src/widget/tooltip.rs
+++ b/graphics/src/widget/tooltip.rs
@@ -6,6 +6,6 @@ use crate::Renderer;
 /// This is an alias of an `iced_native` tooltip with a default
 /// `Renderer`.
 pub type Tooltip<'a, Message, Backend> =
-    iced_native::Tooltip<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Tooltip<'a, Message, Renderer<Backend>>;
 
-pub use iced_native::tooltip::Position;
+pub use iced_native::widget::tooltip::Position;