Expose more font metrics

bwoods · Nov 14, 2024 · 80bc3ec · 80bc3ec
1 parent 839143c
commit 80bc3ec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/composable-views/src/text/font.rs b/composable-views/src/text/font.rs
@@ -77,10 +77,16 @@ impl<'a> Font<'a> {
 
     /// Capital height,
     #[inline]
-    pub fn capital_height(&self) -> f32 {
+    pub fn capital_height(&self) -> Option<f32> {
         self.face
-            .capital_height()
-            .unwrap_or_else(|| self.face.ascender()) as f32
+            .capital_height().map(|x| x as f32)
+    }
+
+    /// x height.
+    #[inline]
+    pub fn x_height(&self) -> Option<f32> {
+        self.face
+            .x_height().map(|x| x as f32)
     }
 
     /// Line gap,

diff --git a/composable-views/src/text/mod.rs b/composable-views/src/text/mod.rs
@@ -37,8 +37,14 @@ impl Text<'_> {
 
     /// Capital height of the Text’s font.
     #[inline]
-    pub fn capital_height(&self) -> f32 {
-        self.font.capital_height() * self.scale
+    pub fn capital_height(&self) -> Option<f32> {
+        self.font.capital_height().map(|x| x * self.scale)
+    }
+
+    /// x height of the Text’s font.
+    #[inline]
+    pub fn x_height(&self) -> Option<f32> {
+        self.font.capital_height().map(|x| x * self.scale)
     }
 
     /// Line gap of the Text’s font.