Unified · Split
| @@ -19,6 +19,7 @@ use rich_text::RichText; · 18 unmodified lines | |||
| 19 | use serde::{Deserialize, Serialize}; | 19 | use serde::{Deserialize, Serialize}; |
| 20 | use settings::{Settings, SettingsStore}; | 20 | use settings::{Settings, SettingsStore}; |
| 21 | use std::sync::Arc; | 21 | use std::sync::Arc; |
| 22 | use theme::ActiveTheme as _; | ||
| 22 | use time::{OffsetDateTime, UtcOffset}; | 23 | use time::{OffsetDateTime, UtcOffset}; |
| 23 | use ui::{ | 24 | use ui::{ |
| 24 | h_stack, prelude::WindowContext, v_stack, Avatar, Button, ButtonCommon as _, Clickable, Icon, | 25 | h_stack, prelude::WindowContext, v_stack, Avatar, Button, ButtonCommon as _, Clickable, Icon, |
| @@ -317,7 +318,12 @@ impl ChatPanel { · 292 unmodified lines | |||
| 317 | .child( | 318 | .child( |
| 318 | h_stack() | 319 | h_stack() |
| 319 | .w_full() | 320 | .w_full() |
| 321 | .h_7() | ||
| 320 | .justify_between() | 322 | .justify_between() |
| 323 | .z_index(1) | ||
| 324 | .bg(cx.theme().colors().background) | ||
| 325 | .border() | ||
| 326 | .border_color(gpui::red()) | ||
| 321 | .child(Label::new( | 327 | .child(Label::new( |
| 322 | self.active_chat | 328 | self.active_chat |
| 323 | .as_ref() | 329 | .as_ref() |
| @@ -339,7 +345,13 @@ impl ChatPanel { · 15 unmodified lines | |||
| 339 | ), | 345 | ), |
| 340 | ) | 346 | ) |
| 341 | .child(div().grow().child(self.render_active_channel_messages(cx))) | 347 | .child(div().grow().child(self.render_active_channel_messages(cx))) |
| 342 | .child(self.input_editor.clone()) | 348 | .child( |
| 349 | div() | ||
| 350 | .z_index(1) | ||
| 351 | .p_2() | ||
| 352 | .bg(cx.theme().colors().background) | ||
| 353 | .child(self.input_editor.clone()), | ||
| 354 | ) | ||
| 343 | .into_any() | 355 | .into_any() |
| 344 | } | 356 | } |
| 345 | 357 | ||