leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2999 from kbjr/markdown-fonts

Browse source 
Add additional settings to control the fonts used for markdown rendering
This commit is contained in:
Héctor 2025-11-29 06:47:05 +01:00 • committed by GitHub
commit cdf1d3c666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
widget/src/markdown.rs
View file

@ -313,7 +313,7 @@ impl Span {
let span = span(text.clone()).strikethrough(*strikethrough); let span = span(text.clone()).strikethrough(*strikethrough);
let span = if *code { let span = if *code {
span.font(Font::MONOSPACE) span.font(style.inline_code_font)
.color(style.inline_code_color) .color(style.inline_code_color)
.background(style.inline_code_highlight.background) .background(style.inline_code_highlight.background)
.border(style.inline_code_highlight.border) .border(style.inline_code_highlight.border)
@ -330,10 +330,10 @@ impl Span {
} else { } else {
font::Style::Normal font::Style::Normal
}, },
..Font::default() ..style.font
}) })
} else { } else {
span span.font(style.font)
}; };
if let Some(link) = link.as_ref() { if let Some(link) = link.as_ref() {
@ -1046,12 +1046,18 @@ impl From<Theme> for Settings {
/// The text styling of some Markdown rendering in [`view`]. /// The text styling of some Markdown rendering in [`view`].
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
pub struct Style { pub struct Style {
/// The [`Font`] to be applied to basic text.
pub font: Font,
/// The [`Highlight`] to be applied to the background of inline code. /// The [`Highlight`] to be applied to the background of inline code.
pub inline_code_highlight: Highlight, pub inline_code_highlight: Highlight,
/// The [`Padding`] to be applied to the background of inline code. /// The [`Padding`] to be applied to the background of inline code.
pub inline_code_padding: Padding, pub inline_code_padding: Padding,
/// The [`Color`] to be applied to inline code. /// The [`Color`] to be applied to inline code.
pub inline_code_color: Color, pub inline_code_color: Color,
/// The [`Font`] to be applied to inline code.
pub inline_code_font: Font,
/// The [`Font`] to be applied to code blocks.
pub code_block_font: Font,
/// The [`Color`] to be applied to links. /// The [`Color`] to be applied to links.
pub link_color: Color, pub link_color: Color,
} }
@ -1060,12 +1066,15 @@ impl Style {
/// Creates a new [`Style`] from the given [`theme::Palette`]. /// Creates a new [`Style`] from the given [`theme::Palette`].
pub fn from_palette(palette: theme::Palette) -> Self { pub fn from_palette(palette: theme::Palette) -> Self {
Self { Self {
font: Font::default(),
inline_code_padding: padding::left(1).right(1), inline_code_padding: padding::left(1).right(1),
inline_code_highlight: Highlight { inline_code_highlight: Highlight {
background: color!(0x111111).into(), background: color!(0x111111).into(),
border: border::rounded(4), border: border::rounded(4),
}, },
inline_code_color: Color::WHITE, inline_code_color: Color::WHITE,
inline_code_font: Font::MONOSPACE,
code_block_font: Font::MONOSPACE,
link_color: palette.primary, link_color: palette.primary,
} }
} }
@ -1351,7 +1360,7 @@ where
container(column(lines.iter().map(|line| { container(column(lines.iter().map(|line| {
rich_text(line.spans(settings.style)) rich_text(line.spans(settings.style))
.on_link_click(on_link_click.clone()) .on_link_click(on_link_click.clone())
.font(Font::MONOSPACE) .font(settings.style.code_block_font)
.size(settings.code_size) .size(settings.code_size)
.into() .into()
}))) })))