mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-31 15:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix lightning bolt hover and git gutter mark overlapping (#4195)

Browse source 
Bumps `gutter_padding_factor` from 3.5 to 4.0 due git mark on the gutter
becoming much thicker than in Zed1:
 
Current:

![current_zed_2](https://github.com/zed-industries/zed/assets/2690773/f7f0f76b-63a2-4790-a4f4-ca791b617a64)

Fixed:

![new_zed2](https://github.com/zed-industries/zed/assets/2690773/0075567d-e661-4140-8ffa-ec17d72f8e54)

Stable (no hover background appearing):

![zed_1](https://github.com/zed-industries/zed/assets/2690773/c3366845-b763-46f7-a2c7-48dd72dc4f10)

Release Notes:

- Fixed gutter marks overlapping with hover highlights
This commit is contained in:
Kirill Bulatov 2024-01-22 16:12:34 +02:00 committed by GitHub
commit 5b906e731d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 64 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
crates/editor/src/editor.rs
View file

@ -56,9 +56,9 @@ use git::diff_hunk_to_display;
use gpui::{
div, impl_actions, point, prelude::*, px, relative, rems, size, uniform_list, Action,
AnyElement, AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Context,
DispatchPhase, ElementId, EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight,
HighlightStyle, Hsla, InteractiveText, KeyContext, Model, MouseButton, ParentElement, Pixels,
Render, SharedString, Styled, StyledText, Subscription, Task, TextStyle,
DispatchPhase, ElementId, EventEmitter, FocusHandle, FocusableView, FontId, FontStyle,
FontWeight, HighlightStyle, Hsla, InteractiveText, KeyContext, Model, MouseButton,
ParentElement, Pixels, Render, SharedString, Styled, StyledText, Subscription, Task, TextStyle,
UniformListScrollHandle, View, ViewContext, ViewInputHandler, VisualContext, WeakView,
WhiteSpace, WindowContext,
};
@ -414,7 +414,7 @@ pub struct Editor {
pub struct EditorSnapshot {
pub mode: EditorMode,
pub show_gutter: bool,
show_gutter: bool,
pub display_snapshot: DisplaySnapshot,
pub placeholder_text: Option<Arc<str>>,
is_focused: bool,
@ -422,6 +422,22 @@ pub struct EditorSnapshot {
ongoing_scroll: OngoingScroll,
}
pub struct GutterDimensions {
pub padding: Pixels,
pub width: Pixels,
pub margin: Pixels,
}
impl Default for GutterDimensions {
fn default() -> Self {
Self {
padding: Pixels::ZERO,
width: Pixels::ZERO,
margin: Pixels::ZERO,
}
}
}
#[derive(Debug)]
pub struct RemoteSelection {
pub replica_id: ReplicaId,
@ -9069,6 +9085,34 @@ impl EditorSnapshot {
pub fn scroll_position(&self) -> gpui::Point<f32> {
self.scroll_anchor.scroll_position(&self.display_snapshot)
}
pub fn gutter_dimensions(
&self,
font_id: FontId,
font_size: Pixels,
em_width: Pixels,
max_line_number_width: Pixels,
cx: &AppContext,
) -> GutterDimensions {
if self.show_gutter {
let descent = cx.text_system().descent(font_id, font_size);
let gutter_padding_factor = 4.0;
let gutter_padding = (em_width * gutter_padding_factor).round();
// Avoid flicker-like gutter resizes when the line number gains another digit and only resize the gutter on files with N*10^5 lines.
let min_width_for_number_on_gutter = em_width * 4.0;
let gutter_width =
max_line_number_width.max(min_width_for_number_on_gutter) + gutter_padding * 2.0;
let gutter_margin = -descent;
GutterDimensions {
padding: gutter_padding,
width: gutter_width,
margin: gutter_margin,
}
} else {
GutterDimensions::default()
}
}
}
impl Deref for EditorSnapshot {

60
crates/editor/src/element.rs
View file

@ -1834,32 +1834,16 @@ impl EditorElement {
.unwrap()
.width;
let gutter_padding;
let gutter_width;
let gutter_margin;
if snapshot.show_gutter {
let descent = cx.text_system().descent(font_id, font_size);
let gutter_dimensions = snapshot.gutter_dimensions(font_id, font_size, em_width, self.max_line_number_width(&snapshot, cx), cx);
let gutter_padding_factor = 3.5;
// Avoid flicker-like gutter resizes when the line number gains another digit and only resize the gutter on files with N*10^5 lines.
let min_width_for_number_on_gutter = em_width * 4.0;
gutter_padding = (em_width * gutter_padding_factor).round();
gutter_width = self.max_line_number_width(&snapshot, cx).max(min_width_for_number_on_gutter) + gutter_padding * 2.0;
gutter_margin = -descent;
} else {
gutter_padding = Pixels::ZERO;
gutter_width = Pixels::ZERO;
gutter_margin = Pixels::ZERO;
};
editor.gutter_width = gutter_dimensions.width;
editor.gutter_width = gutter_width;
let text_width = bounds.size.width - gutter_width;
let text_width = bounds.size.width - gutter_dimensions.width;
let overscroll = size(em_width, px(0.));
let _snapshot = {
editor.set_visible_line_count((bounds.size.height / line_height).into(), cx);
let editor_width = text_width - gutter_margin - overscroll.width - em_width;
let editor_width = text_width - gutter_dimensions.margin - overscroll.width - em_width;
let wrap_width = match editor.soft_wrap_mode(cx) {
SoftWrap::None => (MAX_LINE_LEN / 2) as f32 * em_advance,
SoftWrap::EditorWidth => editor_width,
@ -1879,7 +1863,7 @@ impl EditorElement {
.map(|(guide, active)| (self.column_pixels(*guide, cx), *active))
.collect::<SmallVec<[_; 2]>>();
let gutter_size = size(gutter_width, bounds.size.height);
let gutter_size = size(gutter_dimensions.width, bounds.size.height);
let text_size = size(text_width, bounds.size.height);
let autoscroll_horizontally =
@ -2091,10 +2075,10 @@ impl EditorElement {
&snapshot,
bounds.size.width,
scroll_width,
gutter_padding,
gutter_width,
gutter_dimensions.padding,
gutter_dimensions.width,
em_width,
gutter_width + gutter_margin,
gutter_dimensions.width + gutter_dimensions.margin,
line_height,
&style,
&line_layouts,
@ -2187,7 +2171,7 @@ impl EditorElement {
&style,
editor.gutter_hovered,
line_height,
gutter_margin,
gutter_dimensions.margin,
editor_view,
)
})
@ -2242,13 +2226,13 @@ impl EditorElement {
visible_display_row_range: start_row..end_row,
wrap_guides,
gutter_size,
gutter_padding,
gutter_padding: gutter_dimensions.padding,
text_size,
scrollbar_row_range,
show_scrollbars,
is_singleton,
max_row,
gutter_margin,
gutter_margin: gutter_dimensions.margin,
active_rows,
highlighted_rows,
highlighted_ranges,
@ -3963,26 +3947,14 @@ fn compute_auto_height_layout(
.width;
let mut snapshot = editor.snapshot(cx);
let gutter_width;
let gutter_margin;
if snapshot.show_gutter {
let descent = cx.text_system().descent(font_id, font_size);
let gutter_padding_factor = 3.5;
let gutter_padding = (em_width * gutter_padding_factor).round();
let min_width_for_number_on_gutter = em_width * 4.0;
gutter_width =
max_line_number_width.max(min_width_for_number_on_gutter) + gutter_padding * 2.0;
gutter_margin = -descent;
} else {
gutter_width = Pixels::ZERO;
gutter_margin = Pixels::ZERO;
};
let gutter_dimensions =
snapshot.gutter_dimensions(font_id, font_size, em_width, max_line_number_width, cx);
editor.gutter_width = gutter_width;
let text_width = width - gutter_width;
editor.gutter_width = gutter_dimensions.width;
let text_width = width - gutter_dimensions.width;
let overscroll = size(em_width, px(0.));
let editor_width = text_width - gutter_margin - overscroll.width - em_width;
let editor_width = text_width - gutter_dimensions.margin - overscroll.width - em_width;
if editor.set_wrap_width(Some(editor_width), cx) {
snapshot = editor.snapshot(cx);
}