diff options
author | 2022-12-06 04:34:00 +0100 | |
---|---|---|
committer | 2022-12-06 04:34:00 +0100 | |
commit | b205a663471a8170d7b30cc59894425c09bea563 (patch) | |
tree | 53514f16226949f1e2440eed8ead4dec968c8d95 /native/src/widget/svg.rs | |
parent | 314b0f7dc52c844669c224060a7b03e842762370 (diff) | |
download | iced-b205a663471a8170d7b30cc59894425c09bea563.tar.gz iced-b205a663471a8170d7b30cc59894425c09bea563.tar.bz2 iced-b205a663471a8170d7b30cc59894425c09bea563.zip |
Remove `appearance` from `Handle`
... and pass it directly to `Renderer::draw` instead.
Diffstat (limited to 'native/src/widget/svg.rs')
-rw-r--r-- | native/src/widget/svg.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs index c7eb4f6d..f83f5acf 100644 --- a/native/src/widget/svg.rs +++ b/native/src/widget/svg.rs @@ -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 |