tawasuyu

tawasuyu/taffy

A high performance rust-powered UI layout library

Rust 499HTML 245JavaScript 8Markdown 71218 Definitions

Update cosmic-text example to cosmic-text 0.12 (#670)

aeb0b442d26b1a7ac245daabfc76cf931cb0841c · by Nico Burns · (2 years ago) · parent e363fc806 · browse the tree at this commit

Semantic delta · 2

examples/cosmic_text.rs

2 files · +7 −7

diff --git a/Cargo.toml b/Cargo.toml
index dffcb8b4f..76eedbbb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,7 +57,7 @@ debug = ["std"]
 profile = ["std"]
 
 [dev-dependencies]
-cosmic-text = "0.11.2"
+cosmic-text = "0.12"
 serde_json = "1.0.93"
 
 # Enable default features for tests and examples
diff --git a/examples/cosmic_text.rs b/examples/cosmic_text.rs
index 40ceef6a2..1c5d1589c 100644
--- a/examples/cosmic_text.rs
+++ b/examples/cosmic_text.rs
@@ -14,7 +14,7 @@ struct CosmicTextContext {
 impl CosmicTextContext {
     fn new(metrics: Metrics, text: &str, attrs: Attrs, font_system: &mut FontSystem) -> Self {
         let mut buffer = Buffer::new_empty(metrics);
-        buffer.set_size(font_system, f32::INFINITY, f32::INFINITY);
+        buffer.set_size(font_system, None, None);
         buffer.set_text(font_system, text, attrs, Shaping::Advanced);
         Self { buffer }
     }
@@ -26,12 +26,12 @@ impl CosmicTextContext {
         font_system: &mut FontSystem,
     ) -> taffy::Size<f32> {
         // Set width constraint
-        let width_constraint = known_dimensions.width.unwrap_or_else(|| match available_space.width {
-            AvailableSpace::MinContent => 0.0,
-            AvailableSpace::MaxContent => f32::INFINITY,
-            AvailableSpace::Definite(width) => width,
+        let width_constraint = known_dimensions.width.or_else(|| match available_space.width {
+            AvailableSpace::MinContent => Some(0.0),
+            AvailableSpace::MaxContent => None,
+            AvailableSpace::Definite(width) => Some(width),
         });
-        self.buffer.set_size(font_system, width_constraint, f32::INFINITY);
+        self.buffer.set_size(font_system, width_constraint, None);
 
         // Compute layout
         self.buffer.shape_until_scroll(font_system, false);