From a6494e8ed5378cb0ca5a3d20a918a76f246148aa Mon Sep 17 00:00:00 2001 From: jilv220 Date: Wed, 21 Feb 2024 13:11:29 -0800 Subject: [PATCH] fix(audio): title/artists truncate now works on non-english utf8 languages --- cosmic-applet-audio/src/main.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs index cbd5f79d..307f331d 100644 --- a/cosmic-applet-audio/src/main.rs +++ b/cosmic-applet-audio/src/main.rs @@ -701,8 +701,10 @@ impl cosmic::Application for Audio { } let title = if let Some(title) = s.title.as_ref() { - if title.len() > 15 { - format!("{title:15}...") + if title.chars().count() > 15 { + let mut title_trunc = title.chars().take(15).collect::(); + title_trunc.push_str("..."); + title_trunc } else { title.to_string() } @@ -712,8 +714,10 @@ impl cosmic::Application for Audio { let artists = if let Some(artists) = s.artists.as_ref() { let artists = artists.join(", "); - if artists.len() > 15 { - format!("{artists:15}...") + if artists.chars().count() > 15 { + let mut artists_trunc = artists.chars().take(15).collect::(); + artists_trunc.push_str("..."); + artists_trunc } else { artists }