me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into feature/canvas-interaction

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-04-29 07:34:14 +02:00
commit 61c707fe04
18 changed files with 147 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/widget.rs
View file

@ -20,7 +20,7 @@
mod platform {
pub use iced_wgpu::widget::{
button, checkbox, container, pane_grid, progress_bar, radio,
scrollable, slider, text_input,
scrollable, slider, text_input, Text,
};
#[cfg(feature = "canvas")]
@ -39,7 +39,7 @@ mod platform {
pub use iced_winit::svg::{Handle, Svg};
}
pub use iced_winit::{Space, Text};
pub use iced_winit::Space;
#[doc(no_inline)]
pub use {