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

Rename on_link_click to on_link

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-07-21 13:12:38 +02:00
parent 54500e61ed
commit 7072c696a0
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
widget/src/markdown.rs
View file

@ -278,7 +278,7 @@ pub fn parse(
/// You can obtain the items with [`parse`].
pub fn view<'a, Message, Renderer>(
items: impl IntoIterator<Item = &'a Item>,
on_link_click: impl Fn(String) -> Message + Copy + 'a,
on_link: impl Fn(String) -> Message + Copy + 'a,
) -> Element<'a, Message, Theme, Renderer>
where
Message: 'a,
@ -286,16 +286,16 @@ where
{
let blocks = items.into_iter().enumerate().map(|(i, item)| match item {
Item::Heading(heading) => {
container(rich_text(heading).on_link_click(on_link_click))
container(rich_text(heading).on_link(on_link))
.padding(padding::top(if i > 0 { 8 } else { 0 }))
.into()
}
Item::Paragraph(paragraph) => {
rich_text(paragraph).on_link_click(on_link_click).into()
rich_text(paragraph).on_link(on_link).into()
}
Item::List { start: None, items } => {
column(items.iter().map(|items| {
row!["•", view(items, on_link_click)].spacing(10).into()
row!["•", view(items, on_link)].spacing(10).into()
}))
.spacing(10)
.into()
@ -304,7 +304,7 @@ where
start: Some(start),
items,
} => column(items.iter().enumerate().map(|(i, items)| {
row![text!("{}.", i as u64 + *start), view(items, on_link_click)]
row![text!("{}.", i as u64 + *start), view(items, on_link)]
.spacing(10)
.into()
}))
@ -314,7 +314,7 @@ where
rich_text(code)
.font(Font::MONOSPACE)
.size(12)
.on_link_click(on_link_click),
.on_link(on_link),
)
.width(Length::Fill)
.padding(10)

15
widget/src/text/rich.rs
View file

@ -37,7 +37,7 @@ pub struct Rich<
align_x: alignment::Horizontal,
align_y: alignment::Vertical,
class: Theme::Class<'a>,
on_link_click: Option<Box<dyn Fn(Link) -> Message + 'a>>,
on_link: Option<Box<dyn Fn(Link) -> Message + 'a>>,
}
impl<'a, Message, Link, Theme, Renderer>
@ -59,7 +59,7 @@ where
align_x: alignment::Horizontal::Left,
align_y: alignment::Vertical::Top,
class: Theme::default(),
on_link_click: None,
on_link: None,
}
}
@ -156,11 +156,8 @@ where
}
/// Sets the message handler for link clicks on the [`Rich`] text.
pub fn on_link_click(
mut self,
on_link_click: impl Fn(Link) -> Message + 'a,
) -> Self {
self.on_link_click = Some(Box::new(on_link_click));
pub fn on_link(mut self, on_link: impl Fn(Link) -> Message + 'a) -> Self {
self.on_link = Some(Box::new(on_link));
self
}
@ -285,7 +282,7 @@ where
shell: &mut Shell<'_, Message>,
_viewport: &Rectangle,
) -> event::Status {
let Some(on_link_click) = self.on_link_click.as_ref() else {
let Some(on_link_click) = self.on_link.as_ref() else {
return event::Status::Ignored;
};
@ -342,7 +339,7 @@ where
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
if self.on_link_click.is_none() {
if self.on_link.is_none() {
return mouse::Interaction::None;
}