diff options
Diffstat (limited to 'main/src/ui/conversation_content_view')
| -rw-r--r-- | main/src/ui/conversation_content_view/conversation_item_skeleton.vala | 6 | ||||
| -rw-r--r-- | main/src/ui/conversation_content_view/message_widget.vala | 5 |
2 files changed, 5 insertions, 6 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 d8cf469c..5bf6b0ae 100644 --- a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala @@ -164,7 +164,7 @@ public class ConversationItemSkeleton : Plugins.ConversationItemWidgetInterface, if (conversation.encryption != Encryption.NONE) { encryption_image.icon_name = "dino-changes-allow-symbolic"; encryption_image.tooltip_text = Util.string_if_tooltips_active(_("Unencrypted")); - Util.force_error_color(encryption_image); + encryption_image.add_css_class("error"); encryption_image.visible = true; } else if (conversation.encryption == Encryption.NONE) { encryption_image.icon_name = null; @@ -203,8 +203,8 @@ public class ConversationItemSkeleton : Plugins.ConversationItemWidgetInterface, break; case Message.Marked.WONTSEND: received_image.icon_name = "dino-dialog-warning-symbolic"; - Util.force_error_color(received_image); - Util.force_error_color(time_label); + received_image.add_css_class("error"); + time_label.add_css_class("error"); string error_text = Util.string_if_tooltips_active(_("Unable to send message")); received_image.tooltip_text = error_text; time_label.tooltip_text = error_text; diff --git a/main/src/ui/conversation_content_view/message_widget.vala b/main/src/ui/conversation_content_view/message_widget.vala index 7d441657..25d3775b 100644 --- a/main/src/ui/conversation_content_view/message_widget.vala +++ b/main/src/ui/conversation_content_view/message_widget.vala @@ -186,7 +186,8 @@ public class MessageMetaItem : ContentMetaItem { } } else if (message.direction == Message.DIRECTION_SENT && message.marked == Message.Marked.ERROR) { // Append "delivery failed" if there was a server error - string error_color = Util.rgba_to_hex(Util.get_label_pango_color(label, "@error_color")); + // TODO: Use a dedicated label, not appended text + string error_color = Util.rgba_to_hex(Util.get_label_pango_color(label, "error_color")); markup_text += " <span size='small' color='%s'>%s</span>".printf(error_color, _("delivery failed")); theme_dependent = true; additional_info = AdditionalInfo.DELIVERY_FAILED; @@ -337,8 +338,6 @@ public class MessageItemEditMode : Box { [GtkChild] public unowned Frame frame; construct { - Util.force_css(frame, "* { border-radius: 3px; padding: 0px 7px; }"); - EmojiChooser chooser = new EmojiChooser(); chooser.emoji_picked.connect((emoji) => { chat_text_view.text_view.buffer.insert_at_cursor(emoji, emoji.data.length); |