diff options
author | 2023-02-22 21:23:04 +0100 | |
---|---|---|
committer | 2023-02-22 21:23:04 +0100 | |
commit | 4f41927155e7d4bc38497b0e298a0b23ccea6ca1 (patch) | |
tree | 70b7dbc1afdc62dfeaf42f0c62e8f4c01e407729 /src | |
parent | a35d6d2e4d59f71309f31c87ea5150959d639185 (diff) | |
parent | 666f3cd143047e49a010f0c97eabc7136f92aa35 (diff) | |
download | iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.gz iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.tar.bz2 iced-4f41927155e7d4bc38497b0e298a0b23ccea6ca1.zip |
Merge branch 'iced-rs:master' into master
Diffstat (limited to '')
-rw-r--r-- | src/application.rs | 18 | ||||
-rw-r--r-- | src/lib.rs | 8 | ||||
-rw-r--r-- | src/sandbox.rs | 22 | ||||
-rw-r--r-- | src/settings.rs | 6 | ||||
-rw-r--r-- | src/widget.rs | 8 |
5 files changed, 32 insertions, 30 deletions
diff --git a/src/application.rs b/src/application.rs index 96f4e9a6..1db5c93f 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.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 +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.8/examples +/// [`clock`]: https://github.com/iced-rs/iced/tree/0.8/examples/clock +/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.8/examples/download_progress +/// [`events`]: https://github.com/iced-rs/iced/tree/0.8/examples/events +/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.8/examples/game_of_life +/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.8/examples/pokedex +/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.8/examples/solar_system +/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.8/examples/stopwatch +/// [`todos`]: https://github.com/iced-rs/iced/tree/0.8/examples/todos /// [`Sandbox`]: crate::Sandbox /// [`Canvas`]: crate::widget::Canvas /// [PokéAPI]: https://pokeapi.co/ @@ -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.7/native +//! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/tree/0.8/native //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs -//! [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 +//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.8/wgpu +//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.8/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.7/examples +//! [examples]: https://github.com/iced-rs/iced/tree/0.8/examples //! [repository]: https://github.com/iced-rs/iced //! //! # Overview diff --git a/src/sandbox.rs b/src/sandbox.rs index 31e861ed..e8ed0f81 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.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 +/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.8/examples +/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.8/examples/bezier_tool +/// [`counter`]: https://github.com/iced-rs/iced/tree/0.8/examples/counter +/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.8/examples/custom_widget +/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.8/examples/geometry +/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.8/examples/pane_grid +/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.8/examples/progress_bar +/// [`styling`]: https://github.com/iced-rs/iced/tree/0.8/examples/styling +/// [`svg`]: https://github.com/iced-rs/iced/tree/0.8/examples/svg +/// [`tour`]: https://github.com/iced-rs/iced/tree/0.8/examples/tour /// [`Canvas widget`]: crate::widget::Canvas /// [the overview]: index.html#overview -/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.7/wgpu +/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/wgpu /// [`Svg` widget]: crate::widget::Svg /// [Ghostscript Tiger]: https://commons.wikimedia.org/wiki/File:Ghostscript_Tiger.svg /// diff --git a/src/settings.rs b/src/settings.rs index d31448fb..0eb3e62d 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -28,8 +28,8 @@ pub struct Settings<Flags> { /// The text size that will be used by default. /// - /// The default value is 20. - pub default_text_size: u16, + /// The default value is `20.0`. + pub default_text_size: f32, /// If enabled, spread text workload in multiple threads when multiple cores /// are available. @@ -97,7 +97,7 @@ where window: Default::default(), flags: Default::default(), default_font: Default::default(), - default_text_size: 20, + default_text_size: 20.0, text_multithreading: false, antialiasing: false, exit_on_close_request: true, diff --git a/src/widget.rs b/src/widget.rs index f0058f57..e2b0537e 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -31,7 +31,7 @@ pub mod button { pub mod checkbox { //! Show toggle controls using checkboxes. - pub use iced_native::widget::checkbox::{Appearance, StyleSheet}; + pub use iced_native::widget::checkbox::{Appearance, Icon, StyleSheet}; /// A box that can be checked. pub type Checkbox<'a, Message, Renderer = crate::Renderer> = @@ -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.7/examples/pane_grid + //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.8/examples/pane_grid pub use iced_native::widget::pane_grid::{ Axis, Configuration, Direction, DragEvent, Line, Node, Pane, ResizeEvent, Split, State, StyleSheet, @@ -80,7 +80,9 @@ pub mod pane_grid { pub mod pick_list { //! Display a dropdown list of selectable values. - pub use iced_native::widget::pick_list::{Appearance, Handle, StyleSheet}; + pub use iced_native::widget::pick_list::{ + Appearance, Handle, Icon, StyleSheet, + }; /// A widget allowing the selection of a single value from a list of options. pub type PickList<'a, T, Message, Renderer = crate::Renderer> = |