Validate if line_height is set to zero

software-mansion · Feb 24, 2025 · 52d9437 · 52d9437
1 parent 964e821
commit 52d9437
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/compositor_api/src/types/from_component.rs b/compositor_api/src/types/from_component.rs
@@ -316,12 +316,20 @@ impl TryFrom<Text> for scene::TextComponent {
                 max_height: max_height.unwrap_or(MAX_NODE_RESOLUTION.height as f32),
             },
         };
+
+        let line_height = text.line_height.unwrap_or(text.font_size);
+        if line_height <= 0.0 {
+            return Err(TypeError::new(
+                "\"line_height\" property has to larger than 0",
+            ));
+        }
+
         let text = Self {
             id: text.id.map(Into::into),
             text: text.text,
             font_size: text.font_size,
             dimensions,
-            line_height: text.line_height.unwrap_or(text.font_size),
+            line_height,
             color: text
                 .color
                 .map(TryInto::try_into)

diff --git a/integration_tests/examples/text.rs b/integration_tests/examples/text.rs
@@ -42,7 +42,6 @@ fn client_code() -> Result<()> {
                         "type": "text",
                         "text": "VideoCompositor🚀\nSecond Line\nLorem ipsum dolor sit amet consectetur adipisicing elit. Soluta delectus optio fugit maiores eaque ab totam, veritatis aperiam provident, aliquam consectetur deserunt cumque est? Saepe tenetur impedit culpa asperiores id?",
                         "font_size": 100.0,
-                        "font_family": "Comic Sans MS",
                         "align": "center",
                         "wrap": "word",
                         "background_color": "#00800000",