From d5b7ac740e9733acdd3a2386abb776c768eb989d Mon Sep 17 00:00:00 2001 From: robtfm <50659922+robtfm@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:21:49 +0100 Subject: [PATCH] ci --- crates/system_ui/src/chat.rs | 4 +--- crates/system_ui/src/friends.rs | 2 +- crates/ui_core/src/button.rs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/system_ui/src/chat.rs b/crates/system_ui/src/chat.rs index bbdfef1c..db90823d 100644 --- a/crates/system_ui/src/chat.rs +++ b/crates/system_ui/src/chat.rs @@ -26,9 +26,7 @@ use ui_core::{ ui_actions::{Click, DataChanged, HoverEnter, HoverExit, On}, }; -use crate::friends::{ - resolve_addresses, show_popups, update_conversations, update_friends, -}; +use crate::friends::{resolve_addresses, show_popups, update_conversations, update_friends}; use super::SystemUiRoot; diff --git a/crates/system_ui/src/friends.rs b/crates/system_ui/src/friends.rs index 8d796c76..4110e284 100644 --- a/crates/system_ui/src/friends.rs +++ b/crates/system_ui/src/friends.rs @@ -114,7 +114,7 @@ pub fn update_friends( name }; - let button_content = commands.spawn_template(&dui, "direct-chat-button", DuiProps::default().with_prop("name", format!("{short_name}")).with_prop("close", On::::new(move | + let button_content = commands.spawn_template(&dui, "direct-chat-button", DuiProps::default().with_prop("name", short_name).with_prop("close", On::::new(move | mut tab_manager: TabManager, tab: Query>, buttons: Query<(Entity, &PrivateChat)>, diff --git a/crates/ui_core/src/button.rs b/crates/ui_core/src/button.rs index 11ab56c8..82633d5c 100644 --- a/crates/ui_core/src/button.rs +++ b/crates/ui_core/src/button.rs @@ -158,7 +158,7 @@ impl DuiTemplate for DuiButtonTemplate { (Some(label), _) => ctx.render_template( commands, "button-base-text", - DuiProps::new().with_prop("label", format!("{label}")), + DuiProps::new().with_prop("label", label), ), (None, Some(img)) => { let mut props = DuiProps::new().with_prop("img", img);