mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 12:19:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix hover popover font fallbacks (#21945)

Browse source 
Closes #21848

Release Notes:

- Fixed Hover Popover Font Callbacks
This commit is contained in:
0x2CA 2024-12-13 10:30:25 +08:00 committed by GitHub
parent e0cbbf8d06
commit b38e9e44d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/editor/src/hover_popover.rs
View file

@ -359,6 +359,7 @@ fn show_hover(
let mut base_text_style = cx.text_style(); let mut base_text_style = cx.text_style();
base_text_style.refine(&TextStyleRefinement { base_text_style.refine(&TextStyleRefinement {
font_family: Some(settings.ui_font.family.clone()), font_family: Some(settings.ui_font.family.clone()),
font_fallbacks: settings.ui_font.fallbacks.clone(),
font_size: Some(settings.ui_font_size.into()), font_size: Some(settings.ui_font_size.into()),
color: Some(cx.theme().colors().editor_foreground), color: Some(cx.theme().colors().editor_foreground),
background_color: Some(gpui::transparent_black()), background_color: Some(gpui::transparent_black()),
@ -547,11 +548,14 @@ async fn parse_blocks(
.new_view(|cx| { .new_view(|cx| {
let settings = ThemeSettings::get_global(cx); let settings = ThemeSettings::get_global(cx);
let ui_font_family = settings.ui_font.family.clone(); let ui_font_family = settings.ui_font.family.clone();
let ui_font_fallbacks = settings.ui_font.fallbacks.clone();
let buffer_font_family = settings.buffer_font.family.clone(); let buffer_font_family = settings.buffer_font.family.clone();
let buffer_font_fallbacks = settings.buffer_font.fallbacks.clone();
let mut base_text_style = cx.text_style(); let mut base_text_style = cx.text_style();
base_text_style.refine(&TextStyleRefinement { base_text_style.refine(&TextStyleRefinement {
font_family: Some(ui_font_family.clone()), font_family: Some(ui_font_family.clone()),
font_fallbacks: ui_font_fallbacks,
color: Some(cx.theme().colors().editor_foreground), color: Some(cx.theme().colors().editor_foreground),
..Default::default() ..Default::default()
}); });
@ -562,6 +566,7 @@ async fn parse_blocks(
inline_code: TextStyleRefinement { inline_code: TextStyleRefinement {
background_color: Some(cx.theme().colors().background), background_color: Some(cx.theme().colors().background),
font_family: Some(buffer_font_family), font_family: Some(buffer_font_family),
font_fallbacks: buffer_font_fallbacks,
..Default::default() ..Default::default()
}, },
rule_color: cx.theme().colors().border, rule_color: cx.theme().colors().border,