diff options
author | 2022-12-02 18:53:21 +0100 | |
---|---|---|
committer | 2022-12-02 18:53:21 +0100 | |
commit | 4029a1cdaaac1abbdcc141b20469a49670cd99b6 (patch) | |
tree | 71fa9d9c4aa1f02ce05771db43a4bb7bc6570e77 /src | |
parent | 676d8efe03ebdbeeb95aef96b8097395b788b1ab (diff) | |
parent | 8b55e9b9e6ba0b83038dd491dd34d95b4f9a381b (diff) | |
download | iced-4029a1cdaaac1abbdcc141b20469a49670cd99b6.tar.gz iced-4029a1cdaaac1abbdcc141b20469a49670cd99b6.tar.bz2 iced-4029a1cdaaac1abbdcc141b20469a49670cd99b6.zip |
Merge branch 'master' into non-uniform-border-radius-for-quads
Diffstat (limited to '')
-rw-r--r-- | src/application.rs | 21 | ||||
-rw-r--r-- | src/lib.rs | 6 | ||||
-rw-r--r-- | src/overlay.rs | 2 | ||||
-rw-r--r-- | src/sandbox.rs | 22 | ||||
-rw-r--r-- | src/widget.rs | 5 | ||||
-rw-r--r-- | src/window.rs | 2 |
6 files changed, 30 insertions, 28 deletions
diff --git a/src/application.rs b/src/application.rs index 23ce034e..0f514f66 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.4/examples -/// [`clock`]: https://github.com/iced-rs/iced/tree/0.4/examples/clock -/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.4/examples/download_progress -/// [`events`]: https://github.com/iced-rs/iced/tree/0.4/examples/events -/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.4/examples/game_of_life -/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.4/examples/pokedex -/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.4/examples/solar_system -/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.4/examples/stopwatch -/// [`todos`]: https://github.com/iced-rs/iced/tree/0.4/examples/todos +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.5/examples +/// [`clock`]: https://github.com/iced-rs/iced/tree/0.5/examples/clock +/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.5/examples/download_progress +/// [`events`]: https://github.com/iced-rs/iced/tree/0.5/examples/events +/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.5/examples/game_of_life +/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.5/examples/pokedex +/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.5/examples/solar_system +/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.5/examples/stopwatch +/// [`todos`]: https://github.com/iced-rs/iced/tree/0.5/examples/todos /// [`Sandbox`]: crate::Sandbox /// [`Canvas`]: crate::widget::Canvas /// [PokéAPI]: https://pokeapi.co/ @@ -148,9 +148,8 @@ pub trait Application: Sized { Self::Theme::default() } - /// Returns the current [`Style`] of the [`Theme`]. + /// Returns the current `Style` of the [`Theme`]. /// - /// [`Style`]: <Self::Theme as StyleSheet>::Style /// [`Theme`]: Self::Theme fn style(&self) -> <Self::Theme as StyleSheet>::Style { <Self::Theme as StyleSheet>::Style::default() @@ -26,11 +26,11 @@ //! [Modular ecosystem]: https://github.com/iced-rs/iced/blob/master/ECOSYSTEM.md //! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/0.4/master/native //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs -//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.4/wgpu -//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.4/winit +//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.5/wgpu +//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.5/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.4/examples +//! [examples]: https://github.com/iced-rs/iced/tree/0.5/examples //! [repository]: https://github.com/iced-rs/iced //! //! # Overview diff --git a/src/overlay.rs b/src/overlay.rs index a7003751..c0f4c492 100644 --- a/src/overlay.rs +++ b/src/overlay.rs @@ -3,6 +3,8 @@ /// A generic [`Overlay`]. /// /// This is an alias of an `iced_native` element with a default `Renderer`. +/// +/// [`Overlay`]: iced_native::Overlay pub type Element<'a, Message, Renderer = crate::Renderer> = iced_native::overlay::Element<'a, Message, Renderer>; diff --git a/src/sandbox.rs b/src/sandbox.rs index bdb6ad5a..dc69b6bb 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.4/examples -/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.4/examples/bezier_tool -/// [`counter`]: https://github.com/iced-rs/iced/tree/0.4/examples/counter -/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.4/examples/custom_widget -/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.4/examples/geometry -/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.4/examples/pane_grid -/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.4/examples/progress_bar -/// [`styling`]: https://github.com/iced-rs/iced/tree/0.4/examples/styling -/// [`svg`]: https://github.com/iced-rs/iced/tree/0.4/examples/svg -/// [`tour`]: https://github.com/iced-rs/iced/tree/0.4/examples/tour +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.5/examples +/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.5/examples/bezier_tool +/// [`counter`]: https://github.com/iced-rs/iced/tree/0.5/examples/counter +/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.5/examples/custom_widget +/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.5/examples/geometry +/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.5/examples/pane_grid +/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.5/examples/progress_bar +/// [`styling`]: https://github.com/iced-rs/iced/tree/0.5/examples/styling +/// [`svg`]: https://github.com/iced-rs/iced/tree/0.5/examples/svg +/// [`tour`]: https://github.com/iced-rs/iced/tree/0.5/examples/tour /// [`Canvas widget`]: crate::widget::Canvas /// [the overview]: index.html#overview -/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.4/wgpu +/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.5/wgpu /// [`Svg` widget]: crate::widget::Svg /// [Ghostscript Tiger]: https://commons.wikimedia.org/wiki/File:Ghostscript_Tiger.svg /// diff --git a/src/widget.rs b/src/widget.rs index 9f09cb8f..7c67a599 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.4/examples/pane_grid + //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.5/examples/pane_grid pub use iced_native::widget::pane_grid::{ Axis, Configuration, Direction, DragEvent, Line, Node, Pane, ResizeEvent, Split, State, StyleSheet, @@ -120,7 +120,8 @@ pub mod toggler { pub mod text_input { //! Display fields that can be filled with text. pub use iced_native::widget::text_input::{ - focus, Appearance, Id, StyleSheet, + focus, move_cursor_to, move_cursor_to_end, move_cursor_to_front, + select_all, Appearance, Id, StyleSheet, }; /// A field that can be filled with text. diff --git a/src/window.rs b/src/window.rs index eb5e17a6..2018053f 100644 --- a/src/window.rs +++ b/src/window.rs @@ -9,4 +9,4 @@ pub use position::Position; pub use settings::Settings; #[cfg(not(target_arch = "wasm32"))] -pub use crate::runtime::window::{move_to, resize}; +pub use crate::runtime::window::*; |