Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Fix font fallbacks (#26258)

Browse source 
Release Notes:

- N/A
This commit is contained in:
0x2CA 2025-03-07 10:14:53 +08:00 • committed by GitHub
parent 8422a81d88
commit 09c51f9641
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/assistant2/src/active_thread.rs
View file

@ -173,6 +173,8 @@ impl ActiveThread {
text_style.refine(&TextStyleRefinement { text_style.refine(&TextStyleRefinement {
font_family: Some(theme_settings.ui_font.family.clone()), font_family: Some(theme_settings.ui_font.family.clone()),
font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
font_features: Some(theme_settings.ui_font.features.clone()),
font_size: Some(ui_font_size.into()), font_size: Some(ui_font_size.into()),
color: Some(cx.theme().colors().text), color: Some(cx.theme().colors().text),
..Default::default() ..Default::default()
@ -207,6 +209,8 @@ impl ActiveThread {
}, },
text: Some(TextStyleRefinement { text: Some(TextStyleRefinement {
font_family: Some(theme_settings.buffer_font.family.clone()), font_family: Some(theme_settings.buffer_font.family.clone()),
font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
font_features: Some(theme_settings.buffer_font.features.clone()),
font_size: Some(buffer_font_size.into()), font_size: Some(buffer_font_size.into()),
..Default::default() ..Default::default()
}), }),
@ -214,6 +218,8 @@ impl ActiveThread {
}, },
inline_code: TextStyleRefinement { inline_code: TextStyleRefinement {
font_family: Some(theme_settings.buffer_font.family.clone()), font_family: Some(theme_settings.buffer_font.family.clone()),
font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
font_features: Some(theme_settings.buffer_font.features.clone()),
font_size: Some(buffer_font_size.into()), font_size: Some(buffer_font_size.into()),
background_color: Some(colors.editor_foreground.opacity(0.1)), background_color: Some(colors.editor_foreground.opacity(0.1)),
..Default::default() ..Default::default()

1
crates/assistant2/src/message_editor.rs
View file

@ -389,6 +389,7 @@ impl Render for MessageEditor {
let text_style = TextStyle { let text_style = TextStyle {
color: cx.theme().colors().text, color: cx.theme().colors().text,
font_family: settings.ui_font.family.clone(), font_family: settings.ui_font.family.clone(),
font_fallbacks: settings.ui_font.fallbacks.clone(),
font_features: settings.ui_font.features.clone(), font_features: settings.ui_font.features.clone(),
font_size: font_size.into(), font_size: font_size.into(),
font_weight: settings.ui_font.weight, font_weight: settings.ui_font.weight,