summaryrefslogtreecommitdiffstats
path: root/src/pure
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-07-27 06:49:20 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-07-27 06:49:20 +0200
commitff2519b1d43d481987351a83b6dd7237524c21f0 (patch)
tree5731eeb7eb1247d4a8951de0d5bc5d8102640559 /src/pure
parentc44267b85f7aaa2997e3caf1323b837d95818c22 (diff)
downloadiced-ff2519b1d43d481987351a83b6dd7237524c21f0.tar.gz
iced-ff2519b1d43d481987351a83b6dd7237524c21f0.tar.bz2
iced-ff2519b1d43d481987351a83b6dd7237524c21f0.zip
Replace stateful widgets with new `iced_pure` API
Diffstat (limited to 'src/pure')
-rw-r--r--src/pure/application.rs195
-rw-r--r--src/pure/sandbox.rs123
-rw-r--r--src/pure/widget.rs174
3 files changed, 0 insertions, 492 deletions
diff --git a/src/pure/application.rs b/src/pure/application.rs
deleted file mode 100644
index 396854ad..00000000
--- a/src/pure/application.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-//! Build interactive cross-platform applications.
-use crate::pure::{self, Pure};
-use crate::window;
-use crate::{Command, Executor, Settings, Subscription};
-
-pub use iced_native::application::StyleSheet;
-
-/// A pure version of [`Application`].
-///
-/// Unlike the impure version, the `view` method of this trait takes an
-/// immutable reference to `self` and returns a pure [`Element`].
-///
-/// [`Application`]: crate::Application
-/// [`Element`]: pure::Element
-pub trait Application: Sized {
- /// The [`Executor`] that will run commands and subscriptions.
- ///
- /// The [default executor] can be a good starting point!
- ///
- /// [`Executor`]: Self::Executor
- /// [default executor]: crate::executor::Default
- type Executor: Executor;
-
- /// The type of __messages__ your [`Application`] will produce.
- type Message: std::fmt::Debug + Send;
-
- /// The theme of your [`Application`].
- type Theme: Default + StyleSheet;
-
- /// The data needed to initialize your [`Application`].
- type Flags;
-
- /// Initializes the [`Application`] with the flags provided to
- /// [`run`] as part of the [`Settings`].
- ///
- /// Here is where you should return the initial state of your app.
- ///
- /// Additionally, you can return a [`Command`] if you need to perform some
- /// async action in the background on startup. This is useful if you want to
- /// load state from a file, perform an initial HTTP request, etc.
- ///
- /// [`run`]: Self::run
- fn new(flags: Self::Flags) -> (Self, Command<Self::Message>);
-
- /// Returns the current title of the [`Application`].
- ///
- /// This title can be dynamic! The runtime will automatically update the
- /// title of your application when necessary.
- fn title(&self) -> String;
-
- /// Handles a __message__ and updates the state of the [`Application`].
- ///
- /// This is where you define your __update logic__. All the __messages__,
- /// produced by either user interactions or commands, will be handled by
- /// this method.
- ///
- /// Any [`Command`] returned will be executed immediately in the background.
- fn update(&mut self, message: Self::Message) -> Command<Self::Message>;
-
- /// Returns the widgets to display in the [`Application`].
- ///
- /// These widgets can produce __messages__ based on user interaction.
- fn view(
- &self,
- ) -> pure::Element<'_, Self::Message, crate::Renderer<Self::Theme>>;
-
- /// Returns the current [`Theme`] of the [`Application`].
- fn theme(&self) -> Self::Theme {
- Self::Theme::default()
- }
-
- /// Returns the event [`Subscription`] for the current state of the
- /// application.
- ///
- /// A [`Subscription`] will be kept alive as long as you keep returning it,
- /// and the __messages__ produced will be handled by
- /// [`update`](#tymethod.update).
- ///
- /// By default, this method returns an empty [`Subscription`].
- fn subscription(&self) -> Subscription<Self::Message> {
- Subscription::none()
- }
-
- /// Returns the current [`Application`] mode.
- ///
- /// The runtime will automatically transition your application if a new mode
- /// is returned.
- ///
- /// Currently, the mode only has an effect in native platforms.
- ///
- /// By default, an application will run in windowed mode.
- fn mode(&self) -> window::Mode {
- window::Mode::Windowed
- }
-
- /// Returns the scale factor of the [`Application`].
- ///
- /// It can be used to dynamically control the size of the UI at runtime
- /// (i.e. zooming).
- ///
- /// For instance, a scale factor of `2.0` will make widgets twice as big,
- /// while a scale factor of `0.5` will shrink them to half their size.
- ///
- /// By default, it returns `1.0`.
- fn scale_factor(&self) -> f64 {
- 1.0
- }
-
- /// Returns whether the [`Application`] should be terminated.
- ///
- /// By default, it returns `false`.
- fn should_exit(&self) -> bool {
- false
- }
-
- /// Runs the [`Application`].
- ///
- /// On native platforms, this method will take control of the current thread
- /// until the [`Application`] exits.
- ///
- /// On the web platform, this method __will NOT return__ unless there is an
- /// [`Error`] during startup.
- ///
- /// [`Error`]: crate::Error
- fn run(settings: Settings<Self::Flags>) -> crate::Result
- where
- Self: 'static,
- {
- <Instance<Self> as crate::Application>::run(settings)
- }
-}
-
-struct Instance<A: Application> {
- application: A,
- state: pure::State,
-}
-
-impl<A> crate::Application for Instance<A>
-where
- A: Application,
- A::Message: 'static,
-{
- type Executor = A::Executor;
- type Message = A::Message;
- type Flags = A::Flags;
- type Theme = A::Theme;
-
- fn new(flags: Self::Flags) -> (Self, Command<Self::Message>) {
- let (application, command) = A::new(flags);
-
- (
- Instance {
- application,
- state: pure::State::new(),
- },
- command,
- )
- }
-
- fn title(&self) -> String {
- A::title(&self.application)
- }
-
- fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
- A::update(&mut self.application, message)
- }
-
- fn subscription(&self) -> Subscription<Self::Message> {
- A::subscription(&self.application)
- }
-
- fn view(
- &mut self,
- ) -> crate::Element<'_, Self::Message, crate::Renderer<Self::Theme>> {
- let content = A::view(&self.application);
-
- Pure::new(&mut self.state, content).into()
- }
-
- fn theme(&self) -> Self::Theme {
- A::theme(&self.application)
- }
-
- fn mode(&self) -> window::Mode {
- A::mode(&self.application)
- }
-
- fn scale_factor(&self) -> f64 {
- A::scale_factor(&self.application)
- }
-
- fn should_exit(&self) -> bool {
- A::should_exit(&self.application)
- }
-}
diff --git a/src/pure/sandbox.rs b/src/pure/sandbox.rs
deleted file mode 100644
index a58cace7..00000000
--- a/src/pure/sandbox.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use crate::pure;
-use crate::{Command, Error, Settings, Subscription, Theme};
-
-/// A pure version of [`Sandbox`].
-///
-/// Unlike the impure version, the `view` method of this trait takes an
-/// immutable reference to `self` and returns a pure [`Element`].
-///
-/// [`Sandbox`]: crate::Sandbox
-/// [`Element`]: pure::Element
-pub trait Sandbox {
- /// The type of __messages__ your [`Sandbox`] will produce.
- type Message: std::fmt::Debug + Send;
-
- /// Initializes the [`Sandbox`].
- ///
- /// Here is where you should return the initial state of your app.
- fn new() -> Self;
-
- /// Returns the current title of the [`Sandbox`].
- ///
- /// This title can be dynamic! The runtime will automatically update the
- /// title of your application when necessary.
- fn title(&self) -> String;
-
- /// Handles a __message__ and updates the state of the [`Sandbox`].
- ///
- /// This is where you define your __update logic__. All the __messages__,
- /// produced by user interactions, will be handled by this method.
- fn update(&mut self, message: Self::Message);
-
- /// Returns the widgets to display in the [`Sandbox`].
- ///
- /// These widgets can produce __messages__ based on user interaction.
- fn view(&self) -> pure::Element<'_, Self::Message>;
-
- /// Returns the current [`Theme`] of the [`Sandbox`].
- ///
- /// If you want to use your own custom theme type, you will have to use an
- /// [`Application`].
- ///
- /// By default, it returns [`Theme::default`].
- fn theme(&self) -> Theme {
- Theme::default()
- }
-
- /// Returns the scale factor of the [`Sandbox`].
- ///
- /// It can be used to dynamically control the size of the UI at runtime
- /// (i.e. zooming).
- ///
- /// For instance, a scale factor of `2.0` will make widgets twice as big,
- /// while a scale factor of `0.5` will shrink them to half their size.
- ///
- /// By default, it returns `1.0`.
- fn scale_factor(&self) -> f64 {
- 1.0
- }
-
- /// Returns whether the [`Sandbox`] should be terminated.
- ///
- /// By default, it returns `false`.
- fn should_exit(&self) -> bool {
- false
- }
-
- /// Runs the [`Sandbox`].
- ///
- /// On native platforms, this method will take control of the current thread
- /// and __will NOT return__.
- ///
- /// It should probably be that last thing you call in your `main` function.
- fn run(settings: Settings<()>) -> Result<(), Error>
- where
- Self: 'static + Sized,
- {
- <Self as pure::Application>::run(settings)
- }
-}
-
-impl<T> pure::Application for T
-where
- T: Sandbox,
-{
- type Executor = iced_futures::backend::null::Executor;
- type Flags = ();
- type Message = T::Message;
- type Theme = Theme;
-
- fn new(_flags: ()) -> (Self, Command<T::Message>) {
- (T::new(), Command::none())
- }
-
- fn title(&self) -> String {
- T::title(self)
- }
-
- fn update(&mut self, message: T::Message) -> Command<T::Message> {
- T::update(self, message);
-
- Command::none()
- }
-
- fn view(&self) -> pure::Element<'_, T::Message> {
- T::view(self)
- }
-
- fn theme(&self) -> Self::Theme {
- T::theme(self)
- }
-
- fn subscription(&self) -> Subscription<T::Message> {
- Subscription::none()
- }
-
- fn scale_factor(&self) -> f64 {
- T::scale_factor(self)
- }
-
- fn should_exit(&self) -> bool {
- T::should_exit(self)
- }
-}
diff --git a/src/pure/widget.rs b/src/pure/widget.rs
deleted file mode 100644
index 336f498f..00000000
--- a/src/pure/widget.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-//! Pure versions of the widgets.
-
-/// A container that distributes its contents vertically.
-pub type Column<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Column<'a, Message, Renderer>;
-
-/// A container that distributes its contents horizontally.
-pub type Row<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Row<'a, Message, Renderer>;
-
-/// A paragraph of text.
-pub type Text<Renderer = crate::Renderer> = iced_pure::widget::Text<Renderer>;
-
-pub mod button {
- //! Allow your users to perform actions by pressing a button.
- pub use iced_pure::widget::button::{Appearance, StyleSheet};
-
- /// A widget that produces a message when clicked.
- pub type Button<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Button<'a, Message, Renderer>;
-}
-
-pub mod checkbox {
- //! Show toggle controls using checkboxes.
- pub use iced_pure::widget::checkbox::{Appearance, StyleSheet};
-
- /// A box that can be checked.
- pub type Checkbox<'a, Message, Renderer = crate::Renderer> =
- iced_native::widget::Checkbox<'a, Message, Renderer>;
-}
-
-pub mod container {
- //! Decorate content and apply alignment.
- pub use iced_pure::widget::container::{Appearance, StyleSheet};
-
- /// An element decorating some content.
- pub type Container<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Container<'a, Message, Renderer>;
-}
-
-pub mod pane_grid {
- //! Let your users split regions of your application and organize layout dynamically.
- //!
- //! [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
- //!
- //! # Example
- //! The [`pane_grid` example] showcases how to use a [`PaneGrid`] with resizing,
- //! drag and drop, and hotkey support.
- //!
- //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.4/examples/pane_grid
- pub use iced_pure::widget::pane_grid::{
- Axis, Configuration, Direction, DragEvent, Line, Node, Pane,
- ResizeEvent, Split, State, StyleSheet,
- };
-
- /// A collection of panes distributed using either vertical or horizontal splits
- /// to completely fill the space available.
- ///
- /// [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
- pub type PaneGrid<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::PaneGrid<'a, Message, Renderer>;
-
- /// The content of a [`Pane`].
- pub type Content<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::pane_grid::Content<'a, Message, Renderer>;
-
- /// The title bar of a [`Pane`].
- pub type TitleBar<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::pane_grid::TitleBar<'a, Message, Renderer>;
-}
-
-pub mod pick_list {
- //! Display a dropdown list of selectable values.
- pub use iced_pure::widget::pick_list::{Appearance, StyleSheet};
-
- /// A widget allowing the selection of a single value from a list of options.
- pub type PickList<'a, T, Message, Renderer = crate::Renderer> =
- iced_pure::widget::PickList<'a, T, Message, Renderer>;
-}
-
-pub mod radio {
- //! Create choices using radio buttons.
- pub use iced_pure::widget::radio::{Appearance, StyleSheet};
-
- /// A circular button representing a choice.
- pub type Radio<Message, Renderer = crate::Renderer> =
- iced_pure::widget::Radio<Message, Renderer>;
-}
-
-pub mod scrollable {
- //! Navigate an endless amount of content with a scrollbar.
- pub use iced_pure::widget::scrollable::{Scrollbar, Scroller, StyleSheet};
-
- /// A widget that can vertically display an infinite amount of content
- /// with a scrollbar.
- pub type Scrollable<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Scrollable<'a, Message, Renderer>;
-}
-
-pub mod toggler {
- //! Show toggle controls using togglers.
- pub use iced_pure::widget::toggler::{Appearance, StyleSheet};
-
- /// A toggler widget.
- pub type Toggler<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Toggler<'a, Message, Renderer>;
-}
-
-pub mod text_input {
- //! Display fields that can be filled with text.
- pub use iced_pure::widget::text_input::{Appearance, StyleSheet};
-
- /// A field that can be filled with text.
- pub type TextInput<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::TextInput<'a, Message, Renderer>;
-}
-
-pub mod tooltip {
- //! Display a widget over another.
- pub use iced_pure::widget::tooltip::Position;
-
- /// A widget allowing the selection of a single value from a list of options.
- pub type Tooltip<'a, Message, Renderer = crate::Renderer> =
- iced_pure::widget::Tooltip<'a, Message, Renderer>;
-}
-
-pub use iced_pure::widget::progress_bar;
-pub use iced_pure::widget::rule;
-pub use iced_pure::widget::slider;
-pub use iced_pure::widget::Space;
-
-pub use button::Button;
-pub use checkbox::Checkbox;
-pub use container::Container;
-pub use pane_grid::PaneGrid;
-pub use pick_list::PickList;
-pub use progress_bar::ProgressBar;
-pub use radio::Radio;
-pub use rule::Rule;
-pub use scrollable::Scrollable;
-pub use slider::Slider;
-pub use text_input::TextInput;
-pub use toggler::Toggler;
-pub use tooltip::Tooltip;
-
-#[cfg(feature = "canvas")]
-pub use iced_graphics::widget::pure::canvas;
-
-#[cfg(feature = "qr_code")]
-pub use iced_graphics::widget::pure::qr_code;
-
-#[cfg(feature = "image")]
-pub mod image {
- //! Display images in your user interface.
- pub use iced_native::image::Handle;
-
- /// A frame that displays an image.
- pub type Image = iced_pure::widget::Image<Handle>;
-}
-
-#[cfg(feature = "svg")]
-pub use iced_pure::widget::svg;
-
-#[cfg(feature = "canvas")]
-pub use canvas::Canvas;
-
-#[cfg(feature = "qr_code")]
-pub use qr_code::QRCode;
-
-#[cfg(feature = "image")]
-pub use image::Image;
-
-#[cfg(feature = "svg")]
-pub use svg::Svg;