yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: Fix sticky diff hunk controls not being flush to buffer headers (#50402)

Browse Source 
Release Notes:

- Fixed a visual gap between diff hunk controls and buffer headers
This commit is contained in:
Lukas Wirth authored and GitHub committed 2026-03-02 09:23:08 +01:00
1 parent 98e9006c84
commit b148457595
2 files changed
+19 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/editor/src/editor.rs
+1
View File
@@ -237,6 +237,7 @@ use crate::{
};
pub const FILE_HEADER_HEIGHT: u32 = 2;
pub const BUFFER_HEADER_PADDING: Rems = rems(0.25);
pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u32 = 1;
const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
const MAX_LINE_LEN: usize = 1024;
crates/editor/src/element.rs
+18 -14
View File
@@ -1,15 +1,15 @@
use crate::{
ActiveDiagnostic, BlockId, CURSORS_VISIBLE_FOR, ChunkRendererContext, ChunkReplacement,
CodeActionSource, ColumnarMode, ConflictsOurs, ConflictsOursMarker, ConflictsOuter,
ConflictsTheirs, ConflictsTheirsMarker, ContextMenuPlacement, CursorShape, CustomBlockId,
DisplayDiffHunk, DisplayPoint, DisplayRow, EditDisplayMode, EditPrediction, Editor, EditorMode,
EditorSettings, EditorSnapshot, EditorStyle, FILE_HEADER_HEIGHT, FocusedBlock,
GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor, InlayHintRefreshReason,
JumpData, LineDown, LineHighlight, LineUp, MAX_LINE_LEN, MINIMAP_FONT_SIZE,
MULTI_BUFFER_EXCERPT_HEADER_HEIGHT, OpenExcerpts, PageDown, PageUp, PhantomBreakpointIndicator,
PhantomDiffReviewIndicator, Point, RowExt, RowRangeExt, SelectPhase, Selection,
SelectionDragState, SelectionEffects, SizingBehavior, SoftWrap, StickyHeaderExcerpt, ToPoint,
ToggleFold, ToggleFoldAll,
ActiveDiagnostic, BUFFER_HEADER_PADDING, BlockId, CURSORS_VISIBLE_FOR, ChunkRendererContext,
ChunkReplacement, CodeActionSource, ColumnarMode, ConflictsOurs, ConflictsOursMarker,
ConflictsOuter, ConflictsTheirs, ConflictsTheirsMarker, ContextMenuPlacement, CursorShape,
CustomBlockId, DisplayDiffHunk, DisplayPoint, DisplayRow, EditDisplayMode, EditPrediction,
Editor, EditorMode, EditorSettings, EditorSnapshot, EditorStyle, FILE_HEADER_HEIGHT,
FocusedBlock, GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor,
InlayHintRefreshReason, JumpData, LineDown, LineHighlight, LineUp, MAX_LINE_LEN,
MINIMAP_FONT_SIZE, MULTI_BUFFER_EXCERPT_HEADER_HEIGHT, OpenExcerpts, PageDown, PageUp,
PhantomBreakpointIndicator, PhantomDiffReviewIndicator, Point, RowExt, RowRangeExt,
SelectPhase, Selection, SelectionDragState, SelectionEffects, SizingBehavior, SoftWrap,
StickyHeaderExcerpt, ToPoint, ToggleFold, ToggleFoldAll,
code_context_menus::{CodeActionsMenu, MENU_ASIDE_MAX_WIDTH, MENU_ASIDE_MIN_WIDTH, MENU_GAP},
column_pixels,
display_map::{
@@ -8254,7 +8254,7 @@ pub(crate) fn render_buffer_header(
let header = div()
.id(("buffer-header", for_excerpt.buffer_id.to_proto()))
.p_1()
.p(BUFFER_HEADER_PADDING)
.w_full()
.h(FILE_HEADER_HEIGHT as f32 * window.line_height())
.child(
@@ -10959,7 +10959,9 @@ impl Element for EditorElement {
.and_then(|headers| headers.lines.last())
.map_or(Pixels::ZERO, |last| last.offset + line_height);
let sticky_header_height = if sticky_buffer_header.is_some() {
let has_sticky_buffer_header =
sticky_buffer_header.is_some() || sticky_header_excerpt_id.is_some();
let sticky_header_height = if has_sticky_buffer_header {
let full_height = FILE_HEADER_HEIGHT as f32 * line_height;
let display_row = blocks
.iter()
@@ -10978,7 +10980,9 @@ impl Element for EditorElement {
}
None => full_height,
};
sticky_scroll_header_height + offset
let header_bottom_padding =
BUFFER_HEADER_PADDING.to_pixels(window.rem_size());
sticky_scroll_header_height + offset - header_bottom_padding
} else {
sticky_scroll_header_height
};