Export widget modules in iced_pure

... and fix collisions with the new `helpers`

src/pure.rs

@@ -17,33 +17,7 @@
 //! [the original widgets]: crate::widget
 //! [`button::State`]: crate::widget::button::State
 //! [impure `Application`]: crate::Application
-pub use iced_pure::{
-    Button as _, Column as _, Element as _, Image as _, Row as _, Text as _, *,
-};
-
-/// A generic, pure [`Widget`].
-pub type Element<'a, Message> =
-    iced_pure::Element<'a, Message, crate::Renderer>;
-
-/// A pure container widget.
-pub type Container<'a, Message> =
-    iced_pure::Container<'a, Message, crate::Renderer>;
-
-/// A pure column widget.
-pub type Column<'a, Message> = iced_pure::Column<'a, Message, crate::Renderer>;
-
-/// A pure row widget.
-pub type Row<'a, Message> = iced_pure::Row<'a, Message, crate::Renderer>;
-
-/// A pure button widget.
-pub type Button<'a, Message> = iced_pure::Button<'a, Message, crate::Renderer>;
-
-/// A pure text widget.
-pub type Text = iced_pure::Text<crate::Renderer>;
-
-#[cfg(feature = "image")]
-/// A pure image widget.
-pub type Image = iced_pure::Image<crate::widget::image::Handle>;
+pub mod widget;
 
 mod application;
 mod sandbox;
@@ -51,8 +25,9 @@ mod sandbox;
 pub use application::Application;
 pub use sandbox::Sandbox;
 
-#[cfg(feature = "canvas")]
-pub use iced_graphics::widget::pure::canvas;
+pub use iced_pure::helpers::*;
+pub use iced_pure::{Pure, State};
 
-#[cfg(feature = "canvas")]
-pub use canvas::Canvas;
+/// A generic, pure [`Widget`].
+pub type Element<'a, Message> =
+    iced_pure::Element<'a, Message, crate::Renderer>;

src/pure/widget.rs

@@ -0,0 +1,155 @@
+//! Pure versions of the widgets.
+
+/// A container that distributes its contents vertically.
+pub type Column<'a, Message> =
+    iced_pure::widget::Column<'a, Message, crate::Renderer>;
+
+/// A container that distributes its contents horizontally.
+pub type Row<'a, Message> =
+    iced_pure::widget::Row<'a, Message, crate::Renderer>;
+
+/// A paragraph of text.
+pub type Text = iced_pure::widget::Text<crate::Renderer>;
+
+pub mod button {
+    //! Allow your users to perform actions by pressing a button.
+    pub use iced_pure::widget::button::{Style, StyleSheet};
+
+    /// A widget that produces a message when clicked.
+    pub type Button<'a, Message> =
+        iced_pure::widget::Button<'a, Message, crate::Renderer>;
+}
+
+pub mod checkbox {
+    //! Show toggle controls using checkboxes.
+    pub use iced_pure::widget::checkbox::{Style, StyleSheet};
+
+    /// A box that can be checked.
+    pub type Checkbox<'a, Message> =
+        iced_native::widget::Checkbox<'a, Message, crate::Renderer>;
+}
+
+pub mod container {
+    //! Decorate content and apply alignment.
+    pub use iced_pure::widget::container::{Style, StyleSheet};
+
+    /// An element decorating some content.
+    pub type Container<'a, Message> =
+        iced_pure::widget::Container<'a, Message, crate::Renderer>;
+}
+
+pub mod pane_grid {
+    //! Let your users split regions of your application and organize layout dynamically.
+    //!
+    //! [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
+    //!
+    //! # Example
+    //! The [`pane_grid` example] showcases how to use a [`PaneGrid`] with resizing,
+    //! drag and drop, and hotkey support.
+    //!
+    //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.3/examples/pane_grid
+    pub use iced_pure::widget::pane_grid::{
+        Axis, Configuration, Direction, DragEvent, Line, Node, Pane,
+        ResizeEvent, Split, State, StyleSheet,
+    };
+
+    /// A collection of panes distributed using either vertical or horizontal splits
+    /// to completely fill the space available.
+    ///
+    /// [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
+    pub type PaneGrid<'a, Message> =
+        iced_pure::widget::PaneGrid<'a, Message, crate::Renderer>;
+
+    /// The content of a [`Pane`].
+    pub type Content<'a, Message> =
+        iced_pure::widget::pane_grid::Content<'a, Message, crate::Renderer>;
+
+    /// The title bar of a [`Pane`].
+    pub type TitleBar<'a, Message> =
+        iced_pure::widget::pane_grid::TitleBar<'a, Message, crate::Renderer>;
+}
+
+pub mod pick_list {
+    //! Display a dropdown list of selectable values.
+    pub use iced_pure::overlay::menu::Style as Menu;
+    pub use iced_pure::widget::pick_list::{Style, StyleSheet};
+
+    /// A widget allowing the selection of a single value from a list of options.
+    pub type PickList<'a, T, Message> =
+        iced_pure::widget::PickList<'a, T, Message, crate::Renderer>;
+}
+
+pub mod radio {
+    //! Create choices using radio buttons.
+    pub use iced_pure::widget::radio::{Style, StyleSheet};
+
+    /// A circular button representing a choice.
+    pub type Radio<'a, Message> =
+        iced_pure::widget::Radio<'a, Message, crate::Renderer>;
+}
+
+pub mod scrollable {
+    //! Navigate an endless amount of content with a scrollbar.
+    pub use iced_pure::widget::scrollable::{Scrollbar, Scroller, StyleSheet};
+
+    /// A widget that can vertically display an infinite amount of content
+    /// with a scrollbar.
+    pub type Scrollable<'a, Message> =
+        iced_pure::widget::Scrollable<'a, Message, crate::Renderer>;
+}
+
+pub mod toggler {
+    //! Show toggle controls using togglers.
+    pub use iced_pure::widget::toggler::{Style, StyleSheet};
+
+    /// A toggler widget.
+    pub type Toggler<'a, Message> =
+        iced_pure::widget::Toggler<'a, Message, crate::Renderer>;
+}
+
+pub mod text_input {
+    //! Display fields that can be filled with text.
+    use crate::Renderer;
+
+    pub use iced_pure::widget::text_input::{Style, StyleSheet};
+
+    /// A field that can be filled with text.
+    pub type TextInput<'a, Message> =
+        iced_pure::widget::TextInput<'a, Message, Renderer>;
+}
+
+pub use iced_pure::widget::progress_bar;
+pub use iced_pure::widget::rule;
+pub use iced_pure::widget::slider;
+pub use iced_pure::widget::Space;
+
+pub use button::Button;
+pub use checkbox::Checkbox;
+pub use container::Container;
+pub use pane_grid::PaneGrid;
+pub use pick_list::PickList;
+pub use progress_bar::ProgressBar;
+pub use radio::Radio;
+pub use rule::Rule;
+pub use scrollable::Scrollable;
+pub use slider::Slider;
+pub use text_input::TextInput;
+pub use toggler::Toggler;
+
+#[cfg(feature = "canvas")]
+pub use iced_graphics::widget::pure::canvas;
+
+#[cfg(feature = "image")]
+pub mod image {
+    //! Display images in your user interface.
+    pub use iced_native::image::Handle;
+
+    /// A frame that displays an image.
+    pub type Image = iced_pure::widget::Image<Handle>;
+}
+
+#[cfg(feature = "canvas")]
+pub use canvas::Canvas;
+
+#[cfg(feature = "image")]
+pub use image::Image;