leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add Auto strategy to text::Shaping

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-08-30 18:15:12 +02:00
parent d31a7b6ae8
commit bc7d64987e
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
8 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
graphics/src/text.rs
View file

@ -323,8 +323,15 @@ fn to_align(alignment: Alignment) -> Option<cosmic_text::Align> {
}
/// Converts some [`Shaping`] strategy to a [`cosmic_text::Shaping`] strategy.
pub fn to_shaping(shaping: Shaping) -> cosmic_text::Shaping {
pub fn to_shaping(shaping: Shaping, text: &str) -> cosmic_text::Shaping {
match shaping {
Shaping::Auto => {
if text.is_ascii() {
cosmic_text::Shaping::Basic
} else {
cosmic_text::Shaping::Advanced
}
}
Shaping::Basic => cosmic_text::Shaping::Basic,
Shaping::Advanced => cosmic_text::Shaping::Advanced,
}

2
graphics/src/text/cache.rs
View file

@ -55,7 +55,7 @@ impl Cache {
font_system,
key.content,
&text::to_attributes(key.font),
text::to_shaping(key.shaping),
text::to_shaping(key.shaping, key.content),
);
let bounds = text::align(&mut buffer, font_system, key.align_x);

4
graphics/src/text/paragraph.rs
View file

@ -88,7 +88,7 @@ impl core::text::Paragraph for Paragraph {
font_system.raw(),
text.content,
&text::to_attributes(text.font),
text::to_shaping(text.shaping),
text::to_shaping(text.shaping, text.content),
);
let min_bounds =
@ -158,7 +158,7 @@ impl core::text::Paragraph for Paragraph {
(span.text.as_ref(), attrs.metadata(i))
}),
&text::to_attributes(text.font),
text::to_shaping(text.shaping),
cosmic_text::Shaping::Advanced,
None,
);