From e6c6913994bfd3e1831bcaf50d566b575291b817 Mon Sep 17 00:00:00 2001
From: gramps <gramps@llamachile.shop>
Date: Tue, 10 Nov 2026 18:09:16 -0800
Subject: [PATCH] feat(37): expose the staged-scene factory reset

App Settings can now restore only the staged canonical scene. The VM saves
pending edits first, resets that scene, reloads immediately, and keeps the same
scene staged. Other scene edits survive; the action is disabled while live or
recording. 615 tests green, clean build with 0 warnings.

Reference: OBS Scene Collections keep scene/source sets distinct:
https://obsproject.com/kb/scene-collections
---
 Controls/SettingsDrawer.xaml                |  4 +++
 Controls/index.md                           |  2 +-
 ViewModels/MainViewModel.cs                 | 14 ++++++++
 ytLive.Tests/LayoutResetIntegrationTests.cs | 38 +++++++++++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/Controls/SettingsDrawer.xaml b/Controls/SettingsDrawer.xaml
index 45f9ac8..3451b01 100644
--- a/Controls/SettingsDrawer.xaml
+++ b/Controls/SettingsDrawer.xaml
@@ -127,6 +127,10 @@
             <TextBlock Text="Layout defaults" Style="{StaticResource SectionHeader}" Margin="0,10,0,4"/>
             <TextBlock Text="Replaces every scene and layer with this build’s factory layout. Your selected webcam stays the same."
                        Style="{StaticResource PropertyHint}" Margin="10,0,0,6"/>
+            <Button Content="Restore staged scene" Command="{Binding RestoreStagedSceneDefaultsCommand}"
+                    Style="{StaticResource YtButtonSecondary}" Margin="10,0,0,4" HorizontalAlignment="Left"/>
+            <TextBlock Text="Resets only the scene currently staged in the preview."
+                       Style="{StaticResource PropertyHint}" Margin="10,0,0,8"/>
             <Button Content="Restore all scenes" Command="{Binding RestoreAllLayoutDefaultsCommand}"
                     Style="{StaticResource YtButtonSecondary}" Margin="10,0,0,10" HorizontalAlignment="Left"/>
 
diff --git a/Controls/index.md b/Controls/index.md
index 21cfabe..f49e637 100644
--- a/Controls/index.md
+++ b/Controls/index.md
@@ -13,7 +13,7 @@ See [`schema.md`](../schema.md) for the memory-map conventions.
 | `PreviewPane.xaml(.cs)` | Row 2 Col 1 center: 1920×1080 `OverlayCanvas`/`SelectionOverlay`/`BrandFlashLayer`/`SocialBarElement`, static TextOverlay preview image from the shared cached text raster, text drawer, outgoing-picture transition overlay, right-edge Stream Info/YPP/Socials/TEST tabs and drawers, and live controls (TRAX / game / mic meters + sliders + speakers). The list-selected draggable layer is temporarily raised in preview z-order and custom hit-testing; deselection restores the scene's unchanged order (`SelectedLayerPreviewHitTestingTests`). **TASK 57:** dragging/resizing a webcam in the vertical tier routes through `MainViewModel.MoveWebcamInVerticalTier` / `ResizeWebcamInVerticalTier` for the six-spot snap or Chat camera's two sizes. |
 | `SceneThumbnailStrip.xaml(.cs)` | Top row over the preview column: five fixed-size scene cards with scene name, hotkey, staged `PROGRAM` badge, orange staged/live border |
 | `LeftPanel.xaml(.cs)` | Row 2 Col 0 left panel: explicit EditingActive toggle on → Scene Layers+properties; off → YouTube chat, independent of stream status. Source add/edit/remove, list drag-to-reorder, snapshot revert-accept; TextOverlay properties edit multiline content, font type/family, size, color via the shared palette, emphasis, and horizontal/vertical alignment with a static-text notice; sub-options are indented under their headings. **TASK 51:** the webcam properties carry the Background section — `RemoveBackgroundPill` / `BlurBackgroundPill` (`PillToggle`, radio-exclusive via `WebcamSceneConfig.RemoveBackground`/`BlurBackground`) + `BackgroundStrengthSlider` (0..1, 5% snaps, shown only while an effect is on). **TASK 57:** the webcam properties carry a Geometry section (X/Y/W/H) — manual placement of the camera, bound to the **live** placement (the one the current tier shows), gated on `IsWebcamSelected` (not `SelectedElement.IsWebcam` — the TASK 51 test finds that panel by binding text and would match twice); the Shape button's `Visibility` is bound to `CanToggleClipShape`, so the circle option is NOT OFFERED in the vertical Chat layout. **TASK 58:** every drop-down, check box and field in the properties panel carries the theme's style (`YtComboBox`/`YtCheckBox`/`YtTextBoxCompact`) and paints no colour of its own — the guard is `ytLive.Tests/PropertiesStyleTests.cs`. **TASK 59:** the webcam's properties are a HIERARCHY — a `Shape` title owns the mirror switch and the shape choice (`Rect` | `Circle` as two `SegmentToggle` options, Rect selected by default, the circle option hidden where `CanToggleClipShape` is false), and every titled block (Geometry, Border Color, Border Thickness, Background) owns its content one indent deeper (Strength sits under Blur). **TASK 60:** the border-colour drop-down builds its menu from `Models/BorderColorPalette.cs` — each row is the hex plus the colour's NAME (`#e94560  Crimson`, tooltip "Crimson (#e94560)"); the swatch icon is unchanged. **TASK 61:** the four geometry fields (X/Y/W/H) share one fixed width (44px — the largest value, 1920, plus a sign) and their rows set `LastChildFill="False"`, so Y/H no longer stretch to fill the row. **TASK 62:** the border-colour field shows the palette's name beside the hex (`SelectedElement.BorderColorName`, empty for a custom hex) and keeps a fixed width so the name stays next to the hex. **TASK 63:** the border colour is picked with the **app's own drop-down** (`YtComboBox`) — the `...` button and its code-built `ContextMenu` are gone; the closed box shows the swatch + the colour's NAME, the rows show swatch + hex + name (the panel's own `DataTemplate`s + `Helpers/ClosedBoxTemplateSelector.cs`), and the hex field stays for a custom colour; `IsDescendantOf` falls back to `LogicalTreeHelper.GetParent` / `TemplatedParent` when `VisualTreeHelper.GetParent` returns `null` (at `PopupRoot`) so clicking a popup row does not trigger `MainWindow`'s deselection guard |
-| `OverlayHost.xaml(.cs)` | Root-grid overlays: App Settings / Report Bug / Feature Request / About; About includes the output-quality conversion copy and an explicit llamacasty.com link, while the licensing/legal panel remains in-app. App Settings groups recording, brand-logo, preview, transition, and layout-default controls. `BackToAbout_Click` lives here |
+| `OverlayHost.xaml(.cs)` | Root-grid overlays: App Settings / Report Bug / Feature Request / About; About includes the output-quality conversion copy and an explicit llamacasty.com link, while the licensing/legal panel remains in-app. App Settings groups recording, brand-logo, preview, transition, and staged/all-scene layout-default controls. `BackToAbout_Click` lives here |
 | `SceneThumbnailStrip.xaml.cs` | Code-behind for the strip above |
 | `LeftPanel.xaml.cs` | Code-behind for the panel above |
 
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
index 06dc237..a024a93 100644
--- a/ViewModels/MainViewModel.cs
+++ b/ViewModels/MainViewModel.cs
@@ -193,6 +193,8 @@ public partial class MainViewModel : ViewModelBase
     public ICommand AddReplayLayerCommand { get; }
     /// <summary>TASK 37: replace the current scene set with its factory snapshot.</summary>
     public ICommand RestoreAllLayoutDefaultsCommand { get; }
+    /// <summary>TASK 37: restore only the staged canonical scene to its factory snapshot.</summary>
+    public ICommand RestoreStagedSceneDefaultsCommand { get; }
     public ICommand ChangeMediaFileCommand { get; }
     /// <summary>Accepts the detector's green/blue-screen offer on a clip (TASK 64).</summary>
     public ICommand AcceptChromaSuggestionCommand { get; }
@@ -275,6 +277,8 @@ public partial class MainViewModel : ViewModelBase
         AddReplayLayerCommand = new RelayCommand(_ => AddReplayLayer());
         RestoreAllLayoutDefaultsCommand = new RelayCommand(_ => RestoreAllLayoutDefaults(),
             _ => IsOffline && !IsRecording);
+        RestoreStagedSceneDefaultsCommand = new RelayCommand(_ => RestoreStagedSceneDefaults(),
+            _ => IsOffline && !IsRecording && StagedScene is { } scene && SceneCatalog.IsCanonical(scene.Name));
         ChangeMediaFileCommand = new RelayCommand(
             element => ChangeMediaFile(element as Source),
             element => element is Source { IsMediaSource: true });
@@ -642,6 +646,16 @@ public partial class MainViewModel : ViewModelBase
         LoadLayout();
     }
 
+    private void RestoreStagedSceneDefaults()
+    {
+        if (!IsOffline || IsRecording || StagedScene is not { } staged || !SceneCatalog.IsCanonical(staged.Name)) return;
+        var sceneName = staged.Name;
+        SaveLayoutNow();
+        if (!_layoutStore.RestoreDefaultScene(staged.Id)) return;
+        LoadLayout();
+        StagedScene = Scenes.FirstOrDefault(scene => SceneCatalog.Is(scene.Name, sceneName)) ?? StagedScene;
+    }
+
     private void ScheduleSave()
     {
         if (_isLoading || _saveDebounce == null) return;
diff --git a/ytLive.Tests/LayoutResetIntegrationTests.cs b/ytLive.Tests/LayoutResetIntegrationTests.cs
index b83adfc..e6a8510 100644
--- a/ytLive.Tests/LayoutResetIntegrationTests.cs
+++ b/ytLive.Tests/LayoutResetIntegrationTests.cs
@@ -51,4 +51,42 @@ public sealed class LayoutResetIntegrationTests
             try { File.Delete(tempDb); } catch { /* best-effort cleanup */ }
         }
     });
+
+    [Fact]
+    public void SettingsRestoreStagedScene_LeavesOtherSceneEditsAndSelectionIntact() => _app.Run(() =>
+    {
+        var tempDb = Path.Combine(Path.GetTempPath(), $"ytLlive-layout-reset-{Guid.NewGuid():N}.db");
+        MainViewModel.LayoutPathOverride = tempDb;
+        MainViewModel? vm = null;
+        try
+        {
+            vm = new MainViewModel();
+            var starting = vm.Scenes.Single(scene => SceneCatalog.Is(scene.Name, SceneCatalog.Starting));
+            var brb = vm.Scenes.Single(scene => SceneCatalog.Is(scene.Name, SceneCatalog.Brb));
+            starting.Elements.Add(new Source { Name = "Keep this edit", Type = SourceType.TextOverlay });
+            brb.Elements.Add(new Source { Name = "Reset this edit", Type = SourceType.TextOverlay });
+            vm.SaveLayoutNow();
+            vm.StagedScene = brb;
+
+            Assert.True(vm.RestoreStagedSceneDefaultsCommand.CanExecute(null));
+            vm.RestoreStagedSceneDefaultsCommand.Execute(null);
+
+            Assert.Contains(vm.Scenes.Single(scene => SceneCatalog.Is(scene.Name, SceneCatalog.Starting))
+                .Elements.OfType<Source>(), source => source.Name == "Keep this edit");
+            Assert.DoesNotContain(vm.Scenes.Single(scene => SceneCatalog.Is(scene.Name, SceneCatalog.Brb))
+                .Elements.OfType<Source>(), source => source.Name == "Reset this edit");
+            Assert.True(SceneCatalog.Is(vm.StagedScene?.Name, SceneCatalog.Brb));
+
+            var settingsXaml = SourceAssert.Text("Controls", "SettingsDrawer.xaml");
+            Assert.Contains("Content=\"Restore staged scene\"", settingsXaml);
+            Assert.Contains("Command=\"{Binding RestoreStagedSceneDefaultsCommand}\"", settingsXaml);
+        }
+        finally
+        {
+            vm?.Shutdown();
+            MainViewModel.LayoutPathOverride = null;
+            SqliteConnection.ClearAllPools();
+            try { File.Delete(tempDb); } catch { /* best-effort cleanup */ }
+        }
+    });
 }