Changed label and text to be generic over static strings and owned strings
This commit is contained in:
parent
ebf1da1de8
commit
b500ed3171
24 changed files with 60 additions and 72 deletions
|
@ -11,8 +11,8 @@ enum Button {}
|
|||
|
||||
pub fn render_user_notification<V: View, A: Action + Clone>(
|
||||
user: Arc<User>,
|
||||
title: &str,
|
||||
body: Option<&str>,
|
||||
title: &'static str,
|
||||
body: Option<&'static str>,
|
||||
dismiss_action: A,
|
||||
buttons: Vec<(&'static str, Box<dyn Action>)>,
|
||||
cx: &mut RenderContext<V>,
|
||||
|
@ -83,7 +83,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
|
|||
.named("contact notification header"),
|
||||
)
|
||||
.with_children(body.map(|body| {
|
||||
Label::new(body.to_string(), theme.body_message.text.clone())
|
||||
Label::new(body, theme.body_message.text.clone())
|
||||
.contained()
|
||||
.with_style(theme.body_message.container)
|
||||
.boxed()
|
||||
|
@ -97,7 +97,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
|
|||
|(ix, (message, action))| {
|
||||
MouseEventHandler::<Button>::new(ix, cx, |state, _| {
|
||||
let button = theme.button.style_for(state, false);
|
||||
Label::new(message.to_string(), button.text.clone())
|
||||
Label::new(message, button.text.clone())
|
||||
.contained()
|
||||
.with_style(button.container)
|
||||
.boxed()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue