fix clippy

Author: antouhou

Cargo.lock

@@ -16,7 +16,7 @@ default = []
 serialization = ["dep:serde"]
 
 [dependencies]
-cosmic-text = "0.14"
+cosmic-text = "0.16.0"
 ahash = "0.8.12"
 smol_str = "0.3"
 serde = { version = "1.0.219", features = ["derive"], optional = true }

Cargo.toml

@@ -133,7 +133,9 @@ impl<'a> App<'a> {
                 horizontal_alignment: HorizontalTextAlignment::Start,
                 vertical_alignment: VerticalTextAlignment::Start,
                 wrap: Some(TextWrap::Wrap),
-                font_family: FontFamily::SansSerif,
+                font_family: FontFamily::Name("Arial".into()),
+                weight: protextinator::style::Weight::NORMAL,
+                letter_spacing: None,
             };
 
             // Create or update the text state
@@ -191,6 +193,8 @@ impl<'a> App<'a> {
                     vertical_alignment: VerticalTextAlignment::Start,
                     wrap: Some(TextWrap::Wrap),
                     font_family: FontFamily::Serif,
+                    weight: protextinator::style::Weight::NORMAL,
+                    letter_spacing: None,
                 };
 
                 // Create or update the stats text state
@@ -262,11 +266,11 @@ impl<'a> App<'a> {
                     }
                     let upload_time = t_upload_start.elapsed();
 
-                    println!(
-                        "rasterize: {} µs, load_texture: {} µs",
-                        raster_time.as_micros(),
-                        upload_time.as_micros()
-                    );
+                    // println!(
+                    //     "rasterize: {} µs, load_texture: {} µs",
+                    //     raster_time.as_micros(),
+                    //     upload_time.as_micros()
+                    // );
 
                     // TODO: cache shapes
                     let text_shape_id = renderer.add_shape(

examples/text.rs

@@ -1,6 +1,6 @@
 use crate::byte_cursor::ByteCursor;
 use crate::math::{Point, Rect, Size};
-use crate::style::{TextStyle, TextWrap, VerticalTextAlignment};
+use crate::style::{FontFamily, TextStyle, TextWrap, VerticalTextAlignment};
 use crate::text_params::TextParams;
 use cosmic_text::{Attrs, Buffer, Cursor, Edit, Editor, FontSystem, Shaping};
 
@@ -120,13 +120,15 @@ pub(crate) fn update_buffer(
     params: &TextParams,
     buffer: &mut Buffer,
     font_system: &mut FontSystem,
+    font_family: &FontFamily,
 ) -> Size {
     let text_style = &params.style();
     let font_color = text_style.font_color;
     let horizontal_alignment = text_style.horizontal_alignment;
     let wrap = text_style.wrap.unwrap_or_default();
     let text_area_size = params.size();
-    let font_family = &text_style.font_family;
+    let weight = text_style.weight;
+    let letter_spacing = text_style.letter_spacing;
     let metadata = params.metadata();
     let old_scroll = buffer.scroll();
 
@@ -140,14 +142,37 @@ pub(crate) fn update_buffer(
     // Apply scale for shaping to device pixels
     buffer.set_size(font_system, Some(text_area_size.x * scale_factor), None);
 
+    // match font_family {
+    //     FontFamily::Name(name) => {
+    //         println!("Using font family: {:?}", name);
+    //     }
+    //     FontFamily::SansSerif => {}
+    //     FontFamily::Serif => {}
+    //     FontFamily::Monospace => {}
+    //     FontFamily::Cursive => {}
+    //     FontFamily::Fantasy => {}
+    // }
+
+    if params.original_text() == "Filobus" {
+        println!("Font family: {:?}", font_family);
+    }
+
+    let mut attrs = Attrs::new()
+        .color(font_color.into())
+        .family(font_family.to_fontdb_family())
+        .weight(weight.into())
+        .metadata(metadata);
+
+    if let Some(letter_spacing) = letter_spacing {
+        attrs = attrs.letter_spacing(letter_spacing.0 * scale_factor);
+    }
+
     buffer.set_text(
         font_system,
         params.text_for_internal_use(),
-        &Attrs::new()
-            .color(font_color.into())
-            .family(font_family.to_fontdb_family())
-            .metadata(metadata),
+        &attrs,
         Shaping::Advanced,
+        None,
     );
 
     let mut buffer_measurement = Size::default();
@@ -162,12 +187,14 @@ pub(crate) fn update_buffer(
                 None,
                 // TODO: what is the default tab width? Make it configurable?
                 2,
+                cosmic_text::Hinting::Enabled,
             )
             .iter()
         {
-            buffer_measurement.y += layout_line
+            let line_height = layout_line
                 .line_height_opt
                 .unwrap_or(text_style.line_height_pt() * scale_factor);
+            buffer_measurement.y += line_height;
             buffer_measurement.x = buffer_measurement.x.max(layout_line.w);
         }
     }
@@ -187,6 +214,7 @@ pub(crate) fn update_buffer(
                 None,
                 // TODO: what is the default tab width? Make it configurable?
                 2,
+                cosmic_text::Hinting::Enabled,
             );
         }
     }