diff options
| author | 2022-05-04 17:19:28 +0200 | |
|---|---|---|
| committer | 2022-05-04 17:19:28 +0200 | |
| commit | 27fdc707562d4e229f07ed9496ed5d64f4e108bc (patch) | |
| tree | 8a87286f0ccd125df1c2b5c597c2d2805ceb27c5 /graphics | |
| parent | a97c520c814a6d3cc538537791be39e0c3182d6d (diff) | |
| parent | 02914e5e68d1fbaad53483cd32c74d9ac448d1eb (diff) | |
| download | iced-27fdc707562d4e229f07ed9496ed5d64f4e108bc.tar.gz iced-27fdc707562d4e229f07ed9496ed5d64f4e108bc.tar.bz2 iced-27fdc707562d4e229f07ed9496ed5d64f4e108bc.zip | |
Merge branch 'master' into dev/system-information
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Cargo.toml | 10 | ||||
| -rw-r--r-- | graphics/src/lib.rs | 4 | ||||
| -rw-r--r-- | graphics/src/widget/canvas.rs | 8 | ||||
| -rw-r--r-- | graphics/src/widget/pure/canvas/program.rs | 4 | ||||
| -rw-r--r-- | graphics/src/window/compositor.rs | 5 | 
5 files changed, 16 insertions, 15 deletions
| diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index a84acbd6..e916975d 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -1,11 +1,11 @@  [package]  name = "iced_graphics" -version = "0.2.0" +version = "0.3.0"  authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]  edition = "2021"  description = "A bunch of backend-agnostic types that can be leveraged to build a renderer for Iced"  license = "MIT" -repository = "https://github.com/hecrj/iced" +repository = "https://github.com/iced-rs/iced"  documentation = "https://docs.rs/iced_graphics"  keywords = ["gui", "ui", "graphics", "interface", "widgets"]  categories = ["gui"] @@ -29,15 +29,15 @@ version = "1.4"  features = ["derive"]  [dependencies.iced_native] -version = "0.4" +version = "0.5"  path = "../native"  [dependencies.iced_style] -version = "0.3" +version = "0.4"  path = "../style"  [dependencies.iced_pure] -version = "0.1" +version = "0.2"  path = "../pure"  optional = true diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index 4364695f..370f70d6 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -1,9 +1,9 @@  //! A bunch of backend-agnostic types that can be leveraged to build a renderer  //! for [`iced`].  //! -//!  +//!   //! -//! [`iced`]: https://github.com/hecrj/iced +//! [`iced`]: https://github.com/iced-rs/iced  #![doc(      html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"  )] diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs index 6c526e35..23444b2b 100644 --- a/graphics/src/widget/canvas.rs +++ b/graphics/src/widget/canvas.rs @@ -51,10 +51,10 @@ use std::marker::PhantomData;  /// - [`solar_system`], an animated solar system drawn using the [`Canvas`] widget  /// and showcasing how to compose different transforms.  /// -/// [examples]: https://github.com/hecrj/iced/tree/master/examples -/// [`clock`]: https://github.com/hecrj/iced/tree/master/examples/clock -/// [`game_of_life`]: https://github.com/hecrj/iced/tree/master/examples/game_of_life -/// [`solar_system`]: https://github.com/hecrj/iced/tree/master/examples/solar_system +/// [examples]: https://github.com/iced-rs/iced/tree/0.4/examples +/// [`clock`]: https://github.com/iced-rs/iced/tree/0.4/examples/clock +/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.4/examples/game_of_life +/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.4/examples/solar_system  ///  /// ## Drawing a simple circle  /// If you want to get a quick overview, here's how we can draw a simple circle: diff --git a/graphics/src/widget/pure/canvas/program.rs b/graphics/src/widget/pure/canvas/program.rs index ee74c27f..058b364b 100644 --- a/graphics/src/widget/pure/canvas/program.rs +++ b/graphics/src/widget/pure/canvas/program.rs @@ -10,10 +10,10 @@ use crate::Rectangle;  ///  /// [`Canvas`]: crate::widget::Canvas  pub trait Program<Message> { -    /// The internal [`State`] mutated by the [`Program`]. +    /// The internal state mutated by the [`Program`].      type State: Default + 'static; -    /// Updates the state of the [`Program`]. +    /// Updates the [`State`](Self::State) of the [`Program`].      ///      /// When a [`Program`] is used in a [`Canvas`], the runtime will call this      /// method for each [`Event`]. diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index 7525de1d..0c4cadcd 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -45,7 +45,8 @@ pub trait Compositor: Sized {      /// Presents the [`Renderer`] primitives to the next frame of the given [`Surface`].      /// -    /// [`SwapChain`]: Self::SwapChain +    /// [`Renderer`]: Self::Renderer +    /// [`Surface`]: Self::Surface      fn present<T: AsRef<str>>(          &mut self,          renderer: &mut Self::Renderer, @@ -56,7 +57,7 @@ pub trait Compositor: Sized {      ) -> Result<(), SurfaceError>;  } -/// Result of an unsuccessful call to [`Compositor::draw`]. +/// Result of an unsuccessful call to [`Compositor::present`].  #[derive(Clone, PartialEq, Eq, Debug, Error)]  pub enum SurfaceError {      /// A timeout was encountered while trying to acquire the next frame. | 
