diff options
author | 2023-01-18 15:01:17 -0800 | |
---|---|---|
committer | 2023-01-18 15:01:17 -0800 | |
commit | 70d487ba20a50c06c73f0ffcd8198f1a7eac7f37 (patch) | |
tree | afb8e161b18236d4440cba8bb0e0ce896858d653 /src | |
parent | 790fa3e7a01a790aa3f07083fe9abf6b68fa7ba1 (diff) | |
parent | 5ef0648bf447aaca8b96782643401e54a2bf7759 (diff) | |
download | iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.tar.gz iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.tar.bz2 iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.zip |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# examples/events/src/main.rs
# glutin/src/application.rs
# native/src/window.rs
# winit/src/window.rs
Diffstat (limited to 'src')
-rw-r--r-- | src/application.rs | 25 | ||||
-rw-r--r-- | src/lib.rs | 9 | ||||
-rw-r--r-- | src/sandbox.rs | 33 | ||||
-rw-r--r-- | src/widget.rs | 2 |
4 files changed, 26 insertions, 43 deletions
diff --git a/src/application.rs b/src/application.rs index f2b7c955..96f4e9a6 100644 --- a/src/application.rs +++ b/src/application.rs @@ -39,15 +39,15 @@ pub use iced_native::application::{Appearance, StyleSheet}; /// to listen to time. /// - [`todos`], a todos tracker inspired by [TodoMVC]. /// -/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.6/examples -/// [`clock`]: https://github.com/iced-rs/iced/tree/0.6/examples/clock -/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.6/examples/download_progress -/// [`events`]: https://github.com/iced-rs/iced/tree/0.6/examples/events -/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.6/examples/game_of_life -/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.6/examples/pokedex -/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.6/examples/solar_system -/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.6/examples/stopwatch -/// [`todos`]: https://github.com/iced-rs/iced/tree/0.6/examples/todos +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.7/examples +/// [`clock`]: https://github.com/iced-rs/iced/tree/0.7/examples/clock +/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.7/examples/download_progress +/// [`events`]: https://github.com/iced-rs/iced/tree/0.7/examples/events +/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.7/examples/game_of_life +/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.7/examples/pokedex +/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.7/examples/solar_system +/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.7/examples/stopwatch +/// [`todos`]: https://github.com/iced-rs/iced/tree/0.7/examples/todos /// [`Sandbox`]: crate::Sandbox /// [`Canvas`]: crate::widget::Canvas /// [PokéAPI]: https://pokeapi.co/ @@ -180,13 +180,6 @@ pub trait Application: Sized { 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 @@ -24,13 +24,13 @@ //! [scrollables]: https://gfycat.com/perkybaggybaboon-rust-gui //! [Debug overlay with performance metrics]: https://gfycat.com/incredibledarlingbee //! [Modular ecosystem]: https://github.com/iced-rs/iced/blob/master/ECOSYSTEM.md -//! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/tree/0.6/native +//! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/tree/0.7/native //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs -//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.6/wgpu -//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.6/winit +//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.7/wgpu +//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.7/winit //! [`dodrio`]: https://github.com/fitzgen/dodrio //! [web runtime]: https://github.com/iced-rs/iced_web -//! [examples]: https://github.com/iced-rs/iced/tree/0.6/examples +//! [examples]: https://github.com/iced-rs/iced/tree/0.7/examples //! [repository]: https://github.com/iced-rs/iced //! //! # Overview @@ -97,6 +97,7 @@ //! text(self.value).size(50), //! //! // The decrement button. We tell it to produce a +//! // `DecrementPressed` message when pressed //! button("-").on_press(Message::DecrementPressed), //! ] //! } diff --git a/src/sandbox.rs b/src/sandbox.rs index 47bad831..31e861ed 100644 --- a/src/sandbox.rs +++ b/src/sandbox.rs @@ -34,19 +34,19 @@ use crate::{Application, Command, Element, Error, Settings, Subscription}; /// - [`tour`], a simple UI tour that can run both on native platforms and the /// web! /// -/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.6/examples -/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.6/examples/bezier_tool -/// [`counter`]: https://github.com/iced-rs/iced/tree/0.6/examples/counter -/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.6/examples/custom_widget -/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.6/examples/geometry -/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.6/examples/pane_grid -/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.6/examples/progress_bar -/// [`styling`]: https://github.com/iced-rs/iced/tree/0.6/examples/styling -/// [`svg`]: https://github.com/iced-rs/iced/tree/0.6/examples/svg -/// [`tour`]: https://github.com/iced-rs/iced/tree/0.6/examples/tour +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.7/examples +/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.7/examples/bezier_tool +/// [`counter`]: https://github.com/iced-rs/iced/tree/0.7/examples/counter +/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.7/examples/custom_widget +/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.7/examples/geometry +/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.7/examples/pane_grid +/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.7/examples/progress_bar +/// [`styling`]: https://github.com/iced-rs/iced/tree/0.7/examples/styling +/// [`svg`]: https://github.com/iced-rs/iced/tree/0.7/examples/svg +/// [`tour`]: https://github.com/iced-rs/iced/tree/0.7/examples/tour /// [`Canvas widget`]: crate::widget::Canvas /// [the overview]: index.html#overview -/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.6/wgpu +/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.7/wgpu /// [`Svg` widget]: crate::widget::Svg /// [Ghostscript Tiger]: https://commons.wikimedia.org/wiki/File:Ghostscript_Tiger.svg /// @@ -140,13 +140,6 @@ pub trait Sandbox { 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 @@ -203,8 +196,4 @@ where fn scale_factor(&self) -> f64 { T::scale_factor(self) } - - fn should_exit(&self) -> bool { - T::should_exit(self) - } } diff --git a/src/widget.rs b/src/widget.rs index f71bf7ff..f0058f57 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -56,7 +56,7 @@ pub mod pane_grid { //! 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.6/examples/pane_grid + //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.7/examples/pane_grid pub use iced_native::widget::pane_grid::{ Axis, Configuration, Direction, DragEvent, Line, Node, Pane, ResizeEvent, Split, State, StyleSheet, |