From e729c4ad4f002a5fd01e416034931aeee3c31f21 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Wed, 22 Mar 2023 17:04:52 -0700 Subject: [PATCH 1/2] Fix fold indicator offsets --- crates/editor/src/element.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 69e39b65d3..c1a489f48e 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -576,13 +576,16 @@ impl EditorElement { for (ix, fold_indicator) in layout.fold_indicators.iter_mut().enumerate() { if let Some(indicator) = fold_indicator.as_mut() { - let mut x = bounds.width() - layout.gutter_padding; - let mut y = ix as f32 * line_height - scroll_top; + let position = vec2f( + bounds.width() - layout.gutter_padding, + ix as f32 * line_height - (scroll_top % line_height), + ); + let centering_offset = vec2f( + ((layout.gutter_padding + layout.gutter_margin - indicator.size().x()) / 2.), + (line_height - indicator.size().y()) / 2., + ); - x += ((layout.gutter_padding + layout.gutter_margin) - indicator.size().x()) / 2.; - y += (line_height - indicator.size().y()) / 2.; - - let indicator_origin = bounds.origin() + vec2f(x, y); + let indicator_origin = bounds.origin() + position + centering_offset; indicator.paint(indicator_origin, visible_bounds, cx); } From e87c3b6dd7ca34bb7b5cd5265a76b62b7dd5df36 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Wed, 22 Mar 2023 17:05:54 -0700 Subject: [PATCH 2/2] Update element.rs remove spare parens --- crates/editor/src/element.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index c1a489f48e..780f8cd1d5 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -581,7 +581,7 @@ impl EditorElement { ix as f32 * line_height - (scroll_top % line_height), ); let centering_offset = vec2f( - ((layout.gutter_padding + layout.gutter_margin - indicator.size().x()) / 2.), + (layout.gutter_padding + layout.gutter_margin - indicator.size().x()) / 2., (line_height - indicator.size().y()) / 2., );