mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix bug where chat text wouldn't wrap to width

Browse source
This commit is contained in:
Mikayla 2023-10-05 11:06:29 -07:00
parent d298afba01
commit 44ada52185
No known key found for this signature in database
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/collab_ui/src/chat_panel.rs
View file

@ -398,12 +398,16 @@ impl ChatPanel {
if is_continuation { if is_continuation {
Flex::row() Flex::row()
.with_child(MarkdownElement::new( .with_child(
markdown.clone(), Flex::column()
style.body.clone(), .with_child(MarkdownElement::new(
theme.editor.syntax.clone(), markdown.clone(),
theme.editor.document_highlight_read_background, style.body.clone(),
)) theme.editor.syntax.clone(),
theme.editor.document_highlight_read_background,
))
.flex(1., true),
)
.with_children(message_id_to_remove.map(|id| { .with_children(message_id_to_remove.map(|id| {
MouseEventHandler::new::<DeleteMessage, _>(id as usize, cx, |mouse_state, _| { MouseEventHandler::new::<DeleteMessage, _>(id as usize, cx, |mouse_state, _| {
let button_style = theme.chat_panel.icon_button.style_for(mouse_state); let button_style = theme.chat_panel.icon_button.style_for(mouse_state);
@ -418,13 +422,6 @@ impl ChatPanel {
}) })
.flex_float() .flex_float()
})) }))
.contained()
.with_style(style.container)
.with_margin_bottom(if is_last {
theme.chat_panel.last_message_bottom_spacing
} else {
0.
})
.into_any() .into_any()
} else { } else {
Flex::column() Flex::column()

6
crates/collab_ui/src/collab_panel.rs
View file

@ -1976,11 +1976,7 @@ impl CollabPanel {
.left() .left()
.with_tooltip::<ChannelTooltip>( .with_tooltip::<ChannelTooltip>(
ix, ix,
if is_active { "Join channel",
"Open channel notes"
} else {
"Join channel"
},
None, None,
theme.tooltip.clone(), theme.tooltip.clone(),
cx, cx,