zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic due to incorrectly calculating editor text size in layout

Browse Source
This commit is contained in:
Antonio Scandurra 2021-07-26 11:04:22 +02:00
parent 61b5d66ba8
commit 58054c605b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zed/src/editor/element.rs
View File

@ -357,12 +357,11 @@ impl Element for EditorElement {
gutter_width = 0.0
};
let gutter_size = vec2f(gutter_width, size.y());
let text_size = size - vec2f(gutter_width, 0.0);
let text_width = size.x() - gutter_width;
let text_offset = vec2f(-snapshot.font_descent(cx.font_cache), 0.);
let em_width = snapshot.em_width(font_cache);
let overscroll = vec2f(em_width, 0.);
let wrap_width = text_size.x() - text_offset.x() - overscroll.x() - em_width;
let wrap_width = text_width - text_offset.x() - overscroll.x() - em_width;
let snapshot = self.update_view(cx.app, |view, cx| {
if view.set_wrap_width(wrap_width, cx) {
view.snapshot(cx)
@ -370,10 +369,11 @@ impl Element for EditorElement {
snapshot
}
});
if size.y().is_infinite() {
size.set_y((snapshot.max_point().row() + 1) as f32 * line_height);
}
let gutter_size = vec2f(gutter_width, size.y());
let text_size = vec2f(text_width, size.y());
let (autoscroll_horizontally, mut snapshot) = self.update_view(cx.app, |view, cx| {
let autoscroll_horizontally = view.autoscroll_vertically(size.y(), line_height, cx);