fix: replace base64 images with nested svg to fix rasterization blurriness
This commit is contained in:
Generated
-7
@@ -23,12 +23,6 @@ version = "1.5.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "base64"
|
|
||||||
version = "0.23.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b25655df2c3cdd83c5e5b293b88acd880332b2ddadd7c30ac43144fdc0033da9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "2.13.1"
|
version = "2.13.1"
|
||||||
@@ -408,7 +402,6 @@ name = "icon-color-tool"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
|
||||||
"gtk4",
|
"gtk4",
|
||||||
"regex",
|
"regex",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -10,4 +10,3 @@ regex = "1"
|
|||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
walkdir = "2"
|
walkdir = "2"
|
||||||
base64 = "0.23.0"
|
|
||||||
|
|||||||
+18
-6
@@ -25,15 +25,27 @@ impl CompositeIcon {
|
|||||||
|
|
||||||
pub fn render(&self) -> String {
|
pub fn render(&self) -> String {
|
||||||
if let Some(emblem) = &self.emblem {
|
if let Some(emblem) = &self.emblem {
|
||||||
use base64::prelude::*;
|
fn strip_xml(svg: &str) -> &str {
|
||||||
let bg_b64 = BASE64_STANDARD.encode(&self.bg.content);
|
if let Some(idx) = svg.find("<svg") {
|
||||||
let emblem_b64 = BASE64_STANDARD.encode(&emblem.content);
|
&svg[idx..]
|
||||||
|
} else {
|
||||||
|
svg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let bg_svg = strip_xml(&self.bg.content);
|
||||||
|
let emblem_svg = strip_xml(&emblem.content);
|
||||||
|
|
||||||
format!(
|
format!(
|
||||||
r#"<svg viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
|
r#"<svg viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
|
||||||
<image x="0" y="0" width="64" height="64" href="data:image/svg+xml;base64,{}" />
|
<svg x="0" y="0" width="64" height="64">
|
||||||
<image x="{}" y="{}" width="{}" height="{}" href="data:image/svg+xml;base64,{}" />
|
{}
|
||||||
|
</svg>
|
||||||
|
<svg x="{}" y="{}" width="{}" height="{}">
|
||||||
|
{}
|
||||||
|
</svg>
|
||||||
</svg>"#,
|
</svg>"#,
|
||||||
bg_b64, self.emblem_x, self.emblem_y, self.emblem_size, self.emblem_size, emblem_b64
|
bg_svg, self.emblem_x, self.emblem_y, self.emblem_size, self.emblem_size, emblem_svg
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
self.bg.content.clone()
|
self.bg.content.clone()
|
||||||
|
|||||||
Reference in New Issue
Block a user