me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify types in tiny_skia::layer

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-08-04 04:33:30 +02:00
parent 3904f0b83a
commit 8708101c89
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tiny_skia/src/layer.rs
View file

@ -1,12 +1,12 @@
use crate::core::renderer::Quad; use crate::core::renderer::Quad;
use crate::core::svg; use crate::core::svg;
use crate::core::{ use crate::core::{
Background, Color, Image, Point, Radians, Rectangle, Transformation, self, Background, Color, Point, Radians, Rectangle, Transformation,
}; };
use crate::graphics;
use crate::graphics::damage; use crate::graphics::damage;
use crate::graphics::layer; use crate::graphics::layer;
use crate::graphics::text::{Editor, Paragraph, Text}; use crate::graphics::text::{Editor, Paragraph, Text};
use crate::graphics::{self, Image};
use crate::Primitive; use crate::Primitive;
use std::rc::Rc; use std::rc::Rc;
@ -19,7 +19,7 @@ pub struct Layer {
pub quads: Vec<(Quad, Background)>, pub quads: Vec<(Quad, Background)>,
pub primitives: Vec<Item<Primitive>>, pub primitives: Vec<Item<Primitive>>,
pub text: Vec<Item<Text>>, pub text: Vec<Item<Text>>,
pub images: Vec<graphics::Image>, pub images: Vec<Image>,
} }
impl Layer { impl Layer {
@ -73,7 +73,7 @@ impl Layer {
pub fn draw_text( pub fn draw_text(
&mut self, &mut self,
text: crate::core::Text, text: core::Text,
position: Point, position: Point,
color: Color, color: Color,
clip_bounds: Rectangle, clip_bounds: Rectangle,
@ -116,16 +116,12 @@ impl Layer {
.push(Item::Cached(text, clip_bounds, transformation)); .push(Item::Cached(text, clip_bounds, transformation));
} }
pub fn draw_image( pub fn draw_image(&mut self, image: Image, transformation: Transformation) {
&mut self,
image: graphics::Image,
transformation: Transformation,
) {
match image { match image {
graphics::Image::Raster(raster, bounds) => { Image::Raster(raster, bounds) => {
self.draw_raster(raster.clone(), bounds, transformation); self.draw_raster(raster.clone(), bounds, transformation);
} }
graphics::Image::Vector { Image::Vector {
handle, handle,
color, color,
bounds, bounds,
@ -146,11 +142,11 @@ impl Layer {
pub fn draw_raster( pub fn draw_raster(
&mut self, &mut self,
image: Image, image: core::Image,
bounds: Rectangle, bounds: Rectangle,
transformation: Transformation, transformation: Transformation,
) { ) {
let image = graphics::Image::Raster(image, bounds * transformation); let image = Image::Raster(image, bounds * transformation);
self.images.push(image); self.images.push(image);
} }
@ -164,7 +160,7 @@ impl Layer {
rotation: Radians, rotation: Radians,
opacity: f32, opacity: f32,
) { ) {
let svg = graphics::Image::Vector { let svg = Image::Vector {
handle, handle,
color, color,
bounds: bounds * transformation, bounds: bounds * transformation,
@ -281,7 +277,7 @@ impl Layer {
&previous.images, &previous.images,
&current.images, &current.images,
|image| vec![image.bounds().expand(1.0)], |image| vec![image.bounds().expand(1.0)],
graphics::Image::eq, Image::eq,
); );
damage.extend(text); damage.extend(text);
@ -313,7 +309,7 @@ impl graphics::Layer for Layer {
fn flush(&mut self) {} fn flush(&mut self) {}
fn resize(&mut self, bounds: graphics::core::Rectangle) { fn resize(&mut self, bounds: Rectangle) {
self.bounds = bounds; self.bounds = bounds;
} }