Updated cosmic-text to 0.12.0

CHANGELOG.md

@@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## v0.9.0 (2024-07-22)
 
 ### Breaking Changes
 
 - `wgpu` has been updated to `22.0.0`.
+- `cosmic-text` has been updated to `0.12.0`.
 
 ### Added
 

Cargo.toml

@@ -22,7 +22,7 @@ pollster = "0.3.0"
 bytemuck = { version = "1.13.1", features = ["derive"] }
 lyon_tessellation = "1.0.1"
 image = { version = "0.25.1", optional = true, default-features = false }
-cosmic-text = { version = "0.11.2", optional = true }
+cosmic-text = { version = "0.12.0", optional = true }
 alot = "0.3.0"
 ahash = "0.8.3"
 etagere = "0.2.8"

examples/text.rs

@@ -34,8 +34,8 @@ impl WindowBehavior for Test {
         );
         text.set_size(
             graphics.font_system(),
-            size.width.into_float(),
-            size.height.into_float(),
+            Some(size.width.into_float()),
+            Some(size.height.into_float()),
         );
         let mut editor = Editor::new(&mut text);
         editor.insert_string("Hello, ", None);
@@ -65,8 +65,8 @@ impl WindowBehavior for Test {
         let size = graphics.size();
         self.text.set_size(
             graphics.font_system(),
-            size.width.into_float(),
-            size.height.into_float(),
+            Some(size.width.into_float()),
+            Some(size.height.into_float()),
         );
         self.text.set_metrics(
             graphics.font_system(),

src/text.rs

@@ -221,11 +221,7 @@ impl TextSystem {
             self.attrs.as_attrs(),
             cosmic_text::Shaping::Advanced, // TODO maybe this should be configurable?
         );
-        scratch.set_size(
-            &mut self.fonts,
-            width.map_or(f32::MAX, Cast::cast),
-            f32::MAX,
-        );
+        scratch.set_size(&mut self.fonts, width.map(Cast::cast), None);
         scratch.shape_until_scroll(&mut self.fonts, false);
     }
 }