anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove color from /me name, remove use_markup from sender label

Browse source
This commit is contained in:
fiaxh 2022-01-23 19:32:28 +01:00
parent b123800f26
commit 5089e9cad7
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/data/conversation_content_view/item_metadata_header.ui
View file

@ -5,7 +5,6 @@
<property name="orientation">horizontal</property> <property name="orientation">horizontal</property>
<child> <child>
<object class="GtkLabel" id="name_label"> <object class="GtkLabel" id="name_label">
<property name="use_markup">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="valign">baseline</property> <property name="valign">baseline</property>

2
main/src/ui/conversation_content_view/conversation_item_skeleton.vala
View file

@ -216,7 +216,7 @@ public class ItemMetaDataHeader : Box {
} }
private void update_name_label() { 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() { private void update_received_mark() {

4
main/src/ui/conversation_content_view/message_widget.vala
View file

@ -205,9 +205,7 @@ public class MessageItemWidget : SizeRequestBin {
if (message.body.has_prefix("/me ")) { if (message.body.has_prefix("/me ")) {
string display_name = Util.get_participant_display_name(stream_interactor, conversation, message.from); 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 = @"<i><b>$(Markup.escape_text(display_name))</b> " + markup_text + "</i>";
markup_text = @"<span color=\"#$(color)\">$(Markup.escape_text(display_name))</span> " + markup_text;
theme_dependent = true;
} }
int only_emoji_count = Util.get_only_emoji_count(markup_text); int only_emoji_count = Util.get_only_emoji_count(markup_text);

2
main/src/ui/global_search.vala
View file

@ -261,7 +261,7 @@ public class GlobalSearch : Overlay {
grid.attach(image, 0, 0, 1, 2); grid.attach(image, 0, 0, 1, 2);
string display_name = Util.get_participant_display_name(stream_interactor, item.conversation, item.jid); 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 = new AttrList();
name_label.attributes.insert(attr_weight_new(Weight.BOLD)); name_label.attributes.insert(attr_weight_new(Weight.BOLD));
grid.attach(name_label, 1, 0, 1, 1); grid.attach(name_label, 1, 0, 1, 1);