mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 22:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

editor: Render documentation popovers using UI font (#17761)

Browse source 
This PR updates the documentation popovers to render non-code using the
UI font:

<img width="603" alt="Screenshot 2024-09-12 at 11 10 46 AM"
src="https://github.com/user-attachments/assets/c5be0676-0f0f-4ff6-8a96-76b44684e1cf">

<img width="347" alt="Screenshot 2024-09-12 at 11 21 12 AM"
src="https://github.com/user-attachments/assets/842ba922-9837-45c1-9cf2-846fe8362f99">

Requested by @davidbarsky.

Release Notes:

- Changed documentation popovers to render Markdown prose using the UI
font instead of the buffer font. Code blocks still using the buffer
font.
This commit is contained in:
Marshall Bowers 2024-09-12 11:32:24 -04:00 committed by GitHub
parent b341079d8a
commit 0043b0d957
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -518,19 +518,22 @@ async fn parse_blocks(
let rendered_block = cx let rendered_block = cx
.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 buffer_font_family = settings.buffer_font.family.clone(); let buffer_font_family = settings.buffer_font.family.clone();
let mut base_style = cx.text_style();
base_style.refine(&TextStyleRefinement { let mut base_text_style = cx.text_style();
font_family: Some(buffer_font_family.clone()), base_text_style.refine(&TextStyleRefinement {
font_family: Some(ui_font_family.clone()),
color: Some(cx.theme().colors().editor_foreground), color: Some(cx.theme().colors().editor_foreground),
..Default::default() ..Default::default()
}); });
let markdown_style = MarkdownStyle { let markdown_style = MarkdownStyle {
base_text_style: base_style, base_text_style,
code_block: StyleRefinement::default().mt(rems(1.)).mb(rems(1.)), code_block: StyleRefinement::default().my(rems(1.)).font_buffer(cx),
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),
..Default::default() ..Default::default()
}, },
rule_color: Color::Muted.color(cx), rule_color: Color::Muted.color(cx),