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

Merge branch 'main' into picker

Browse source
This commit is contained in:
Max Brunsfeld 2023-11-07 13:37:49 -08:00
commit 36d9633f6f
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1594,7 +1594,7 @@ impl EditorElement {
&mut self,
editor: &mut Editor,
cx: &mut ViewContext<'_, Editor>,
bounds: Bounds<Pixels>,
mut bounds: Bounds<Pixels>,
) -> LayoutState {
// let mut size = constraint.max;
// if size.x.is_infinite() {
@ -1672,8 +1672,7 @@ impl EditorElement {
// .min(line_height * max_lines as f32),
// )
} else if let EditorMode::SingleLine = editor_mode {
todo!()
// size.set_y(line_height.max(constraint.min_along(Axis::Vertical)))
bounds.size.height = line_height.min(bounds.size.height);
}
// todo!()
// else if size.y.is_infinite() {