me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use dark background for inline code in markdown widget

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-07-28 13:15:04 +02:00
parent ddcf02f9d0
commit 4dc7b9b961
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/markdown/src/main.rs
View file

@ -28,11 +28,8 @@ impl Markdown {
( (
Self { Self {
content: text_editor::Content::with_text(INITIAL_CONTENT), content: text_editor::Content::with_text(INITIAL_CONTENT),
items: markdown::parse( items: markdown::parse(INITIAL_CONTENT, &theme.palette())
INITIAL_CONTENT, .collect(),
theme.extended_palette(),
)
.collect(),
theme, theme,
}, },
widget::focus_next(), widget::focus_next(),
@ -49,7 +46,7 @@ impl Markdown {
if is_edit { if is_edit {
self.items = markdown::parse( self.items = markdown::parse(
&self.content.text(), &self.content.text(),
self.theme.extended_palette(), &self.theme.palette(),
) )
.collect(); .collect();
} }

14
widget/src/markdown.rs
View file

@ -8,9 +8,8 @@ use crate::core::border;
use crate::core::font::{self, Font}; use crate::core::font::{self, Font};
use crate::core::padding; use crate::core::padding;
use crate::core::text::Background; use crate::core::text::Background;
use crate::core::theme::palette; use crate::core::theme::{self, Theme};
use crate::core::theme::Theme; use crate::core::{self, color, Color, Element, Length, Pixels};
use crate::core::{self, Element, Length, Pixels};
use crate::{column, container, rich_text, row, scrollable, span, text}; use crate::{column, container, rich_text, row, scrollable, span, text};
pub use pulldown_cmark::HeadingLevel; pub use pulldown_cmark::HeadingLevel;
@ -39,7 +38,7 @@ pub enum Item {
/// Parse the given Markdown content. /// Parse the given Markdown content.
pub fn parse<'a>( pub fn parse<'a>(
markdown: &'a str, markdown: &'a str,
palette: &'a palette::Extended, palette: &'a theme::Palette,
) -> impl Iterator<Item = Item> + 'a { ) -> impl Iterator<Item = Item> + 'a {
struct List { struct List {
start: Option<u64>, start: Option<u64>,
@ -250,7 +249,7 @@ pub fn parse<'a>(
}; };
let span = if let Some(link) = link.as_ref() { let span = if let Some(link) = link.as_ref() {
span.color(palette.primary.base.color).link(link.clone()) span.color(palette.primary).link(link.clone())
} else { } else {
span span
}; };
@ -262,13 +261,14 @@ pub fn parse<'a>(
pulldown_cmark::Event::Code(code) if !metadata && !table => { pulldown_cmark::Event::Code(code) if !metadata && !table => {
let span = span(code.into_string()) let span = span(code.into_string())
.font(Font::MONOSPACE) .font(Font::MONOSPACE)
.color(Color::WHITE)
.background(Background { .background(Background {
color: palette.background.weak.color, color: color!(0x111111),
border: border::rounded(2), border: border::rounded(2),
}); });
let span = if let Some(link) = link.as_ref() { let span = if let Some(link) = link.as_ref() {
span.color(palette.primary.base.color).link(link.clone()) span.color(palette.primary).link(link.clone())
} else { } else {
span span
}; };