Skip to content

fix: stabilize Git sidebar layout, resizing, and refresh - #343

Open
ventupx wants to merge 6 commits into
DEEIX-AI:devfrom
ventupx:fix/git-sidebar-stability
Open

ventupx wants to merge 6 commits into
DEEIX-AI:devfrom
ventupx:fix/git-sidebar-stability

Conversation

@ventupx

@ventupx ventupx commented Nov 21, 2026 •

Copy link
Copy Markdown

Summary

Fix Git sidebar inconsistencies when viewing multiple repositories, resizing the sidebar, or editing files with external tools. Selecting tree mode now applies to every repository, and expanded filenames no longer prevent divider dragging or leave text over the editor or terminal.

  • Apply tree/list, compact-folder, and sort settings to non-current repositories. Directories expand and collapse independently by repository and staging group. Switching layouts discards obsolete row animations immediately.
  • Keep the sidebar divider draggable even while a long filename is expanded. Preserve access to the expanded name across the divider, and finish filename transitions during resizing so old names cannot remain over adjacent content.
  • Recover from missed filesystem notifications by rechecking local Git status every five seconds while a Git view is visible and the window is focused, and again when focus returns. Rechecks skip busy Git operations and do not fetch remote data or reread refs.
  • Contain Git log/diff controls and editor overlays inside their pane, including when terminal maximization leaves a zero-sized editor.
  • Fade long filenames into the composed repository-card and row background, using the same layout and fade for current and non-current repositories.

Regression tests cover menu selection through actual hit targets, tree/list switching, directory folds, staging groups, divider dragging with expanded filenames, and pixel comparisons that detect residual text during resizing in light/dark themes and tree/list layouts. The earlier refresh, pane-containment, and filename-fade regression coverage is retained.

Change type

  • Bug fix
  • Feature
  • Performance
  • Refactor
  • Documentation
  • Build / tooling

Verification

Latest commit: d6f403d3e178a1a82e92c39995c6254c7b91a2aa.

Full three-platform CI run: all nine jobs passed for this commit.

  • cargo fmt --all --check
  • cargo clippy --workspace --all-targets --locked -- -D warnings on Windows, Linux, and macOS
  • RUSTDOCFLAGS="-D warnings" cargo doc --workspace --no-deps --locked on Windows, Linux, and macOS
  • cargo test --workspace --locked --no-fail-fast on Windows, Linux, and macOS
  • Windows terminal end-to-end tests repeated with the pinned bundled ConPTY
  • Native Windows application rebuild and --version smoke check
  • Focused Linux Git layout/overflow, filesystem-watcher, status-recheck, and source-size checks: 17 passed, 0 failed
  • PR title and all six commit subjects checked locally against the repository's commit-message pattern

The native Windows full suite was also rerun from an LF source export of this exact commit, matching the CI checkout settings: 2,186 passed, 0 failed, 106 ignored. The application suite includes 897 passed, 0 failed, 96 ignored. Local validation used Rust 1.99.1 and --test-threads=4, with isolated application-data directories.

The resizing regression covers stale filename hit regions retained by a hidden file tree, in addition to the light/dark, tree/list, and residual-pixel cases. Periodic Git status rechecks now live in a separate module without changing their behavior; git.rs has 1,477 lines and passes the 1,500-line source limit on Linux and macOS.

Upstream PR status: CLA passed. The upstream CI and Commit messages workflows for this commit are awaiting maintainer approval (action_required). The successful run linked above is in the fork and does not replace the upstream required checks.

Screenshots

Before: filename remnants over the terminal during sidebar resizing

Reporter-provided screenshot:

Before: a long filename remains over terminal content while resizing the Git sidebar

Before: tree mode selected, but other repositories remain flat

Reporter-provided screenshot:

Before: tree mode is checked while non-current repository files are still displayed as a flat list

After: non-current repository follows tree mode

Windows offscreen regression fixture rendered from the latest commit:

After: the non-current repository is grouped into expandable directories

For the resizing issue, pixel regression tests first expand the filename, then begin a divider drag during its retraction. They verify that the editor pixels return to the unobstructed baseline during dragging and that the sidebar width still changes. The test fails with the former behavior.

Earlier reported rendering problems covered by this PR

Git log controls overlapping the sidebar toolbar:

Before: Git log controls paint over the Git sidebar toolbar

Light-theme filename fades using the wrong background:

Before: light strips appear at the end of truncated Git filenames

Images are stored on a separate attachment branch in the fork and add no binary files to the code diff.

Checklist

  • The change is focused on Git/sidebar behavior and does not include unrelated refactoring or formatting.
  • Tests cover the fixed bugs.
  • No new interface text or dependencies are introduced.
  • I have read and agree to the Contributor License Agreement.

Recheck local status while the Git view is visible and focused, and
refresh on focus recovery even when the filesystem watcher is live.

Cover missed notifications, focus recovery, repeated writes, and
replacement saves with regression tests.
Clip editor content and hit targets when a maximized terminal hides the
editor or a narrow pane cannot fit its fixed-width controls. Keep preview
shadows, selection controls, notices, and conflict cards in their areas.

Add pixel and hit-target regressions for zero-sized and narrow panes,
light and dark themes, and fractional display scales.
Composite filename fades over the current repository card and row state
instead of the plain sidebar background. Reuse the same name layout and
fade for other repositories, including hovered rows.

Compare rendered rows across themes, display scales, sidebar widths,
and checkbox or staging modes.
@github-actions

github-actions Bot commented Nov 21, 2026 •

Copy link
Copy Markdown

All commit authors have signed the Contributor License Agreement. Thank you!

@ventupx

ventupx commented Nov 21, 2026

Copy link
Copy Markdown
Author

I have read the CLA Document and I hereby sign the CLA

Keep the same clipping and hit bounds at the pane drawing entry, leaving
the editor content function unchanged. This also preserves the source
fixture used by the existing smooth sticky-scroll regression.
@ventupx
ventupx marked this pull request as ready for review November 21, 2026 07:35
Apply the selected layout to every repository in the Git sidebar,
including compact directories, independent folds, and staging groups.
Discard obsolete row animations when switching layouts.

Keep the sidebar splitter draggable when a filename is expanded and
finish filename transitions during resizing so they cannot leave text
over the editor or terminal.

Add Windows-capable menu, tree, dragging, and pixel regression tests.
@ventupx ventupx changed the title fix: stabilize Git refresh and sidebar rendering fix: stabilize Git sidebar layout, resizing, and refresh Nov 21, 2026
Ignore cached file-tree overflow hit regions outside the file view so
they cannot intercept the Git sidebar splitter or the adjacent editor.
Seed stale hit regions in the resizing regression to cover every host.

Move the periodic Git status recheck into its own module without changing
its behavior, keeping the parent module below the source line limit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant