Fix AppSDK visibility and icon usage

Author: eXpl0it3r

Source/Demo/WinUI/HtmlRenderer.Demo.WinUI.csproj

@@ -20,7 +20,19 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>html.ico</ApplicationIcon>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- ApplicationIcon alone only stamps the .exe resource; MainWindow also loads this file at runtime
+         to set the window/taskbar icon, which a WinUI 3 window does not take from the exe on its own. -->
+    <Content Include="html.ico" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <Target Name="HideWindowsAppSDKPayloadFiles" AfterTargets="AddMicrosoftWindowsAppSDKPayloadFilesFromComponents">
+    <ItemGroup>
+      <None Update="@(None)" Visible="false"
+            Condition="'%(None.DefiningProjectName)' == 'Microsoft.WindowsAppSDK.SelfContained'" />
+    </ItemGroup>
+  </Target>
   <ItemGroup>
     <ProjectReference Include="..\..\HtmlRenderer.WinUI\HtmlRenderer.WinUI.csproj" />
     <ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />

Source/Demo/WinUI/MainWindow.xaml.cs

@@ -51,6 +51,13 @@ public MainWindow()
 
             Title = "HTML Renderer - WinUI 3 Demo";
 
+            // Unlike the WPF/WinForms demo windows, a WinUI 3 window does not pick up the executable
+            // icon stamped by the csproj ApplicationIcon property, so the title bar and taskbar show the
+            // generic default until AppWindow is pointed at the .ico explicitly. BaseDirectory rather
+            // than a relative path: SetIcon resolves against the working directory, which is not the app
+            // directory when the demo is launched from elsewhere.
+            AppWindow.SetIcon(Path.Combine(AppContext.BaseDirectory, "html.ico"));
+
             SamplesLoader.Init("WinUI", typeof(TheArtOfDev.HtmlRenderer.WinUI.HtmlRender).Assembly.GetName().Version.ToString());
 
             // Without this, showcase samples' <link rel="Stylesheet" href="StyleSheet"> never resolves, so

Source/Demo/WinUI/html.ico

@@ -56,7 +56,34 @@ internal sealed class GraphicsAdapter : RGraphics
         /// call - Win2D layers are <see cref="IDisposable"/> and must be disposed in LIFO order, unlike
         /// WPF's <see cref="System.Windows.Media.DrawingContext.Pop"/>, which needs no such bookkeeping.
         /// </summary>
-        private readonly Stack<CanvasActiveLayer> _layerStack = new Stack<CanvasActiveLayer>();
+        private readonly Stack<ClipLayer> _layerStack = new Stack<ClipLayer>();
+
+        /// <summary>
+        /// A single entry of <see cref="_layerStack"/>: the pushed Win2D layer and, for
+        /// <see cref="PushClipExclude"/>, the geometry masking it. The mask has to outlive the layer - D2D
+        /// reads it until the layer is popped - so the two are released together in <see cref="PopClip"/>.
+        /// Both are null on a measure-only instance, which has no session to push a layer on.
+        /// </summary>
+        private readonly struct ClipLayer
+        {
+            public ClipLayer(CanvasActiveLayer layer, CanvasGeometry mask)
+            {
+                Layer = layer;
+                Mask = mask;
+            }
+
+            private CanvasActiveLayer Layer { get; }
+
+            private CanvasGeometry Mask { get; }
+
+            public void Dispose()
+            {
+                if (Layer != null)
+                    Layer.Dispose();
+                if (Mask != null)
+                    Mask.Dispose();
+            }
+        }
 
         #endregion
 
@@ -108,17 +135,36 @@ public override void PopClip()
         public override void PushClip(RRect rect)
         {
             _clipStack.Push(rect);
-            _layerStack.Push(_g.CreateLayer(1f, Utils.Convert(rect)));
+
+            // Measure-only instance - the clip is still tracked for layout, but there is no session to
+            // push it onto (same null-session guard as SetAntiAliasSmoothingMode below).
+            _layerStack.Push(_g != null
+                ? new ClipLayer(_g.CreateLayer(1f, Utils.Convert(rect)), null)
+                : new ClipLayer(null, null));
         }
 
         public override void PushClipExclude(RRect rect)
         {
-            var full = CanvasGeometry.CreateRectangle(_device, Utils.Convert(_clipStack.Peek()));
-            var excluded = CanvasGeometry.CreateRectangle(_device, Utils.Convert(rect));
-            var combined = full.CombineWith(excluded, Matrix3x2.Identity, CanvasGeometryCombine.Exclude);
+            var current = _clipStack.Peek();
+            _clipStack.Push(current);
+
+            if (_g == null)
+            {
+                _layerStack.Push(new ClipLayer(null, null));
+                return;
+            }
+
+            // full/excluded are only inputs to the combine, so they are released right away; combined is
+            // handed to the layer and released with it. All three are unmanaged D2D resources created on
+            // every clip-exclude of every paint, so none of them can be left to the finalizer.
+            CanvasGeometry combined;
+            using (var full = CanvasGeometry.CreateRectangle(_device, Utils.Convert(current)))
+            using (var excluded = CanvasGeometry.CreateRectangle(_device, Utils.Convert(rect)))
+            {
+                combined = full.CombineWith(excluded, Matrix3x2.Identity, CanvasGeometryCombine.Exclude);
+            }
 
-            _clipStack.Push(_clipStack.Peek());
-            _layerStack.Push(_g.CreateLayer(1f, combined));
+            _layerStack.Push(new ClipLayer(_g.CreateLayer(1f, combined), combined));
         }
 
         public override object SetAntiAliasSmoothingMode()

Source/HtmlRenderer.WinUI/Adapters/GraphicsAdapter.cs

@@ -62,6 +62,13 @@ internal sealed class WinUIAdapter : RAdapter
         /// </summary>
         private readonly CanvasDevice _device;
 
+        /// <summary>
+        /// The system settings object the app-theme subscription in the constructor hangs off - kept in a
+        /// field for the adapter lifetime because ColorValuesChanged only lives as long as the UISettings
+        /// instance does, so a local would be collected and the notification would never arrive.
+        /// </summary>
+        private readonly UISettings _uiSettings;
+
         // Backs LoadFontFaceFontInt's temp-file registration - CanvasFontSet's documented in-memory story
         // is a file Uri, mirroring WPF's own Fonts.GetFontFamilies(Uri) constraint (see that class's own
         // remarks) - one directory per process, cleaned up by the OS's normal temp-file housekeeping.
@@ -124,8 +131,8 @@ private WinUIAdapter()
                 // families upfront); its failure shouldn't prevent the adapter itself from initializing.
             }
 
-            var uiSettings = new UISettings();
-            uiSettings.ColorValuesChanged += (sender, e) =>
+            _uiSettings = new UISettings();
+            _uiSettings.ColorValuesChanged += (sender, e) =>
             {
                 var previous = _colorScheme;
                 _colorScheme = null;