0671be215f
This PR adjusts the rendering of SVGs when used with the `img` element such that they are rendered at 2x their displayed size. This results in much crisper icons for icons loaded by icon themes: <img width="1136" alt="Screenshot 2025-02-05 at 7 39 48 PM" src="https://github.com/user-attachments/assets/47d1fcee-c54d-4717-8fca-9b9d2bc8da9a" /> <img width="1136" alt="Screenshot 2025-02-05 at 7 40 01 PM" src="https://github.com/user-attachments/assets/3061157c-8c88-41c1-a5dc-83ef9cd341cb" /> Release Notes: - Improved the resolution of icons rendered by icon themes.
73 lines
2.2 KiB
Rust
73 lines
2.2 KiB
Rust
use crate::{AssetSource, DevicePixels, IsZero, Result, SharedString, Size};
|
|
use anyhow::anyhow;
|
|
use resvg::tiny_skia::Pixmap;
|
|
use std::{hash::Hash, sync::Arc};
|
|
|
|
/// When rendering SVGs, we render them at twice the size to get a higher-quality result.
|
|
pub const SMOOTH_SVG_SCALE_FACTOR: f32 = 2.;
|
|
|
|
#[derive(Clone, PartialEq, Hash, Eq)]
|
|
pub(crate) struct RenderSvgParams {
|
|
pub(crate) path: SharedString,
|
|
pub(crate) size: Size<DevicePixels>,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SvgRenderer {
|
|
asset_source: Arc<dyn AssetSource>,
|
|
}
|
|
|
|
pub enum SvgSize {
|
|
Size(Size<DevicePixels>),
|
|
ScaleFactor(f32),
|
|
}
|
|
|
|
impl SvgRenderer {
|
|
pub fn new(asset_source: Arc<dyn AssetSource>) -> Self {
|
|
Self { asset_source }
|
|
}
|
|
|
|
pub(crate) fn render(&self, params: &RenderSvgParams) -> Result<Option<Vec<u8>>> {
|
|
if params.size.is_zero() {
|
|
return Err(anyhow!("can't render at a zero size"));
|
|
}
|
|
|
|
// Load the tree.
|
|
let Some(bytes) = self.asset_source.load(¶ms.path)? else {
|
|
return Ok(None);
|
|
};
|
|
|
|
let pixmap = self.render_pixmap(&bytes, SvgSize::Size(params.size))?;
|
|
|
|
// Convert the pixmap's pixels into an alpha mask.
|
|
let alpha_mask = pixmap
|
|
.pixels()
|
|
.iter()
|
|
.map(|p| p.alpha())
|
|
.collect::<Vec<_>>();
|
|
Ok(Some(alpha_mask))
|
|
}
|
|
|
|
pub fn render_pixmap(&self, bytes: &[u8], size: SvgSize) -> Result<Pixmap, usvg::Error> {
|
|
let tree = usvg::Tree::from_data(bytes, &usvg::Options::default())?;
|
|
|
|
let size = match size {
|
|
SvgSize::Size(size) => size,
|
|
SvgSize::ScaleFactor(scale) => crate::size(
|
|
DevicePixels((tree.size().width() * scale) as i32),
|
|
DevicePixels((tree.size().height() * scale) as i32),
|
|
),
|
|
};
|
|
|
|
// Render the SVG to a pixmap with the specified width and height.
|
|
let mut pixmap = resvg::tiny_skia::Pixmap::new(size.width.into(), size.height.into())
|
|
.ok_or(usvg::Error::InvalidSize)?;
|
|
|
|
let scale = size.width.0 as f32 / tree.size().width();
|
|
let transform = resvg::tiny_skia::Transform::from_scale(scale, scale);
|
|
|
|
resvg::render(&tree, transform, &mut pixmap.as_mut());
|
|
|
|
Ok(pixmap)
|
|
}
|
|
}
|