mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-29 04:36:47 -06:00
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.
This commit is contained in:
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user