From 65eb218d3d7ba52b2869a586a1480eeb3c8f84e4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 21 Nov 2019 13:47:20 +0100
Subject: Move widgets from `core` to `native` and `web`

Also made fields private and improved `Renderer` traits.
---
 src/native.rs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 src/native.rs

(limited to 'src/native.rs')

diff --git a/src/native.rs b/src/native.rs
new file mode 100644
index 00000000..fcb50d43
--- /dev/null
+++ b/src/native.rs
@@ -0,0 +1,51 @@
+pub use iced_winit::{
+    Align, Background, Color, Command, Font, HorizontalAlignment, Length,
+    VerticalAlignment,
+};
+
+pub mod widget {
+    pub mod button {
+        pub type Button<'a, Message> =
+            iced_winit::Button<'a, Message, iced_wgpu::Renderer>;
+
+        pub use iced_winit::button::State;
+    }
+
+    pub mod scrollable {
+        pub type Scrollable<'a, Message> =
+            iced_winit::Scrollable<'a, Message, iced_wgpu::Renderer>;
+
+        pub use iced_winit::scrollable::State;
+    }
+
+    pub mod text_input {
+        pub use iced_winit::text_input::{State, TextInput};
+    }
+
+    pub mod slider {
+        pub use iced_winit::slider::{Slider, State};
+    }
+
+    pub use iced_winit::{Checkbox, Image, Radio, Text};
+
+    #[doc(no_inline)]
+    pub use {
+        button::Button, scrollable::Scrollable, slider::Slider,
+        text_input::TextInput,
+    };
+
+    pub type Column<'a, Message> =
+        iced_winit::Column<'a, Message, iced_wgpu::Renderer>;
+
+    pub type Row<'a, Message> =
+        iced_winit::Row<'a, Message, iced_wgpu::Renderer>;
+
+    pub type Container<'a, Message> =
+        iced_winit::Container<'a, Message, iced_wgpu::Renderer>;
+}
+
+#[doc(no_inline)]
+pub use widget::*;
+
+pub type Element<'a, Message> =
+    iced_winit::Element<'a, Message, iced_wgpu::Renderer>;
-- 
cgit 


From a7dba612f03e58d7bd9527499d893987986b347c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 22 Nov 2019 19:36:57 +0100
Subject: Write docs for `iced` and `iced_native`

---
 src/native.rs | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'src/native.rs')

diff --git a/src/native.rs b/src/native.rs
index fcb50d43..926b2d11 100644
--- a/src/native.rs
+++ b/src/native.rs
@@ -4,7 +4,36 @@ pub use iced_winit::{
 };
 
 pub mod widget {
+    //! Display information and interactive controls in your application.
+    //!
+    //! # Re-exports
+    //! For convenience, the contents of this module are available at the root
+    //! module. Therefore, you can directly type:
+    //!
+    //! ```
+    //! use iced::{button, Button};
+    //! ```
+    //!
+    //! # Stateful widgets
+    //! Some widgets need to keep track of __local state__.
+    //!
+    //! These widgets have their own module with a `State` type. For instance, a
+    //! [`TextInput`] has some [`text_input::State`].
+    //!
+    //! [`TextInput`]: text_input/struct.TextInput.html
+    //! [`text_input::State`]: text_input/struct.State.html
     pub mod button {
+        //! Allow your users to perform actions by pressing a button.
+        //!
+        //! A [`Button`] has some local [`State`].
+        //!
+        //! [`Button`]: type.Button.html
+        //! [`State`]: struct.State.html
+
+        /// A widget that produces a message when clicked.
+        ///
+        /// This is an alias of an `iced_native` button with a default
+        /// `Renderer`.
         pub type Button<'a, Message> =
             iced_winit::Button<'a, Message, iced_wgpu::Renderer>;
 
@@ -12,6 +41,13 @@ pub mod widget {
     }
 
     pub mod scrollable {
+        //! Navigate an endless amount of content with a scrollbar.
+
+        /// A widget that can vertically display an infinite amount of content
+        /// with a scrollbar.
+        ///
+        /// This is an alias of an `iced_native` scrollable with a default
+        /// `Renderer`.
         pub type Scrollable<'a, Message> =
             iced_winit::Scrollable<'a, Message, iced_wgpu::Renderer>;
 
@@ -19,10 +55,23 @@ pub mod widget {
     }
 
     pub mod text_input {
+        //! Ask for information using text fields.
+        //!
+        //! A [`TextInput`] has some local [`State`].
+        //!
+        //! [`TextInput`]: struct.TextInput.html
+        //! [`State`]: struct.State.html
         pub use iced_winit::text_input::{State, TextInput};
     }
 
     pub mod slider {
+        //! Display an interactive selector of a single value from a range of
+        //! values.
+        //!
+        //! A [`Slider`] has some local [`State`].
+        //!
+        //! [`Slider`]: struct.Slider.html
+        //! [`State`]: struct.State.html
         pub use iced_winit::slider::{Slider, State};
     }
 
@@ -34,12 +83,22 @@ pub mod widget {
         text_input::TextInput,
     };
 
+    /// A container that distributes its contents vertically.
+    ///
+    /// This is an alias of an `iced_native` column with a default `Renderer`.
     pub type Column<'a, Message> =
         iced_winit::Column<'a, Message, iced_wgpu::Renderer>;
 
+    /// A container that distributes its contents horizontally.
+    ///
+    /// This is an alias of an `iced_native` row with a default `Renderer`.
     pub type Row<'a, Message> =
         iced_winit::Row<'a, Message, iced_wgpu::Renderer>;
 
+    /// An element decorating some content.
+    ///
+    /// This is an alias of an `iced_native` container with a default
+    /// `Renderer`.
     pub type Container<'a, Message> =
         iced_winit::Container<'a, Message, iced_wgpu::Renderer>;
 }
@@ -47,5 +106,8 @@ pub mod widget {
 #[doc(no_inline)]
 pub use widget::*;
 
+/// A generic widget.
+///
+/// This is an alias of an `iced_native` element with a default `Renderer`.
 pub type Element<'a, Message> =
     iced_winit::Element<'a, Message, iced_wgpu::Renderer>;
-- 
cgit