diff options
| author |  Giuliano Bellini <100347457+GyulyVGC@users.noreply.github.com> | 2023-02-22 21:23:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-22 21:23:04 +0100 |
| commit | 4f41927155e7d4bc38497b0e298a0b23ccea6ca1 (patch) | |
| tree | 70b7dbc1afdc62dfeaf42f0c62e8f4c01e407729 /wgpu | |
| 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-- | wgpu/Cargo.toml | 6 | ||||
| -rw-r--r-- | wgpu/README.md | 2 | ||||
| -rw-r--r-- | wgpu/src/backend.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/lib.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/settings.rs | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 352802b8..f1e22cf6 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iced_wgpu" -version = "0.8.0" +version = "0.9.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] edition = "2021" description = "A wgpu renderer for Iced" @@ -42,11 +42,11 @@ version = "1.9" features = ["derive"] [dependencies.iced_native] -version = "0.8" +version = "0.9" path = "../native" [dependencies.iced_graphics] -version = "0.6" +version = "0.7" path = "../graphics" features = ["font-fallback", "font-icons"] diff --git a/wgpu/README.md b/wgpu/README.md index 8ef68c62..3e6af103 100644 --- a/wgpu/README.md +++ b/wgpu/README.md @@ -30,7 +30,7 @@ Currently, `iced_wgpu` supports the following primitives: Add `iced_wgpu` as a dependency in your `Cargo.toml`: ```toml -iced_wgpu = "0.8" +iced_wgpu = "0.9" ``` __Iced moves fast and the `master` branch can contain breaking changes!__ If diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs index 9ab12ce0..6a299425 100644 --- a/wgpu/src/backend.rs +++ b/wgpu/src/backend.rs @@ -29,7 +29,7 @@ pub struct Backend { #[cfg(any(feature = "image", feature = "svg"))] image_pipeline: image::Pipeline, - default_text_size: u16, + default_text_size: f32, } impl Backend { @@ -265,7 +265,7 @@ impl backend::Text for Backend { const CHECKMARK_ICON: char = font::CHECKMARK_ICON; const ARROW_DOWN_ICON: char = font::ARROW_DOWN_ICON; - fn default_size(&self) -> u16 { + fn default_size(&self) -> f32 { self.default_text_size } diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index 5198276d..1a293681 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -16,7 +16,7 @@ //! - Meshes of triangles, useful to draw geometry freely. //! //! [Iced]: https://github.com/iced-rs/iced -//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.7/native +//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs //! [WebGPU API]: https://gpuweb.github.io/gpuweb/ //! [`wgpu_glyph`]: https://github.com/hecrj/wgpu_glyph diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs index 21c2427d..fd3b990a 100644 --- a/wgpu/src/settings.rs +++ b/wgpu/src/settings.rs @@ -4,7 +4,7 @@ pub use crate::Antialiasing; /// The settings of a [`Backend`]. /// /// [`Backend`]: crate::Backend -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq)] pub struct Settings { /// The present mode of the [`Backend`]. /// @@ -21,8 +21,8 @@ pub struct Settings { /// The default size of text. /// - /// By default, it will be set to 20. - pub default_text_size: u16, + /// By default, it will be set to `16.0`. + pub default_text_size: f32, /// If enabled, spread text workload in multiple threads when multiple cores /// are available. @@ -66,7 +66,7 @@ impl Default for Settings { present_mode: wgpu::PresentMode::AutoVsync, internal_backend: wgpu::Backends::all(), default_font: None, - default_text_size: 20, + default_text_size: 20.0, text_multithreading: false, antialiasing: None, } |