Make basic text shaping the default shaping strategy
This commit is contained in:
parent
57a276e165
commit
33b5a90019
24 changed files with 140 additions and 10 deletions
|
|
@ -48,6 +48,7 @@ pub trait Text {
|
|||
size: f32,
|
||||
font: Font,
|
||||
bounds: Size,
|
||||
advanced_shape: bool,
|
||||
) -> (f32, f32);
|
||||
|
||||
/// Tests whether the provided point is within the boundaries of [`Text`]
|
||||
|
|
@ -65,6 +66,7 @@ pub trait Text {
|
|||
bounds: Size,
|
||||
point: Point,
|
||||
nearest_only: bool,
|
||||
advanced_shape: bool,
|
||||
) -> Option<text::Hit>;
|
||||
|
||||
/// Loads a [`Font`] from its bytes.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,15 @@ pub struct Text {
|
|||
pub horizontal_alignment: alignment::Horizontal,
|
||||
/// The vertical alignment of the text
|
||||
pub vertical_alignment: alignment::Vertical,
|
||||
/// Whether the text needs advanced shaping and font fallback.
|
||||
///
|
||||
/// You will need to enable this flag if the text contains a complex
|
||||
/// script, the font used needs it, and/or multiple fonts in your system
|
||||
/// may be needed to display all of the glyphs.
|
||||
///
|
||||
/// Advanced shaping is expensive! You should only enable it when
|
||||
/// necessary.
|
||||
pub advanced_shape: bool,
|
||||
}
|
||||
|
||||
impl Default for Text {
|
||||
|
|
@ -37,6 +46,7 @@ impl Default for Text {
|
|||
font: Font::default(),
|
||||
horizontal_alignment: alignment::Horizontal::Left,
|
||||
vertical_alignment: alignment::Vertical::Top,
|
||||
advanced_shape: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,15 @@ pub enum Primitive {
|
|||
horizontal_alignment: alignment::Horizontal,
|
||||
/// The vertical alignment of the text
|
||||
vertical_alignment: alignment::Vertical,
|
||||
/// Whether the text needs advanced shaping and font fallback.
|
||||
///
|
||||
/// You will need to enable this flag if the text contains a complex
|
||||
/// script, the font used needs it, and/or multiple fonts in your system
|
||||
/// may be needed to display all of the glyphs.
|
||||
///
|
||||
/// Advanced shaping is expensive! You should only enable it when
|
||||
/// necessary.
|
||||
advanced_shape: bool,
|
||||
},
|
||||
/// A quad primitive
|
||||
Quad {
|
||||
|
|
|
|||
|
|
@ -138,8 +138,10 @@ where
|
|||
size: f32,
|
||||
font: Font,
|
||||
bounds: Size,
|
||||
needs_shaping: bool,
|
||||
) -> (f32, f32) {
|
||||
self.backend().measure(content, size, font, bounds)
|
||||
self.backend()
|
||||
.measure(content, size, font, bounds, needs_shaping)
|
||||
}
|
||||
|
||||
fn hit_test(
|
||||
|
|
@ -150,6 +152,7 @@ where
|
|||
bounds: Size,
|
||||
point: Point,
|
||||
nearest_only: bool,
|
||||
advanced_shape: bool,
|
||||
) -> Option<text::Hit> {
|
||||
self.backend().hit_test(
|
||||
content,
|
||||
|
|
@ -158,6 +161,7 @@ where
|
|||
bounds,
|
||||
point,
|
||||
nearest_only,
|
||||
advanced_shape,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -174,6 +178,7 @@ where
|
|||
font: text.font,
|
||||
horizontal_alignment: text.horizontal_alignment,
|
||||
vertical_alignment: text.vertical_alignment,
|
||||
advanced_shape: text.advanced_shape,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue