mirror of
https://github.com/l0ng-ai/tty7.git
synced 2026-09-21 16:02:20 +00:00
* feat(window): dock the code panel and the diff overlay beside the terminal (#625) Opening a file covered the workspace. The terminal underneath kept running and was neither visible nor typeable, so reading a file while an agent talked was a toggle loop: open it, close it to read the reply, open it again. The Files tree already docks; the two surfaces you go to *from* it did not. They dock now, as a flex sibling of the terminal column rather than a narrower overlay — that distinction is the feature. `set_grid_size` is driven by the terminal element's laid-out bounds, so a column takes width away from the grid and the PTY reflows into what is left; a card painted over half the workspace would have left the grid full width with half of it hidden. `overlay_top` stops ordering a pair and starts choosing between them: a column has one child, and two `flex_1` siblings would split it and fight. Fill mode keeps the old vector, the old opaque paint and the old platform hoist untouched, so nothing about today's overlay changes for anyone who picks it. - Half the terminal column by default; drag the divider, double-click it to cycle a third / half / two thirds, or use the palette commands. Two thirds deliberately runs past the half-window cap the side panels obey — only the terminal's floor binds it. - `DOCUMENT_MIN_W` joins the width budget: both side panels reserve it the way they already reserve each other, and the column is derived from the *live* sidebar and panel widths rather than their floors, so a panel someone dragged wider is width the terminal keeps. - A window too narrow to seat both fills for that frame. The fallback is derived at render time and never stored, so widening re-docks on the next frame with nothing to undo. - Fill or dock is per tab, on the header's context menu. Reading a long file over the whole window in one tab while an agent keeps half of another is the normal case, and one global switch made each of those flip the other. A tab that has not been told reads `document_layout` from the config, which is what a fresh tab starts as — and which the menu therefore does not write, since every untold tab is reading it. - Everywhere but macOS the title bar spans the workspace, which left a bar's height of nothing above the column. The header is drawn into it, and behaves like the title bar it now sits in. With the detail panel closed the column reaches the window's right edge, so the header stops short of the trailing chrome through a width the tab strip's own reservation shares. - The docked headers drop the traffic-light inset they never had to clear, and the diff header's branch name becomes the thing that yields so the view toggle and the close tile survive a column's width. New in `config.json`: `document_ratio`, and `document_layout` for what a fresh tab starts as. Four new actions, bindable and unbound by default. * fix(window): hold the docked column to widths the strip and the file agree on Three defects in the document column, each with a guard test that fails without its fix. The tab strip did not know a column had taken width off it. On macOS the strip lives inside the terminal column and sizes itself to the window less the detail panel, so a docked document left it 340 points wider than the column it sits in and the chips ran on under the column — the same overrun the panel's own reservation was added for. Everywhere else the strip spans the workspace and the column's hoisted header is drawn over its trailing end with no fill of its own, so a chip left under it showed through the file name and stayed clickable through it. The column's width now comes off `strip_w` on macOS and off `corner_w` elsewhere, which is where the panel's already goes. The divider wrote widths the file would not keep. `Config::sanitize` holds `document_ratio` to 0.2..=0.8; the drag clamped in pixels only, so a column pushed against either edge of a wide window was saved outside that band and reopened somewhere else — on a 2560-point body, 232 points from where it was dropped. The band is a pair of shared constants now and the drag clamps to it, the way the font size and its stepper were made to agree in #550. The palette named the config's layout rather than the tab's. Fill is per tab, so a tab told to fill was still offered "Document: Fill Window" — a row that named the state it was already in and did the opposite. It reads the active tab through `ChromeState` now. Also: `document_layout`'s doc comment still described the global switch an earlier draft had, three lines after the field became a per-tab default.
52 lines
2.0 KiB
Plaintext
52 lines
2.0 KiB
Plaintext
---
|
||
title: "Diffs"
|
||
description: "The diff overlay: side-by-side or unified, from the sidebar or the panel."
|
||
---
|
||
|
||
## Opening one
|
||
|
||
| From | How |
|
||
|---|---|
|
||
| The sidebar | Click a row's `+N −M` counts |
|
||
| Source Control | **Open Changes** on a file, or click the row |
|
||
| History | Click a file inside a commit's detail view |
|
||
|
||
A diff docks beside the terminal, in the same column an open file uses, so the
|
||
pane you were reading stays on screen. <kbd>Esc</kbd> closes it, and its header
|
||
right-clicks to a menu that fills the window with it if you prefer that —
|
||
[more about the column →](/window/side-panel#where-it-opens)
|
||
|
||
<Frame caption="Placeholder — screenshot: the diff overlay, side-by-side, several files">
|
||
<img src="/images/placeholder.svg" alt="The tty7 diff overlay" />
|
||
</Frame>
|
||
|
||
## Side-by-side or unified
|
||
|
||
**Toggle Unified / Side-by-Side Diff** in the command palette switches between
|
||
the two. The choice is global — one setting for every diff, the same call VS
|
||
Code's `diffEditor.renderSideBySide` makes — and persists as `diff_view` in
|
||
`config.json`.
|
||
|
||
## What it shows
|
||
|
||
- Every changed file, with its status and `+N −M`
|
||
- **Untracked files** as a preview of their contents, up to 4 MB — past that the
|
||
card says the read failed rather than showing a silently cut-off file
|
||
- A commit's files, when the diff came from the history
|
||
|
||
Two limits keep a huge diff from becoming a huge wait:
|
||
|
||
| Limit | Value | What happens |
|
||
|---|---|---|
|
||
| Files rendered | 300 | *"… and N more changed files — run git diff in the terminal to see them."* |
|
||
| Lines before auto-collapse | 400 per file | Big files start collapsed; expand the ones you care about |
|
||
|
||
Both are stated in the overlay when they apply — nothing is dropped silently.
|
||
|
||
## Turning the sidebar shortcut off
|
||
|
||
If you would rather the sidebar's counts not be clickable, turn off **Settings →
|
||
Window & Tabs → Open diff preview from sidebar counts**
|
||
(`sidebar_diff_preview: false`). The branch and counts stay on the row; they
|
||
just stop opening the overlay.
|