From 3d5cfb78eaf320f69a845cbe86c27c7310e25a7b Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 25 Aug 2021 16:42:35 +0200 Subject: [PATCH] Use `Text` in chat panel Co-Authored-By: Nathan Sobo --- zed/assets/themes/_base.toml | 2 +- zed/src/chat_panel.rs | 4 ++-- zed/src/theme.rs | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zed/assets/themes/_base.toml b/zed/assets/themes/_base.toml index 56dbbdaaf10bdbe8bbf079867957827f8cc84f08..6fed76f81a90b8952fb3e111cce2489d033abe95 100644 --- a/zed/assets/themes/_base.toml +++ b/zed/assets/themes/_base.toml @@ -23,7 +23,7 @@ color = "$text.2" color = "$text.0" [chat_panel.message] -text = "$text.0" +body = "$text.0" [selector] background = "$surface.2" diff --git a/zed/src/chat_panel.rs b/zed/src/chat_panel.rs index 7788ab2eba782dc74b8b14ffcfa95f50ae9bcc1f..30ce44b82909fb61343936dbbdd719925053ec12 100644 --- a/zed/src/chat_panel.rs +++ b/zed/src/chat_panel.rs @@ -116,12 +116,12 @@ impl ChatPanel { fn render_message(&self, message: &ChannelMessage) -> ElementBox { let settings = self.settings.borrow(); - Label::new( + Text::new( message.body.clone(), settings.ui_font_family, settings.ui_font_size, ) - .with_style(&settings.theme.chat_panel.message.label) + .with_style(&settings.theme.chat_panel.message.body) .boxed() } diff --git a/zed/src/theme.rs b/zed/src/theme.rs index 0bd5b3593d48cc589d8e1b5e575e7d24a8d657ca..13fa53421144c30045fa5877be4daf78615278bb 100644 --- a/zed/src/theme.rs +++ b/zed/src/theme.rs @@ -60,8 +60,7 @@ pub struct ChatPanel { #[derive(Debug, Default, Deserialize)] pub struct ChatMessage { - #[serde(flatten)] - pub label: LabelStyle, + pub body: TextStyle, } #[derive(Debug, Default, Deserialize)]