m92: Update modules/paragraph/

Author: pragmatrix

skia-bindings/src/paragraph.cpp

@@ -236,6 +236,10 @@ extern "C" {
     void C_Paragraph_markDirty(Paragraph* self) {
         self->markDirty();
     }
+    
+    int32_t C_Paragraph_unresolvedGlyphs(Paragraph* self) {
+        return self->unresolvedGlyphs();
+    }
 }
 
 //

skia-safe/src/modules/paragraph/paragraph.rs

@@ -163,6 +163,14 @@ impl Paragraph {
     pub fn mark_dirty(&mut self) {
         unsafe { sb::C_Paragraph_markDirty(self.native_mut()) }
     }
+
+    pub fn unresolved_glyphs(&mut self) -> Option<usize> {
+        unsafe { sb::C_Paragraph_unresolvedGlyphs(self.native_mut()) }
+            .try_into()
+            .ok()
+    }
+
+    // TODO: wrap visit()
 }
 
 #[deprecated(since = "0.0.0", note = "Use Vec<TextBox>")]
@@ -171,30 +179,34 @@ pub type TextBoxes = Vec<TextBox>;
 #[deprecated(since = "0.0.0", note = "Use Vec<LineMetrics>")]
 pub type LineMetricsVector<'a> = Vec<LineMetrics<'a>>;
 
-#[test]
-#[serial_test::serial]
-fn test_line_metrics() {
-    // note: some of the following code is copied from the skparagraph skia-org example.
-    use crate::icu;
-    use crate::textlayout::{FontCollection, ParagraphBuilder, ParagraphStyle, TextStyle};
-    use crate::FontMgr;
-
-    icu::init();
-
-    let mut font_collection = FontCollection::new();
-    font_collection.set_default_font_manager(FontMgr::new(), None);
-    let paragraph_style = ParagraphStyle::new();
-    let mut paragraph_builder = ParagraphBuilder::new(&paragraph_style, font_collection);
-    let ts = TextStyle::new();
-    paragraph_builder.push_style(&ts);
-    paragraph_builder.add_text(LOREM_IPSUM);
-    let mut paragraph = paragraph_builder.build();
-    paragraph.layout(256.0);
+#[cfg(test)]
+mod tests {
+    use crate::{
+        icu,
+        textlayout::{FontCollection, ParagraphBuilder, ParagraphStyle, TextStyle},
+        FontMgr,
+    };
+
+    #[test]
+    #[serial_test::serial]
+    fn test_line_metrics() {
+        icu::init();
+
+        let mut font_collection = FontCollection::new();
+        font_collection.set_default_font_manager(FontMgr::new(), None);
+        let paragraph_style = ParagraphStyle::new();
+        let mut paragraph_builder = ParagraphBuilder::new(&paragraph_style, font_collection);
+        let ts = TextStyle::new();
+        paragraph_builder.push_style(&ts);
+        paragraph_builder.add_text(LOREM_IPSUM);
+        let mut paragraph = paragraph_builder.build();
+        paragraph.layout(256.0);
+
+        let line_metrics = paragraph.get_line_metrics();
+        for (line, lm) in line_metrics.iter().enumerate() {
+            println!("line {}: width: {}", line + 1, lm.width)
+        }
 
-    let line_metrics = paragraph.get_line_metrics();
-    for (line, lm) in line_metrics.iter().enumerate() {
-        println!("line {}: width: {}", line + 1, lm.width)
+        static LOREM_IPSUM: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur at leo at nulla tincidunt placerat. Proin eget purus augue. Quisque et est ullamcorper, pellentesque felis nec, pulvinar massa. Aliquam imperdiet, nulla ut dictum euismod, purus dui pulvinar risus, eu suscipit elit neque ac est. Nullam eleifend justo quis placerat ultricies. Vestibulum ut elementum velit. Praesent et dolor sit amet purus bibendum mattis. Aliquam erat volutpat.";
     }
-
-    static LOREM_IPSUM: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur at leo at nulla tincidunt placerat. Proin eget purus augue. Quisque et est ullamcorper, pellentesque felis nec, pulvinar massa. Aliquam imperdiet, nulla ut dictum euismod, purus dui pulvinar risus, eu suscipit elit neque ac est. Nullam eleifend justo quis placerat ultricies. Vestibulum ut elementum velit. Praesent et dolor sit amet purus bibendum mattis. Aliquam erat volutpat.";
 }

skia-safe/src/modules/paragraph/paragraph_style.rs

@@ -47,6 +47,8 @@ impl fmt::Debug for StrutStyle {
             .field("leading", &self.leading())
             .field("strut_enabled", &self.strut_enabled())
             .field("force_strut_height", &self.force_strut_height())
+            .field("height_override", &self.height_override())
+            .field("half_leading", &self.half_leading())
             .finish()
     }
 }
@@ -126,6 +128,24 @@ impl StrutStyle {
         self.native_mut().fForceHeight = force_height;
         self
     }
+
+    pub fn height_override(&self) -> bool {
+        self.native().fHeightOverride
+    }
+
+    pub fn set_height_override(&mut self, height_override: bool) -> &mut Self {
+        self.native_mut().fHeightOverride = height_override;
+        self
+    }
+
+    pub fn half_leading(&self) -> bool {
+        self.native().fHalfLeading
+    }
+
+    pub fn set_half_leading(&mut self, half_leading: bool) -> &mut Self {
+        self.native_mut().fHalfLeading = half_leading;
+        self
+    }
 }
 
 // Can't use Handle<> here, std::u16string maintains an interior pointer.

skia-safe/src/modules/paragraph/text_shadow.rs

@@ -6,7 +6,7 @@ use skia_bindings as sb;
 pub struct TextShadow {
     pub color: Color,
     pub offset: Point,
-    pub blur_radius: f64,
+    pub blur_sigma: f64,
 }
 
 impl NativeTransmutable<sb::skia_textlayout_TextShadow> for TextShadow {}
@@ -29,12 +29,12 @@ impl PartialEq for TextShadow {
 }
 
 impl TextShadow {
-    pub fn new(color: impl Into<Color>, offset: impl Into<Point>, blur_radius: f64) -> Self {
+    pub fn new(color: impl Into<Color>, offset: impl Into<Point>, blur_sigma: f64) -> Self {
         TextShadow::from_native_c(unsafe {
             sb::skia_textlayout_TextShadow::new1(
                 color.into().into_native(),
                 offset.into().into_native(),
-                blur_radius,
+                blur_sigma,
             )
         })
     }

skia-safe/src/modules/paragraph/text_style.rs

@@ -197,6 +197,7 @@ impl fmt::Debug for TextStyle {
             .field("font_families", &self.font_families())
             .field("height", &self.height())
             .field("height_override", &self.height_override())
+            .field("half_leading", &self.half_leading())
             .field("letter_spacing", &self.letter_spacing())
             .field("word_spacing", &self.word_spacing())
             .field("typeface", &self.typeface())
@@ -368,6 +369,15 @@ impl TextStyle {
         self.native().fHeightOverride
     }
 
+    pub fn set_half_leading(&mut self, half_leading: bool) -> &mut Self {
+        self.native_mut().fHalfLeading = half_leading;
+        self
+    }
+
+    pub fn half_leading(&self) -> bool {
+        self.native().fHalfLeading
+    }
+
     pub fn set_letter_spacing(&mut self, letter_spacing: scalar) -> &mut Self {
         self.native_mut().fLetterSpacing = letter_spacing;
         self