Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into derive-element-redux

Browse source
This commit is contained in:
Conrad Irwin 2023-11-20 09:15:38 -07:00
commit 0798cfd58c
117 changed files with 7260 additions and 2951 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/editor2/src/element.rs
View file

@ -1972,6 +1972,7 @@ impl EditorElement {
TransformBlock::ExcerptHeader { .. } => false,
TransformBlock::Custom(block) => block.style() == BlockStyle::Fixed,
});
let mut render_block = |block: &TransformBlock,
available_space: Size<AvailableSpace>,
block_id: usize,
@ -2005,6 +2006,7 @@ impl EditorElement {
editor_style: &self.style,
})
}
TransformBlock::ExcerptHeader {
buffer,
range,
@ -2049,6 +2051,7 @@ impl EditorElement {
}
h_stack()
.id("path header block")
.size_full()
.bg(gpui::red())
.child(
@ -2061,6 +2064,7 @@ impl EditorElement {
} else {
let text_style = style.text.clone();
h_stack()
.id("collapsed context")
.size_full()
.bg(gpui::red())
.child("⋯")