Public Access
Move SFTP and S3 into the tab strip, and the host list into a card grid
Four asks in one pass over the desktop head, and two of them are furniture moving rather than anything new. THE STRIP IS THE WINDOW'S NOW, not the terminal's. Vaults, SFTP and S3 sit at its head and cannot be closed, and open terminals follow them. SFTP and S3 left the nav rail to get there, which is the one semantic change: they are the two destinations you stay in while something runs, and a rail entry is for somewhere you go and come back from. So the rail belongs to the Vaults tab and collapses with it, which also means SFTP, S3 and a terminal each get the full 1016 rather than the 826 a page gets. The tab is expressed as "a page, and not one of the two the strip took" rather than as a fourth ShellSurface. Both are still ShellScreen members and have to be — that is what they are on the phone, where they are two rows in a hub — so a surface each would have been a second way to say a thing Screen already says. IsTransfersShowing and IsBucketsShowing light the other two tabs unchanged. What is new is one field: the page Vaults comes back to, because it is the one tab with sub-navigation and therefore the one that can return to the wrong place. That is not the hidden field ShellSurface argues against — that one would be a second copy of "which page"; this is a tab remembering its own. THE HOSTS SCREEN IS A GRID, and the 268-pixel sidebar is gone. That column was choosing among forty machines and editing one of them at two-thirds width, and it was narrow so the editor beneath it could be a column at all. Cards took the first job at full width; a 304-pixel drawer took the second and collapses when nothing is selected. Pressing a group card narrows the grid; SHOW ALL is the way back. The group editor moved into the drawer as well, which finally makes IsEditingGroup mean the same thing on both heads — it was the phone's alone, because the desktop's editor was a bar that was always on screen. AreHostsExpanded and ToggleHosts went with the control that used them. They folded the whole list away under one heading, an affordance that existed because the column was narrow. Folding a single group is a different thing and is still here. THE TYPE SCALE IS A POINT LARGER and the text ramp is white. The base size was never stated anywhere — a bare TextBlock took TextElement's default of 12 — so raising the scale meant naming it, on Window and on UserControl. The second selector is not redundancy: the layout harness hosts a UserControl in a window it builds itself, and without it the suite would measure every screen a point smaller than it ships, silently. A selector on TextBlock would have been the obvious way and is wrong, because a style setter beats an inherited value and would collapse every deliberate step back to one number. #E3E7F4 is a blue-tinted white on blue-black surfaces, which costs contrast twice — once for being darker than white and once for sharing a hue with what it is drawn on. Pure white is 18.3:1 against the canvas where that was 15.5:1. Every step below moved with the top, so the intervals the design chose are kept and TextDim clears 9:1 against 6.4:1. The palette is shared, so the phone has both changes too. TWO DEFECTS THE HARNESS STRUCTURALLY CANNOT SEE, found by rendering the screen rather than by measuring it, and both now covered. The tile was 232 and was first written as 248, from arithmetic that left out the scrolling stack's own margins. Every layout test passed — the harness asks whether a control is inside the window, never how many fit on a line — so the grid quietly became one column wide at exactly the minimum this application guarantees, which is the shape cards exist to avoid. TheHostsGridKeepsTwoColumnsAtTheMinimumWithTheDrawerOpen counts columns instead, and fails at 248. And a card's text ran past its own border, because a horizontal StackPanel measures children with infinite width: a TextBlock inside one never learns it is short of room, so TextTrimming never fires. Both card rows are grids with a star column that gives way and an Auto column that does not — a hostname with its tail cut is still the machine you were looking for, where a badge or the word naming an auth method is not. The keychain header changed shape for the same class of reason. It was Auto,Auto,*,Auto with the buttons last, so the slack column was the only thing absorbing a change of width and five buttons fell off the right edge the moment the type grew. That is how GENERATE lost the word KEY once already. The summary sits in the star column and trims now, so the buttons always get their width. HostSidebarTests became HostGridTests and moved to the grid with the gestures it drives. docs/design-import-gaps.md gains a v3 section naming the five toolbar controls in the design with nothing behind them — a view-mode switch, a tag filter, a calendar, a share control and Serial — and manual-checks.md and the README follow the controls that moved.
This commit is contained in:
@@ -206,6 +206,69 @@ public sealed class TerminalTabsTests : IAsyncLifetime
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The three fixed tabs select what they name, and Vaults comes back to the page it was left on.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// <para>
|
||||
/// The memory is the part worth a gesture rather than a property assertion. Vaults is the one tab with
|
||||
/// sub-navigation, so it is the one that can come back to the wrong place — and the failure is silent:
|
||||
/// a Vaults tab that always landed on Hosts looks like a working tab to anybody who was already on
|
||||
/// Hosts, which is most of the time.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// Driven through the strip rather than through the commands, because what is being checked is that
|
||||
/// three buttons in the markup are wired to three different things. Three commands called directly
|
||||
/// would pass on a strip whose SFTP tab was bound to the S3 one.
|
||||
/// </para>
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public async Task TheFixedTabsSelectTheirSurface_AndVaultsRemembersItsPage()
|
||||
{
|
||||
await OnTheStripAsync((strip, window) =>
|
||||
{
|
||||
shell.ShowScreenCommand.Execute(ShellScreen.Snippets);
|
||||
shell.IsVaultsTab.ShouldBeTrue("a rail screen is under the Vaults tab");
|
||||
|
||||
Click(FixedTab(strip, "SFTP"), window);
|
||||
|
||||
shell.IsTransfersShowing.ShouldBeTrue();
|
||||
shell.IsVaultsTab.ShouldBeFalse("exactly one tab is lit at a time");
|
||||
|
||||
Click(FixedTab(strip, "S3"), window);
|
||||
|
||||
shell.IsBucketsShowing.ShouldBeTrue();
|
||||
shell.IsTransfersShowing.ShouldBeFalse();
|
||||
|
||||
Click(FixedTab(strip, "Vaults"), window);
|
||||
|
||||
shell.IsVaultsTab.ShouldBeTrue();
|
||||
shell.Screen.ShouldBe(
|
||||
ShellScreen.Snippets,
|
||||
"the Vaults tab comes back to the page it was left on, not to Hosts");
|
||||
});
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// None of the three owns a shell, so none of them may offer to end one. The cross is what tells a
|
||||
/// destination from a machine in this strip, and a fixed tab that grew one would be offering to close
|
||||
/// SFTP.
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public async Task TheFixedTabsCarryNoCloseBox()
|
||||
{
|
||||
await OnTheStripAsync((strip, _) =>
|
||||
{
|
||||
foreach (var label in new[] { "Vaults", "SFTP", "S3" })
|
||||
{
|
||||
FixedTab(strip, label)
|
||||
.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.ShouldBeEmpty($"{label} is a destination, not a session");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// The strip is the one row of chrome every screen pays for, so its height is part of the layout budget
|
||||
/// and this is what stops the budget drifting from the markup. See
|
||||
@@ -352,6 +415,28 @@ public sealed class TerminalTabsTests : IAsyncLifetime
|
||||
private static Button PlusButton(Visual strip) =>
|
||||
strip.GetVisualDescendants().OfType<Button>().First(button => button.Classes.Contains("plus"));
|
||||
|
||||
/// <summary>One of the three tabs that are always there, found by the word on it.</summary>
|
||||
/// <remarks>
|
||||
/// By its label rather than by its position in the strip, so that adding a fourth or reordering the
|
||||
/// three does not silently point these tests at the wrong one. The class narrows it to a fixed tab
|
||||
/// first, because a terminal tab could be opened on a host called SFTP.
|
||||
/// </remarks>
|
||||
private static Button FixedTab(Visual strip, string label) =>
|
||||
strip.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.First(button => button.Classes.Contains("fixed")
|
||||
&& button.GetVisualDescendants()
|
||||
.OfType<TextBlock>()
|
||||
.Any(text => string.Equals(text.Text, label, StringComparison.Ordinal)));
|
||||
|
||||
private static void Click(Visual control, Window window)
|
||||
{
|
||||
var at = Centre(control, window);
|
||||
|
||||
window.MouseDown(at, MouseButton.Left);
|
||||
window.MouseUp(at, MouseButton.Left);
|
||||
}
|
||||
|
||||
private static Point Centre(Visual control, Visual window) =>
|
||||
control.TranslatePoint(new Point(control.Bounds.Width / 2, control.Bounds.Height / 2), window)
|
||||
?? throw new InvalidOperationException("the control is not in this window's tree");
|
||||
|
||||
Reference in New Issue
Block a user