summaryrefslogtreecommitdiffstats
path: root/graphics/src/geometry
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-04-19 02:00:45 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-05-02 01:02:32 +0200
commit4bd290afe7d81d9aaf7467b3ce91491f6600261a (patch)
tree906bfe10f6118c86429c3bb83a8ce742dccb170a /graphics/src/geometry
parent33b5a900197e2798a393d6d9a0834039666eddbb (diff)
downloadiced-4bd290afe7d81d9aaf7467b3ce91491f6600261a.tar.gz
iced-4bd290afe7d81d9aaf7467b3ce91491f6600261a.tar.bz2
iced-4bd290afe7d81d9aaf7467b3ce91491f6600261a.zip
Introduce `text::Shaping` enum and replace magic boolean
Diffstat (limited to 'graphics/src/geometry')
-rw-r--r--graphics/src/geometry/text.rs18
1 files changed, 6 insertions, 12 deletions
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index f4af9ee4..0f731e74 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -1,5 +1,6 @@
-use iced_core::alignment;
-use iced_core::{Color, Font, Point};
+use crate::core::alignment;
+use crate::core::text::Shaping;
+use crate::core::{Color, Font, Point};
/// A bunch of text that can be drawn to a canvas
#[derive(Debug, Clone)]
@@ -25,15 +26,8 @@ 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,
+ /// The shaping strategy of the text.
+ pub shaping: Shaping,
}
impl Default for Text {
@@ -46,7 +40,7 @@ impl Default for Text {
font: Font::default(),
horizontal_alignment: alignment::Horizontal::Left,
vertical_alignment: alignment::Vertical::Top,
- advanced_shape: false,
+ shaping: Shaping::Basic,
}
}
}