Remove appearance from Handle

... and pass it directly to `Renderer::draw` instead.
This commit is contained in:
Héctor Ramón Jiménez 2022-12-06 04:34:00 +01:00
parent 314b0f7dc5
commit b205a66347
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
14 changed files with 112 additions and 75 deletions

View file

@ -290,7 +290,7 @@ pub fn svg<Renderer>(
) -> widget::Svg<Renderer>
where
Renderer: crate::svg::Renderer,
Renderer::Theme: crate::svg::StyleSheet,
Renderer::Theme: widget::svg::StyleSheet,
{
widget::Svg::new(handle)
}

View file

@ -9,7 +9,8 @@ use crate::{
use std::path::PathBuf;
pub use svg::{Handle, StyleSheet};
pub use iced_style::svg::{Appearance, StyleSheet};
pub use svg::Handle;
/// A vector graphics image.
///
@ -17,7 +18,6 @@ pub use svg::{Handle, StyleSheet};
///
/// [`Svg`] images can have a considerable rendering cost when resized,
/// specially when they are complex.
#[derive(Clone)]
#[allow(missing_debug_implementations)]
pub struct Svg<Renderer>
where
@ -146,9 +146,6 @@ where
_cursor_position: Point,
_viewport: &Rectangle,
) {
let mut handle = self.handle.clone();
handle.set_appearance(theme.appearance(self.style));
let Size { width, height } = renderer.dimensions(&self.handle);
let image_size = Size::new(width as f32, height as f32);
@ -167,7 +164,13 @@ where
..bounds
};
renderer.draw(handle, drawing_bounds + offset);
let appearance = theme.appearance(&self.style);
renderer.draw(
self.handle.clone(),
appearance.color,
drawing_bounds + offset,
);
};
if adjusted_fit.width > bounds.width