iris-ai/iris
1
0 Fork 0
forked from iris/iris
Code Pull Requests Activity

iris: make font families application-named strings

Browse Source
This commit is contained in:
iris committed 2026-09-12 13:09:31 -04:00
1 parent beaf24c75d
commit 7c23c5f146
4 files changed
+38 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/primitive/text.rs
+31 -60
View File
@@ -1,7 +1,7 @@
use crate::{Align, GlyphAtlas, GlyphKey, PaintId, PlacedGlyph, RegionAlign, Textures, util::Vec2};
use parley::{
Alignment, AlignmentOptions, FontContext, FontFamily, FontFamilyName, FontStyle, FontWeight,
GenericFamily, Layout, LayoutContext, LineHeight, PositionedLayoutItem, StyleProperty,
Alignment, AlignmentOptions, FontContext, FontFamily, FontStyle, FontWeight, GenericFamily,
Layout, LayoutContext, LineHeight, PositionedLayoutItem, StyleProperty,
fontique::{Blob, FontInfoOverride},
};
use std::{collections::HashMap, fmt, ops::Range, sync::Arc};
@@ -24,19 +24,14 @@ pub struct FontDiagnostics {
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum FontRegistrationError {
UnsupportedFamily(Family),
AlreadyRegistered(Family),
AlreadyRegistered(String),
TextAlreadyShaped,
InvalidFont(Family),
InvalidFont(String),
}
impl fmt::Display for FontRegistrationError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::UnsupportedFamily(family) => write!(
f,
"cannot register font data for {family:?}; use Family::Icons or Family::Named"
),
Self::AlreadyRegistered(family) => {
write!(f, "font data is already registered for {family:?}")
}
@@ -72,7 +67,7 @@ pub struct TextData {
/// truth would mean carrying a `Painter` (or output size) into every
/// input handler for the sake of one field.
pub density: f32,
registered_families: HashMap<Family, String>,
registered_families: HashMap<String, String>,
next_registered_family: u64,
shaping_started: bool,
}
@@ -169,12 +164,10 @@ fn patch_android_monospace(_font_cx: &mut FontContext) {}
impl TextData {
pub(crate) fn register_font(
&mut self,
family: Family,
family: impl AsRef<str>,
data: impl AsRef<[u8]> + Send + Sync + 'static,
) -> Result<(), FontRegistrationError> {
if !matches!(family, Family::Icons | Family::Named(_)) {
return Err(FontRegistrationError::UnsupportedFamily(family));
}
let family = family.as_ref().to_owned();
if self.shaping_started {
return Err(FontRegistrationError::TextAlreadyShaped);
}
@@ -201,23 +194,18 @@ impl TextData {
Ok(())
}
pub(crate) fn is_font_registered(&self, family: &Family) -> bool {
self.registered_families.contains_key(family)
pub(crate) fn is_font_registered(&self, family: impl AsRef<str>) -> bool {
self.registered_families.contains_key(family.as_ref())
}
/// Cloned rather than borrowed because the caller needs it while the
/// layout builder holds `&mut self` -- a `String` per shaped registered
/// run, paid only when the layout is rebuilt.
pub fn resolve_family(&self, family: &Family) -> Family {
pub fn resolve_family(&self, family: &str) -> String {
if let Some(name) = self.registered_families.get(family) {
return Family::Named(name.clone());
}
match family {
Family::Icons => panic!(
"Family::Icons has no font; register application font data with Ui::register_font before the first draw"
),
_ => family.clone(),
return name.clone();
}
family.to_owned()
}
pub fn font_diagnostics(&mut self) -> FontDiagnostics {
@@ -389,37 +377,15 @@ impl TextData {
}
}
/// Which family to ask for. Kept as an owned name rather than parley's
/// borrowed `FontFamily<'_>` so that a widget can hold one without a lifetime.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum Family {
SansSerif,
Serif,
Monospace,
/// The icon font supplied by the application through
/// [`crate::Ui::register_font`].
Icons,
Named(String),
}
impl Family {
fn family(&self) -> FontFamily<'_> {
let name = match self {
Self::SansSerif => FontFamilyName::Generic(GenericFamily::SansSerif),
Self::Serif => FontFamilyName::Generic(GenericFamily::Serif),
Self::Monospace => FontFamilyName::Generic(GenericFamily::Monospace),
Self::Icons => FontFamilyName::Generic(GenericFamily::SansSerif),
Self::Named(name) => FontFamilyName::Named(name.as_str().into()),
};
FontFamily::Single(name)
}
}
pub const SANS_SERIF: &str = "sans-serif";
pub const SERIF: &str = "serif";
pub const MONOSPACE: &str = "monospace";
#[derive(Clone, PartialEq)]
pub struct SpanStyle {
pub range: Range<usize>,
pub color: Option<PaintId>,
pub family: Option<Family>,
pub family: Option<String>,
pub font_size: Option<f32>,
pub bold: bool,
pub italic: bool,
@@ -442,8 +408,8 @@ impl SpanStyle {
self.color = Some(color);
self
}
pub fn family(mut self, family: Family) -> Self {
self.family = Some(family);
pub fn family(mut self, family: impl AsRef<str>) -> Self {
self.family = Some(family.as_ref().to_owned());
self
}
pub fn font_size(mut self, size: f32) -> Self {
@@ -469,7 +435,7 @@ pub struct TextAttrs {
pub color: PaintId,
pub font_size: f32,
pub line_height: f32,
pub family: Family,
pub family: String,
pub wrap: bool,
pub align: RegionAlign,
}
@@ -483,7 +449,7 @@ impl Default for TextAttrs {
color: PaintId::WHITE,
font_size: size,
line_height: size * LINE_HEIGHT_MULT,
family: Family::SansSerif,
family: SANS_SERIF.to_owned(),
wrap: false,
align: Align::CENTER_LEFT,
}
@@ -562,7 +528,7 @@ impl TextBuffer {
return;
}
let base_family = data.resolve_family(&attrs.family);
let span_families: Vec<Option<Family>> = self
let span_families: Vec<Option<String>> = self
.spans
.iter()
.map(|span| span.family.as_ref().map(|f| data.resolve_family(f)))
@@ -570,7 +536,9 @@ impl TextBuffer {
let mut builder = data
.layout_cx
.ranged_builder(&mut data.font_cx, &self.text, 1.0, true);
builder.push_default(StyleProperty::FontFamily(base_family.family()));
builder.push_default(StyleProperty::FontFamily(FontFamily::from(
base_family.as_str(),
)));
builder.push_default(StyleProperty::FontSize(attrs.font_size * density));
builder.push_default(StyleProperty::LineHeight(LineHeight::Absolute(
attrs.line_height * density,
@@ -582,7 +550,10 @@ impl TextBuffer {
builder.push(StyleProperty::Brush(color.clone()), range.clone());
}
if let Some(family) = family {
builder.push(StyleProperty::FontFamily(family.family()), range.clone());
builder.push(
StyleProperty::FontFamily(FontFamily::from(family.as_str())),
range.clone(),
);
}
if let Some(size) = span.font_size {
builder.push(StyleProperty::FontSize(size * density), range.clone());
@@ -642,8 +613,8 @@ mod tests {
fn invalid_font_data_is_reported() {
let mut data = TextData::default();
assert_eq!(
data.register_font(Family::Icons, b"not a font" as &'static [u8]),
Err(FontRegistrationError::InvalidFont(Family::Icons))
data.register_font("icons", b"not a font" as &'static [u8]),
Err(FontRegistrationError::InvalidFont("icons".to_owned()))
);
}
@@ -653,7 +624,7 @@ mod tests {
let mut buffer = TextBuffer::new("ordinary platform text");
buffer.shape(&mut data, &TextAttrs::default(), None, 1.0);
assert_eq!(
data.register_font(Family::Icons, b"not a font" as &'static [u8]),
data.register_font("icons", b"not a font" as &'static [u8]),
Err(FontRegistrationError::TextAlreadyShaped)
);
}