From 3a0d34c0240f4421737a6a08761f99d6f8140d02 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 4 Mar 2023 05:37:11 +0100 Subject: Create `iced_widget` subcrate and re-organize the whole codebase --- native/src/widget/svg.rs | 195 ----------------------------------------------- 1 file changed, 195 deletions(-) delete mode 100644 native/src/widget/svg.rs (limited to 'native/src/widget/svg.rs') diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs deleted file mode 100644 index f5ed0a6c..00000000 --- a/native/src/widget/svg.rs +++ /dev/null @@ -1,195 +0,0 @@ -//! Display vector graphics in your application. -use crate::layout; -use crate::renderer; -use crate::svg; -use crate::widget::Tree; -use crate::{ - ContentFit, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget, -}; - -use std::path::PathBuf; - -pub use iced_style::svg::{Appearance, StyleSheet}; -pub use svg::Handle; - -/// A vector graphics image. -/// -/// An [`Svg`] image resizes smoothly without losing any quality. -/// -/// [`Svg`] images can have a considerable rendering cost when resized, -/// specially when they are complex. -#[allow(missing_debug_implementations)] -pub struct Svg -where - Renderer: svg::Renderer, - Renderer::Theme: StyleSheet, -{ - handle: Handle, - width: Length, - height: Length, - content_fit: ContentFit, - style: ::Style, -} - -impl Svg -where - Renderer: svg::Renderer, - Renderer::Theme: StyleSheet, -{ - /// Creates a new [`Svg`] from the given [`Handle`]. - pub fn new(handle: impl Into) -> Self { - Svg { - handle: handle.into(), - width: Length::Fill, - height: Length::Shrink, - content_fit: ContentFit::Contain, - style: Default::default(), - } - } - - /// Creates a new [`Svg`] that will display the contents of the file at the - /// provided path. - #[must_use] - pub fn from_path(path: impl Into) -> Self { - Self::new(Handle::from_path(path)) - } - - /// Sets the width of the [`Svg`]. - #[must_use] - pub fn width(mut self, width: impl Into) -> Self { - self.width = width.into(); - self - } - - /// Sets the height of the [`Svg`]. - #[must_use] - pub fn height(mut self, height: impl Into) -> Self { - self.height = height.into(); - self - } - - /// Sets the [`ContentFit`] of the [`Svg`]. - /// - /// Defaults to [`ContentFit::Contain`] - #[must_use] - pub fn content_fit(self, content_fit: ContentFit) -> Self { - Self { - content_fit, - ..self - } - } - - /// Sets the style variant of this [`Svg`]. - #[must_use] - pub fn style( - mut self, - style: ::Style, - ) -> Self { - self.style = style; - self - } -} - -impl Widget for Svg -where - Renderer: svg::Renderer, - Renderer::Theme: iced_style::svg::StyleSheet, -{ - fn width(&self) -> Length { - self.width - } - - fn height(&self) -> Length { - self.height - } - - fn layout( - &self, - renderer: &Renderer, - limits: &layout::Limits, - ) -> layout::Node { - // The raw w/h of the underlying image - let Size { width, height } = renderer.dimensions(&self.handle); - let image_size = Size::new(width as f32, height as f32); - - // The size to be available to the widget prior to `Shrink`ing - let raw_size = limits - .width(self.width) - .height(self.height) - .resolve(image_size); - - // The uncropped size of the image when fit to the bounds above - let full_size = self.content_fit.fit(image_size, raw_size); - - // Shrink the widget to fit the resized image, if requested - let final_size = Size { - width: match self.width { - Length::Shrink => f32::min(raw_size.width, full_size.width), - _ => raw_size.width, - }, - height: match self.height { - Length::Shrink => f32::min(raw_size.height, full_size.height), - _ => raw_size.height, - }, - }; - - layout::Node::new(final_size) - } - - fn draw( - &self, - _state: &Tree, - renderer: &mut Renderer, - theme: &Renderer::Theme, - _style: &renderer::Style, - layout: Layout<'_>, - _cursor_position: Point, - _viewport: &Rectangle, - ) { - let Size { width, height } = renderer.dimensions(&self.handle); - let image_size = Size::new(width as f32, height as f32); - - let bounds = layout.bounds(); - let adjusted_fit = self.content_fit.fit(image_size, bounds.size()); - - let render = |renderer: &mut Renderer| { - let offset = Vector::new( - (bounds.width - adjusted_fit.width).max(0.0) / 2.0, - (bounds.height - adjusted_fit.height).max(0.0) / 2.0, - ); - - let drawing_bounds = Rectangle { - width: adjusted_fit.width, - height: adjusted_fit.height, - ..bounds - }; - - let appearance = theme.appearance(&self.style); - - renderer.draw( - self.handle.clone(), - appearance.color, - drawing_bounds + offset, - ); - }; - - if adjusted_fit.width > bounds.width - || adjusted_fit.height > bounds.height - { - renderer.with_layer(bounds, render); - } else { - render(renderer); - } - } -} - -impl<'a, Message, Renderer> From> - for Element<'a, Message, Renderer> -where - Renderer: svg::Renderer + 'a, - Renderer::Theme: iced_style::svg::StyleSheet, -{ - fn from(icon: Svg) -> Element<'a, Message, Renderer> { - Element::new(icon) - } -} -- cgit