summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--glow/Cargo.toml2
-rw-r--r--glow/src/backend.rs5
-rw-r--r--glow/src/text.rs14
-rw-r--r--graphics/Cargo.toml2
-rw-r--r--graphics/fonts/Icons.ttf (renamed from glow/src/text/icons.ttf)bin4912 -> 4912 bytes
-rw-r--r--graphics/fonts/Lato-Regular.ttf (renamed from wgpu/fonts/Lato-Regular.ttf)bin75136 -> 75136 bytes
-rw-r--r--graphics/fonts/OFL.txt (renamed from wgpu/fonts/OFL.txt)0
-rw-r--r--graphics/src/font.rs12
-rw-r--r--wgpu/Cargo.toml2
-rw-r--r--wgpu/src/backend.rs5
-rw-r--r--wgpu/src/text.rs13
-rw-r--r--wgpu/src/text/icons.ttfbin4912 -> 0 bytes
12 files changed, 26 insertions, 29 deletions
diff --git a/glow/Cargo.toml b/glow/Cargo.toml
index 158e2bf0..72ed8758 100644
--- a/glow/Cargo.toml
+++ b/glow/Cargo.toml
@@ -23,7 +23,7 @@ path = "../native"
[dependencies.iced_graphics]
version = "0.1"
path = "../graphics"
-features = ["font-source"]
+features = ["font-source", "font-fallback", "font-icons"]
[dependencies.surfman]
path = "../../surfman/surfman"
diff --git a/glow/src/backend.rs b/glow/src/backend.rs
index 7293eba1..94683e56 100644
--- a/glow/src/backend.rs
+++ b/glow/src/backend.rs
@@ -3,6 +3,7 @@ use crate::text;
use crate::triangle;
use crate::{Quad, Settings, Transformation, Viewport};
use iced_graphics::backend;
+use iced_graphics::font;
use iced_graphics::Primitive;
use iced_native::mouse;
use iced_native::{Background, Font, Point, Rectangle, Size, Vector};
@@ -404,8 +405,8 @@ impl iced_graphics::Backend for Backend {
}
impl backend::Text for Backend {
- const ICON_FONT: Font = text::BUILTIN_ICONS;
- const CHECKMARK_ICON: char = text::CHECKMARK_ICON;
+ const ICON_FONT: Font = font::ICONS;
+ const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
fn measure(
&self,
diff --git a/glow/src/text.rs b/glow/src/text.rs
index be88ceaf..952fd2cd 100644
--- a/glow/src/text.rs
+++ b/glow/src/text.rs
@@ -2,16 +2,6 @@ use crate::Transformation;
use iced_graphics::font;
use std::{cell::RefCell, collections::HashMap};
-pub const BUILTIN_ICONS: iced_native::Font = iced_native::Font::External {
- name: "iced_glow icons",
- bytes: include_bytes!("text/icons.ttf"),
-};
-
-pub const CHECKMARK_ICON: char = '\u{F00C}';
-
-const FALLBACK_FONT: &[u8] =
- include_bytes!("../../wgpu/fonts/Lato-Regular.ttf");
-
#[derive(Debug)]
pub struct Pipeline {
draw_brush: RefCell<glow_glyph::GlyphBrush<'static>>,
@@ -29,7 +19,7 @@ impl Pipeline {
default_font.map(|slice| slice.to_vec()).unwrap_or_else(|| {
font_source
.load(&[font::Family::SansSerif, font::Family::Serif])
- .unwrap_or_else(|_| FALLBACK_FONT.to_vec())
+ .unwrap_or_else(|_| font::FALLBACK.to_vec())
});
let load_glyph_brush = |font: Vec<u8>| {
@@ -48,7 +38,7 @@ impl Pipeline {
.unwrap_or_else(|_: glow_glyph::rusttype::Error| {
log::warn!("System font failed to load. Falling back to embedded font...");
- load_glyph_brush(FALLBACK_FONT.to_vec()).expect("Load fallback font")
+ load_glyph_brush(font::FALLBACK.to_vec()).expect("Load fallback font")
});
let draw_brush =
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index c937763c..61f1f6d4 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -7,6 +7,8 @@ edition = "2018"
[features]
canvas = ["lyon"]
font-source = ["font-kit"]
+font-fallback = []
+font-icons = []
[dependencies]
bytemuck = "1.2"
diff --git a/glow/src/text/icons.ttf b/graphics/fonts/Icons.ttf
index 1c832f86..1c832f86 100644
--- a/glow/src/text/icons.ttf
+++ b/graphics/fonts/Icons.ttf
Binary files differ
diff --git a/wgpu/fonts/Lato-Regular.ttf b/graphics/fonts/Lato-Regular.ttf
index 33eba8b1..33eba8b1 100644
--- a/wgpu/fonts/Lato-Regular.ttf
+++ b/graphics/fonts/Lato-Regular.ttf
Binary files differ
diff --git a/wgpu/fonts/OFL.txt b/graphics/fonts/OFL.txt
index dfca0da4..dfca0da4 100644
--- a/wgpu/fonts/OFL.txt
+++ b/graphics/fonts/OFL.txt
diff --git a/graphics/src/font.rs b/graphics/src/font.rs
index 3890beba..a490e609 100644
--- a/graphics/src/font.rs
+++ b/graphics/src/font.rs
@@ -8,3 +8,15 @@ pub use source::Source;
pub use font_kit::{
error::SelectionError as LoadError, family_name::FamilyName as Family,
};
+
+#[cfg(feature = "font-fallback")]
+pub const FALLBACK: &[u8] = include_bytes!("../fonts/Lato-Regular.ttf");
+
+#[cfg(feature = "font-icons")]
+pub const ICONS: iced_native::Font = iced_native::Font::External {
+ name: "iced_wgpu icons",
+ bytes: include_bytes!("../fonts/Icons.ttf"),
+};
+
+#[cfg(feature = "font-icons")]
+pub const CHECKMARK_ICON: char = '\u{F00C}';
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b59c7fa3..35ea9c31 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -32,7 +32,7 @@ path = "../native"
[dependencies.iced_graphics]
version = "0.1"
path = "../graphics"
-features = ["font-source"]
+features = ["font-source", "font-fallback", "font-icons"]
[dependencies.image]
version = "0.23"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index ba1a57a5..073a79e2 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -3,6 +3,7 @@ use crate::text;
use crate::triangle;
use crate::{Quad, Settings, Target, Transformation};
use iced_graphics::backend;
+use iced_graphics::font;
use iced_graphics::Primitive;
use iced_native::mouse;
use iced_native::{Background, Font, Point, Rectangle, Size, Vector};
@@ -456,8 +457,8 @@ impl iced_graphics::Backend for Backend {
}
impl backend::Text for Backend {
- const ICON_FONT: Font = text::BUILTIN_ICONS;
- const CHECKMARK_ICON: char = text::CHECKMARK_ICON;
+ const ICON_FONT: Font = font::ICONS;
+ const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
fn measure(
&self,
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ae9b6b22..c1782fe5 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -2,15 +2,6 @@ use crate::Transformation;
use iced_graphics::font;
use std::{cell::RefCell, collections::HashMap};
-pub const BUILTIN_ICONS: iced_native::Font = iced_native::Font::External {
- name: "iced_wgpu icons",
- bytes: include_bytes!("text/icons.ttf"),
-};
-
-pub const CHECKMARK_ICON: char = '\u{F00C}';
-
-const FALLBACK_FONT: &[u8] = include_bytes!("../fonts/Lato-Regular.ttf");
-
#[derive(Debug)]
pub struct Pipeline {
draw_brush: RefCell<wgpu_glyph::GlyphBrush<'static, ()>>,
@@ -32,7 +23,7 @@ impl Pipeline {
default_font.map(|slice| slice.to_vec()).unwrap_or_else(|| {
font_source
.load(&[font::Family::SansSerif, font::Family::Serif])
- .unwrap_or_else(|_| FALLBACK_FONT.to_vec())
+ .unwrap_or_else(|_| font::FALLBACK.to_vec())
});
let load_glyph_brush = |font: Vec<u8>| {
@@ -51,7 +42,7 @@ impl Pipeline {
.unwrap_or_else(|_: wgpu_glyph::rusttype::Error| {
log::warn!("System font failed to load. Falling back to embedded font...");
- load_glyph_brush(FALLBACK_FONT.to_vec()).expect("Load fallback font")
+ load_glyph_brush(font::FALLBACK.to_vec()).expect("Load fallback font")
});
let draw_brush = brush_builder
diff --git a/wgpu/src/text/icons.ttf b/wgpu/src/text/icons.ttf
deleted file mode 100644
index 1c832f86..00000000
--- a/wgpu/src/text/icons.ttf
+++ /dev/null
Binary files differ
generated by cgit (git 2.34.1) at 2025-04-14 15:05:50 +0000