Move widgets from core to native and web
Also made fields private and improved `Renderer` traits.
This commit is contained in:
parent
d3553adf27
commit
65eb218d3d
59 changed files with 2455 additions and 1942 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#[cfg_attr(target_arch = "wasm32", path = "web.rs")]
|
||||
#[cfg_attr(not(target_arch = "wasm32"), path = "winit.rs")]
|
||||
#[cfg_attr(not(target_arch = "wasm32"), path = "native.rs")]
|
||||
mod platform;
|
||||
|
||||
pub use platform::*;
|
||||
|
|
@ -34,7 +34,7 @@ impl<A> iced_winit::Application for Instance<A>
|
|||
where
|
||||
A: Application,
|
||||
{
|
||||
type Renderer = Renderer;
|
||||
type Renderer = iced_wgpu::Renderer;
|
||||
type Message = A::Message;
|
||||
|
||||
fn new() -> (Self, Command<A::Message>) {
|
||||
|
|
|
|||
51
src/native.rs
Normal file
51
src/native.rs
Normal file
|
|
@ -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>;
|
||||
13
src/winit.rs
13
src/winit.rs
|
|
@ -1,13 +0,0 @@
|
|||
pub use iced_wgpu::{Primitive, Renderer};
|
||||
|
||||
pub use iced_winit::{
|
||||
button, scrollable, slider, text, text_input, winit, Align, Background,
|
||||
Checkbox, Color, Command, Font, Image, Length, Radio, Scrollable, Slider,
|
||||
Text, TextInput,
|
||||
};
|
||||
|
||||
pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>;
|
||||
pub type Container<'a, Message> = iced_winit::Container<'a, Message, Renderer>;
|
||||
pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>;
|
||||
pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>;
|
||||
pub type Button<'a, Message> = iced_winit::Button<'a, Message, Renderer>;
|
||||
Loading…
Add table
Add a link
Reference in a new issue