Switch femtovg branch

Author: expenses

internal/renderers/femtovg/Cargo.toml

@@ -34,7 +34,7 @@ derive_more = { workspace = true }
 lyon_path = "1.0"
 pin-weak = "1"
 scoped-tls-hkt = "0.1"
-femtovg = { git = "https://github.com/slint-ui/femtovg", branch = "simon/draw-glyphs" }
+femtovg = { git = "https://github.com/slint-ui/femtovg", branch = "simon/draw-glyph-run" }
 ttf-parser = { workspace = true }
 unicode-script = { version = "0.5.4" }                                                  # Use the same version was femtovg's rustybuzz, to avoid duplicate crates
 imgref = { version = "1.6.1" }

internal/renderers/femtovg/itemrenderer.rs

@@ -215,22 +215,21 @@ fn draw_glyphs<R: femtovg::Renderer + TextureImporter>(
                         femtovg::PositionedGlyph {
                             x: glyph.x,
                             y: glyph.y + layout.y_offset,
-                            font_id,
                             glyph_id: glyph.id,
                         }
                     });
 
                     match brush.stroke {
                         Some(i_slint_core::items::TextStrokeStyle::Outside) => {
-                            canvas.stroke_glyphs(glyphs.clone(), paint).unwrap();
-                            canvas.fill_glyphs(glyphs, paint).unwrap();
+                            canvas.stroke_glyph_run(font_id, glyphs.clone(), paint).unwrap();
+                            canvas.fill_glyph_run(font_id, glyphs, paint).unwrap();
                         }
                         Some(i_slint_core::items::TextStrokeStyle::Center) => {
-                            canvas.fill_glyphs(glyphs.clone(), paint).unwrap();
-                            canvas.stroke_glyphs(glyphs, paint).unwrap();
+                            canvas.fill_glyph_run(font_id, glyphs.clone(), paint).unwrap();
+                            canvas.stroke_glyph_run(font_id, glyphs, paint).unwrap();
                         }
                         None => {
-                            canvas.fill_glyphs(glyphs, paint).unwrap();
+                            canvas.fill_glyph_run(font_id, glyphs, paint).unwrap();
                         }
                     }
                 }