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

10
crates/editor2/src/editor.rs
View file

@ -8363,9 +8363,9 @@ impl Editor {
// .max_point() // .max_point()
// } // }
// pub fn text(&self, cx: &AppContext) -> String { pub fn text(&self, cx: &AppContext) -> String {
// self.buffer.read(cx).read(cx).text() self.buffer.read(cx).read(cx).text()
// } }
// pub fn set_text(&mut self, text: impl Into<Arc<str>>, cx: &mut ViewContext<Self>) { // pub fn set_text(&mut self, text: impl Into<Arc<str>>, cx: &mut ViewContext<Self>) {
// self.transact(cx, |this, cx| { // self.transact(cx, |this, cx| {
@ -9185,6 +9185,10 @@ impl Editor {
// }); // });
// supports // supports
// } // }
fn focus(&self, cx: &mut WindowContext) {
cx.focus(&self.focus_handle)
}
} }
pub trait CollaborationHub { pub trait CollaborationHub {

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

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