From 7e963fb1a55404e74479314cf15892087d27e006 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Jun 2024 15:02:54 +0200 Subject: [PATCH] Remove workaround for Skia bug on macOS While https://github.com/google/skia/pull/162 has not been merged yet, it's included in skia-safe: https://github.com/rust-skia/rust-skia/pull/986 --- internal/renderers/skia/textlayout.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/renderers/skia/textlayout.rs b/internal/renderers/skia/textlayout.rs index 3417a50f45e..b76c1ebcc1e 100644 --- a/internal/renderers/skia/textlayout.rs +++ b/internal/renderers/skia/textlayout.rs @@ -9,7 +9,6 @@ use i_slint_core::graphics::FontRequest; use i_slint_core::items::{TextHorizontalAlignment, TextVerticalAlignment}; use i_slint_core::lengths::{LogicalLength, ScaleFactor}; use i_slint_core::{items, Color}; -use skia_safe::FontMgr; use super::itemrenderer::to_skia_color; use super::{PhysicalLength, PhysicalPoint, PhysicalRect, PhysicalSize}; @@ -34,7 +33,6 @@ thread_local! { let font_mgr = skia_safe::FontMgr::new(); let type_face_font_provider = skia_safe::textlayout::TypefaceFontProvider::new(); let mut font_collection = skia_safe::textlayout::FontCollection::new(); - font_collection.set_default_font_manager(FontMgr::new(), None); // FontCollection first looks up in the dynamic font manager and then the asset font manager. If the // family is empty, the default font manager will match against the system default. We want that behavior, // and only if the family is not present in the system, then we want to fall back to the assert font manager