vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

message-text: Trim spaces at the end of labels

Browse source 
This is a dirty hack but prevents some criticals and bugs when
displaying them.
This commit is contained in:
Kévin Commaille 2023-05-30 13:16:03 +02:00
parent 0ca1959885
commit c3d77b792a
No known key found for this signature in database
GPG key ID: 29A48C1F03620416
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/session/view/content/room_history/message_row/text.rs
View file

@ -189,6 +189,10 @@ impl MessageText {
WithMentions::No => (false, (text, Vec::new())),
};
// FIXME: This should not be necessary but spaces at the end of the string cause
// criticals.
let label = label.trim_end_matches(' ');
if widgets.is_empty() {
let child = if let Some(child) = self.child().and_downcast::<gtk::Label>() {
child
@ -198,7 +202,7 @@ impl MessageText {
child
};
if EMOJI_REGEX.is_match(&label) {
if EMOJI_REGEX.is_match(label) {
child.add_css_class("emoji");
} else {
child.remove_css_class("emoji");
@ -211,7 +215,7 @@ impl MessageText {
});
child.set_use_markup(linkified);
child.set_label(&label);
child.set_label(label);
} else {
let child = if let Some(child) = self.child().and_downcast::<LabelWithWidgets>() {
child
@ -223,7 +227,7 @@ impl MessageText {
child.set_ellipsize(ellipsize);
child.set_use_markup(true);
child.set_label(Some(label));
child.set_label(Some(label.to_owned()));
child.set_widgets(widgets);
}
}
@ -523,6 +527,9 @@ fn new_label() -> gtk::Label {
}
fn create_label_for_html(label: &str, room: &Room, ellipsize: bool, cut_text: bool) -> gtk::Widget {
// FIXME: This should not be necessary but spaces at the end of the string cause
// criticals.
let label = label.trim_end_matches(' ');
let (label, widgets) = extract_mentions(label, room);
let mut label = hoverify_links(&label);
if ellipsize && cut_text && !label.ends_with('…') && !label.ends_with("...") {