diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-29 02:00:28 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-29 02:00:28 +0200 |
| commit | 0cde20b3550ede81bc7ddef628b91eec225aa8af (patch) | |
| tree | 56920437979012cceb49718f2dd4ce27d5ba5d40 /wgpu/src/widget.rs | |
| parent | 67b6f044e870df41be92cdc79f571682b97a5d0d (diff) | |
| parent | e11b5c614f5bf73c137b8b4f24f56047617527eb (diff) | |
| download | iced-0cde20b3550ede81bc7ddef628b91eec225aa8af.tar.gz iced-0cde20b3550ede81bc7ddef628b91eec225aa8af.tar.bz2 iced-0cde20b3550ede81bc7ddef628b91eec225aa8af.zip | |
Merge branch 'master' into improvement/update-wgpu_glyph
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/widget.rs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/wgpu/src/widget.rs b/wgpu/src/widget.rs index 32ccad17..d17b7a5d 100644 --- a/wgpu/src/widget.rs +++ b/wgpu/src/widget.rs @@ -7,6 +7,8 @@ //! ``` //! use iced_wgpu::{button, Button}; //! ``` +use crate::Renderer; + pub mod button; pub mod checkbox; pub mod container; @@ -17,8 +19,6 @@ pub mod scrollable; pub mod slider; pub mod text_input; -mod text; - #[doc(no_inline)] pub use button::Button; #[doc(no_inline)] @@ -38,8 +38,6 @@ pub use slider::Slider; #[doc(no_inline)] pub use text_input::TextInput; -pub use text::Text; - #[cfg(feature = "canvas")] #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))] pub mod canvas; @@ -47,3 +45,14 @@ pub mod canvas; #[cfg(feature = "canvas")] #[doc(no_inline)] pub use canvas::Canvas; + +pub use iced_native::Space; + +/// A container that distributes its contents vertically. +pub type Column<'a, Message> = iced_native::Column<'a, Message, Renderer>; + +/// A container that distributes its contents horizontally. +pub type Row<'a, Message> = iced_native::Row<'a, Message, Renderer>; + +/// A paragraph of text. +pub type Text = iced_native::Text<Renderer>; |