From 4db87a9643e23e3f0ae91694d89a67c9b566074d Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Mon, 8 Jan 2024 20:38:59 +0100 Subject: [PATCH] desktop: define default fonts --- desktop/Cargo.toml | 2 +- desktop/src/player.rs | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index d53f7a410..af7e1fe6c 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -19,7 +19,7 @@ egui-wgpu = { version = "0.24.1", features = ["winit"] } image = { version = "0.24", features = ["png"] } egui-winit = "0.24.1" fontdb = "0.16" -ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui", "default_font"] } +ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] } ruffle_render = { path = "../render", features = ["clap"] } ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } ruffle_video_software = { path = "../video/software", optional = true } diff --git a/desktop/src/player.rs b/desktop/src/player.rs index 7ad0c0ce5..7256fbe21 100644 --- a/desktop/src/player.rs +++ b/desktop/src/player.rs @@ -11,7 +11,8 @@ use anyhow::anyhow; use ruffle_core::backend::navigator::{OpenURLMode, SocketMode}; use ruffle_core::config::Letterbox; use ruffle_core::{ - LoadBehavior, Player, PlayerBuilder, PlayerEvent, PlayerRuntime, StageAlign, StageScaleMode, + DefaultFont, LoadBehavior, Player, PlayerBuilder, PlayerEvent, PlayerRuntime, StageAlign, + StageScaleMode, }; use ruffle_render::backend::RenderBackend; use ruffle_render::quality::StageQuality; @@ -195,6 +196,34 @@ impl ActivePlayer { opt.parameters.to_owned(), Box::new(on_metadata), ); + + player_lock.set_default_font( + DefaultFont::Serif, + vec![ + "Times New Roman".into(), + "Tinos".into(), + "Liberation Serif".into(), + "DejaVu Serif".into(), + ], + ); + player_lock.set_default_font( + DefaultFont::Sans, + vec![ + "Arial".into(), + "Arimo".into(), + "Liberation Sans".into(), + "DejaVu Sans".into(), + ], + ); + player_lock.set_default_font( + DefaultFont::Typewriter, + vec![ + "Courier New".into(), + "Cousine".into(), + "Liberation Mono".into(), + "DejaVu Sans Mono".into(), + ], + ); } Self { player, executor }