From ddd8784b5637c44209b1af693619ef27ee06a651 Mon Sep 17 00:00:00 2001 From: sysadmin Date: Wed, 10 Jun 2026 19:06:53 +0100 Subject: [PATCH] fix(toolbox): move Done 'Restart now' to footer-right (was clipped in content) The in-content Restart button overflowed its fixed width. Move it into the wizard footer's right slot (where Next/Apply sits) as a btn-primary; Routes owns the restart shutdown now, DoneStep just shows the recovery key. Co-Authored-By: Claude Opus 4.8 --- .../src/SilverOS.Welcome.UI/Components/Routes.razor | 10 ++++++++++ .../Components/Steps/DoneStep.razor | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/windows/welcome/src/SilverOS.Welcome.UI/Components/Routes.razor b/windows/welcome/src/SilverOS.Welcome.UI/Components/Routes.razor index 26691fd..6f5527a 100644 --- a/windows/welcome/src/SilverOS.Welcome.UI/Components/Routes.razor +++ b/windows/welcome/src/SilverOS.Welcome.UI/Components/Routes.razor @@ -6,6 +6,7 @@ @inject IAppCatalog AppCatalog @inject IPreconfigStore PreconfigStore @inject WizardState State +@inject SilverOS.Welcome.Core.Apply.IProcessRunner ProcessRunner @if (_toolboxHome) { @@ -83,6 +84,10 @@ else @(_currentStep == _stepTitles.Length - 2 ? "Apply" : "Next") } + else if (_currentStep == _stepTitles.Length - 1) + { + + } } @@ -108,6 +113,11 @@ else private string? _error; private IReadOnlyList _flavours = Array.Empty(); + private async Task RestartNow() + { + await ProcessRunner.RunAsync("cmd.exe", "/c shutdown /r /t 5", default); + } + private bool CanGoNext => _currentStep switch { 1 => State.Flavour is not null, diff --git a/windows/welcome/src/SilverOS.Welcome.UI/Components/Steps/DoneStep.razor b/windows/welcome/src/SilverOS.Welcome.UI/Components/Steps/DoneStep.razor index 2b4385b..f9400e4 100644 --- a/windows/welcome/src/SilverOS.Welcome.UI/Components/Steps/DoneStep.razor +++ b/windows/welcome/src/SilverOS.Welcome.UI/Components/Steps/DoneStep.razor @@ -1,5 +1,4 @@ @using QRCoder -@inject SilverOS.Welcome.Core.Apply.IProcessRunner ProcessRunner

All Done!

@@ -27,8 +26,6 @@

} - - @code { @@ -56,9 +53,4 @@ catch { /* QR is best-effort; the key text still shows */ } } } - - private async Task RestartNow() - { - await ProcessRunner.RunAsync("cmd.exe", "/c shutdown /r /t 5", CancellationToken.None); - } }