From 33b5a900197e2798a393d6d9a0834039666eddbb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 19 Apr 2023 01:19:56 +0200 Subject: Make basic text shaping the default shaping strategy --- graphics/src/backend.rs | 2 ++ graphics/src/geometry/text.rs | 10 ++++++++++ graphics/src/primitive.rs | 9 +++++++++ graphics/src/renderer.rs | 7 ++++++- 4 files changed, 27 insertions(+), 1 deletion(-) (limited to 'graphics/src') diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs index dd2888ab..0e107dd5 100644 --- a/graphics/src/backend.rs +++ b/graphics/src/backend.rs @@ -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; /// Loads a [`Font`] from its bytes. diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs index 0befd635..f4af9ee4 100644 --- a/graphics/src/geometry/text.rs +++ b/graphics/src/geometry/text.rs @@ -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, } } } diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs index d6a2c4c4..2d9c221b 100644 --- a/graphics/src/primitive.rs +++ b/graphics/src/primitive.rs @@ -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 { diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs index 23e594be..558e21dd 100644 --- a/graphics/src/renderer.rs +++ b/graphics/src/renderer.rs @@ -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 { 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, }); } } -- cgit From 4bd290afe7d81d9aaf7467b3ce91491f6600261a Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 19 Apr 2023 02:00:45 +0200 Subject: Introduce `text::Shaping` enum and replace magic boolean --- graphics/src/backend.rs | 4 ++-- graphics/src/geometry/text.rs | 18 ++++++------------ graphics/src/primitive.rs | 20 +++++++------------- graphics/src/renderer.rs | 11 +++++------ 4 files changed, 20 insertions(+), 33 deletions(-) (limited to 'graphics/src') diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs index 0e107dd5..0c2a6d30 100644 --- a/graphics/src/backend.rs +++ b/graphics/src/backend.rs @@ -48,7 +48,7 @@ pub trait Text { size: f32, font: Font, bounds: Size, - advanced_shape: bool, + shaping: text::Shaping, ) -> (f32, f32); /// Tests whether the provided point is within the boundaries of [`Text`] @@ -64,9 +64,9 @@ pub trait Text { size: f32, font: Font, bounds: Size, + shaping: text::Shaping, point: Point, nearest_only: bool, - advanced_shape: bool, ) -> Option; /// Loads a [`Font`] from its bytes. 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, } } } diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs index 2d9c221b..db237035 100644 --- a/graphics/src/primitive.rs +++ b/graphics/src/primitive.rs @@ -1,7 +1,8 @@ -use iced_core::alignment; -use iced_core::image; -use iced_core::svg; -use iced_core::{Background, Color, Font, Gradient, Rectangle, Size, Vector}; +use crate::core::alignment; +use crate::core::image; +use crate::core::svg; +use crate::core::text; +use crate::core::{Background, Color, Font, Gradient, Rectangle, Size, Vector}; use bytemuck::{Pod, Zeroable}; use std::sync::Arc; @@ -26,15 +27,8 @@ 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, + /// The shaping strategy of the text. + shaping: text::Shaping, }, /// A quad primitive Quad { diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs index 558e21dd..605286d6 100644 --- a/graphics/src/renderer.rs +++ b/graphics/src/renderer.rs @@ -138,10 +138,9 @@ where size: f32, font: Font, bounds: Size, - needs_shaping: bool, + shaping: text::Shaping, ) -> (f32, f32) { - self.backend() - .measure(content, size, font, bounds, needs_shaping) + self.backend().measure(content, size, font, bounds, shaping) } fn hit_test( @@ -150,18 +149,18 @@ where size: f32, font: Font, bounds: Size, + shaping: text::Shaping, point: Point, nearest_only: bool, - advanced_shape: bool, ) -> Option { self.backend().hit_test( content, size, font, bounds, + shaping, point, nearest_only, - advanced_shape, ) } @@ -178,7 +177,7 @@ where font: text.font, horizontal_alignment: text.horizontal_alignment, vertical_alignment: text.vertical_alignment, - advanced_shape: text.advanced_shape, + shaping: text.shaping, }); } } -- cgit