From baba5b7d4db489be7609f1679ee7b6985a1674a0 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 12 Oct 2026 12:28:55 +0000 Subject: [PATCH] Integration: the CJK style dialog's composite-font menu takes #466's FontPick #466 makes font_menu_body return a FontPick (family, and the style when a style row was picked); next's CJK style dialog (ruby/kenten fonts) still expected a family string. It sets the family and, when picked, the style, as the PR's own callers do. --- crates/ui-egui/src/dialogs/style_cjk.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/dialogs/style_cjk.rs b/crates/ui-egui/src/dialogs/style_cjk.rs index 38687340b..674cf44a7 100644 --- a/crates/ui-egui/src/dialogs/style_cjk.rs +++ b/crates/ui-egui/src/dialogs/style_cjk.rs @@ -158,7 +158,10 @@ fn font_fields(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog, cf: &Char cf.set(d, style_key, json!("")); } if let Some(f) = crate::panels::font_menu_body(app, ui, &menu, &fam, 200.0) { - cf.set(d, fam_key, json!(f)); + cf.set(d, fam_key, json!(f.family)); + if let Some(style) = f.style { + cf.set(d, style_key, json!(style)); + } } }); });