Export widget modules in iced_pure

... and fix collisions with the new `helpers`
This commit is contained in:
Héctor Ramón Jiménez 2022-03-16 17:37:19 +07:00
parent cdd906f563
commit d7100fd259
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
31 changed files with 378 additions and 232 deletions

View file

@ -9,3 +9,4 @@ publish = false
iced = { path = "../../..", features = ["debug", "pure"] }
iced_native = { path = "../../../native" }
iced_lazy = { path = "../../../lazy", features = ["pure"] }
iced_pure = { path = "../../../pure" }

View file

@ -1,4 +1,4 @@
use iced::pure::widget::container;
use iced::pure::container;
use iced::pure::{Element, Sandbox};
use iced::{Length, Settings};
@ -47,12 +47,12 @@ impl Sandbox for Component {
}
mod numeric_input {
use iced::pure::widget::Element;
use iced::pure::widget::{row, text, text_input};
use iced::pure::{button, row, text, text_input};
use iced_lazy::pure::{self, Component};
use iced_native::alignment::{self, Alignment};
use iced_native::text;
use iced_native::Length;
use iced_pure::Element;
pub struct NumericInput<Message> {
value: Option<u32>,
@ -120,8 +120,6 @@ mod numeric_input {
fn view(&self, _state: &Self::State) -> Element<Event, Renderer> {
let button = |label, on_press| {
use iced::pure::widget::button;
button(
text(label)
.width(Length::Fill)

View file

@ -1,5 +1,4 @@
use iced::pure::widget::{button, column, text};
use iced::pure::{Element, Sandbox};
use iced::pure::{button, column, text, Element, Sandbox};
use iced::{Alignment, Settings};
pub fn main() -> iced::Result {

View file

@ -5,7 +5,7 @@ mod style;
use grid::Grid;
use iced::executor;
use iced::pure::widget::{
use iced::pure::{
button, checkbox, column, container, pick_list, row, slider, text,
};
use iced::pure::{Application, Element};
@ -207,8 +207,8 @@ fn view_controls<'a>(
mod grid {
use crate::Preset;
use iced::pure::canvas::event::{self, Event};
use iced::pure::canvas::{
use iced::pure::widget::canvas::event::{self, Event};
use iced::pure::widget::canvas::{
self, Cache, Canvas, Cursor, Frame, Geometry, Path, Text,
};
use iced::pure::Element;

View file

@ -1,7 +1,7 @@
use iced::alignment::{self, Alignment};
use iced::executor;
use iced::keyboard;
use iced::pure::pane_grid::{self, PaneGrid};
use iced::pure::widget::pane_grid::{self, PaneGrid};
use iced::pure::{button, column, container, row, scrollable, text};
use iced::pure::{Application, Element};
use iced::{Color, Command, Length, Settings, Size, Subscription};

View file

@ -1,6 +1,4 @@
use iced::pure::widget::{
column, container, pick_list, scrollable, vertical_space,
};
use iced::pure::{column, container, pick_list, scrollable, vertical_space};
use iced::pure::{Element, Sandbox};
use iced::{Alignment, Length, Settings};

View file

@ -1,8 +1,9 @@
use iced::alignment::{self, Alignment};
use iced::pure::widget::{
use iced::pure::widget::Text;
use iced::pure::{
button, checkbox, column, container, row, scrollable, text, text_input,
Application, Element,
};
use iced::pure::{Application, Element, Text};
use iced::window;
use iced::{Command, Font, Length, Settings};
use serde::{Deserialize, Serialize};

View file

@ -1,9 +1,10 @@
use iced::alignment;
use iced::pure::widget::{
use iced::pure::widget::{Button, Column, Container, Slider};
use iced::pure::{
checkbox, column, container, horizontal_space, image, radio, row,
scrollable, slider, text, text_input, toggler, vertical_space,
};
use iced::pure::{Button, Column, Container, Element, Sandbox, Slider};
use iced::pure::{Element, Sandbox};
use iced::{Color, Length, Settings};
pub fn main() -> iced::Result {