diff options
| author | fiaxh <git@lightrise.org> | 2022-01-23 19:32:28 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2022-01-23 19:50:01 +0100 |
| commit | 5089e9cad7180ec29b642db7be990dcaf0531299 (patch) | |
| tree | 804195aec16696453371cbd710ec712638174a6c /main/src | |
| parent | b123800f26e78df5b4e01857bc5c2ac6a954ba5b (diff) | |
| download | dino-5089e9cad7180ec29b642db7be990dcaf0531299.tar.gz dino-5089e9cad7180ec29b642db7be990dcaf0531299.zip | |
Remove color from /me name, remove use_markup from sender label
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/ui/conversation_content_view/conversation_item_skeleton.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/conversation_content_view/message_widget.vala | 4 | ||||
| -rw-r--r-- | main/src/ui/global_search.vala | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala index a14e9019..077440d6 100644 --- a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala @@ -216,7 +216,7 @@ public class ItemMetaDataHeader : Box { } private void update_name_label() { - name_label.label = Markup.escape_text(Util.get_participant_display_name(stream_interactor, conversation, item.jid)); + name_label.label = Util.get_participant_display_name(stream_interactor, conversation, item.jid); } private void update_received_mark() { diff --git a/main/src/ui/conversation_content_view/message_widget.vala b/main/src/ui/conversation_content_view/message_widget.vala index ead9a570..8868a8ce 100644 --- a/main/src/ui/conversation_content_view/message_widget.vala +++ b/main/src/ui/conversation_content_view/message_widget.vala @@ -205,9 +205,7 @@ public class MessageItemWidget : SizeRequestBin { if (message.body.has_prefix("/me ")) { string display_name = Util.get_participant_display_name(stream_interactor, conversation, message.from); - string color = Util.get_name_hex_color(stream_interactor, conversation.account, message.real_jid ?? message.from, Util.is_dark_theme(label)); - markup_text = @"<span color=\"#$(color)\">$(Markup.escape_text(display_name))</span> " + markup_text; - theme_dependent = true; + markup_text = @"<i><b>$(Markup.escape_text(display_name))</b> " + markup_text + "</i>"; } int only_emoji_count = Util.get_only_emoji_count(markup_text); diff --git a/main/src/ui/global_search.vala b/main/src/ui/global_search.vala index 289dd072..30f8f65a 100644 --- a/main/src/ui/global_search.vala +++ b/main/src/ui/global_search.vala @@ -261,7 +261,7 @@ public class GlobalSearch : Overlay { grid.attach(image, 0, 0, 1, 2); string display_name = Util.get_participant_display_name(stream_interactor, item.conversation, item.jid); - Label name_label = new Label(display_name) { ellipsize=EllipsizeMode.END, use_markup=true, xalign=0, visible=true }; + Label name_label = new Label(display_name) { ellipsize=EllipsizeMode.END, xalign=0, visible=true }; name_label.attributes = new AttrList(); name_label.attributes.insert(attr_weight_new(Weight.BOLD)); grid.attach(name_label, 1, 0, 1, 1); |