diff options
author | 2022-11-03 04:35:16 +0100 | |
---|---|---|
committer | 2022-11-03 04:35:16 +0100 | |
commit | b95745340441835bd25b5cadc2342254631f8c05 (patch) | |
tree | 38f103e59a9decdc83ac5c7514fe89006bf0c7dd /graphics | |
parent | 20a0577034b40a6bbabee9bbbfc085f3fd5016c0 (diff) | |
download | iced-b95745340441835bd25b5cadc2342254631f8c05.tar.gz iced-b95745340441835bd25b5cadc2342254631f8c05.tar.bz2 iced-b95745340441835bd25b5cadc2342254631f8c05.zip |
Run `cargo fmt`
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/src/gradient/linear.rs | 6 | ||||
-rw-r--r-- | graphics/src/layer.rs | 24 | ||||
-rw-r--r-- | graphics/src/layer/image.rs | 2 | ||||
-rw-r--r-- | graphics/src/lib.rs | 2 | ||||
-rw-r--r-- | graphics/src/primitive.rs | 2 | ||||
-rw-r--r-- | graphics/src/widget/canvas.rs | 8 |
6 files changed, 21 insertions, 23 deletions
diff --git a/graphics/src/gradient/linear.rs b/graphics/src/gradient/linear.rs index 31dcbe00..aaa9e234 100644 --- a/graphics/src/gradient/linear.rs +++ b/graphics/src/gradient/linear.rs @@ -103,7 +103,7 @@ pub struct Builder { start: Point, end: Point, stops: Vec<ColorStop>, - error: Option<BuilderError> + error: Option<BuilderError>, } impl Builder { @@ -126,7 +126,7 @@ impl Builder { start, end, stops: vec![], - error: None + error: None, } } @@ -148,7 +148,7 @@ impl Builder { }) { Ok(_) => { self.error = Some(BuilderError::DuplicateOffset(offset)) - }, + } Err(index) => { self.stops.insert(index, ColorStop { offset, color }); } diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs index 56a42a9d..40e006a2 100644 --- a/graphics/src/layer.rs +++ b/graphics/src/layer.rs @@ -1,17 +1,17 @@ //! Organize rendering primitives into a flattened list of layers. +mod image; pub mod mesh; mod quad; mod text; -mod image; use crate::alignment; -use crate::{ - Background, Font, Point, Primitive, Rectangle, Size, Vector, Viewport, -}; pub use crate::layer::image::Image; pub use crate::layer::mesh::Mesh; pub use crate::layer::quad::Quad; pub use crate::layer::text::Text; +use crate::{ + Background, Font, Point, Primitive, Rectangle, Size, Vector, Viewport, +}; /// A group of primitives that should be clipped together. #[derive(Debug)] @@ -178,14 +178,12 @@ impl<'a> Layer<'a> { // Only draw visible content if let Some(clip_bounds) = layer.bounds.intersection(&bounds) { - layer.meshes.push( - Mesh { - origin: Point::new(translation.x, translation.y), - buffers, - clip_bounds, - style, - } - ); + layer.meshes.push(Mesh { + origin: Point::new(translation.x, translation.y), + buffers, + clip_bounds, + style, + }); } } Primitive::Clip { bounds, content } => { @@ -244,4 +242,4 @@ impl<'a> Layer<'a> { } } } -}
\ No newline at end of file +} diff --git a/graphics/src/layer/image.rs b/graphics/src/layer/image.rs index cbba7888..045ec665 100644 --- a/graphics/src/layer/image.rs +++ b/graphics/src/layer/image.rs @@ -1,5 +1,5 @@ -use iced_native::{image, svg}; use crate::Rectangle; +use iced_native::{image, svg}; /// A raster or vector image. #[derive(Debug, Clone)] diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index 0d29416c..d4274237 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -29,13 +29,13 @@ mod viewport; pub mod backend; pub mod font; +pub mod gradient; pub mod layer; pub mod overlay; pub mod renderer; pub mod triangle; pub mod widget; pub mod window; -pub mod gradient; pub use antialiasing::Antialiasing; pub use backend::Backend; diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs index 5cb0ef23..c0d6bb55 100644 --- a/graphics/src/primitive.rs +++ b/graphics/src/primitive.rs @@ -2,8 +2,8 @@ use iced_native::image; use iced_native::svg; use iced_native::{Background, Color, Font, Rectangle, Size, Vector}; -use crate::{alignment, layer::mesh}; use crate::triangle; +use crate::{alignment, layer::mesh}; use std::sync::Arc; diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs index ea2efcc1..b9ccb721 100644 --- a/graphics/src/widget/canvas.rs +++ b/graphics/src/widget/canvas.rs @@ -9,12 +9,12 @@ pub mod path; mod cache; mod cursor; +pub mod fill; +pub(crate) mod frame; mod geometry; mod program; -mod text; -pub mod fill; pub mod stroke; -pub(crate) mod frame; +mod text; pub use cache::Cache; pub use cursor::Cursor; @@ -27,8 +27,8 @@ pub use program::Program; pub use stroke::{LineCap, LineDash, LineJoin, Stroke}; pub use text::Text; -use crate::{Backend, Primitive, Renderer}; pub use crate::gradient::{self, Gradient}; +use crate::{Backend, Primitive, Renderer}; use iced_native::layout::{self, Layout}; use iced_native::mouse; |