Add app icon to all host apps.

Add logo to WASM host app.

src/apps/Highbyte.DotNet6502.App.SadConsole/EmulatorConfig.cs

@@ -11,8 +11,6 @@ public class EmulatorConfig
 {
     public const string ConfigSectionName = "Highbyte.DotNet6502.SadConsoleConfig";
 
-    public string WindowTitle { get; set; }
-
     /// <summary>
     /// Optional. Font used for the UI. If not specified, default SadConsole font is used.
     /// To use a specific  SadConsole Font, include it in your program output directory.
@@ -53,7 +51,6 @@ public class EmulatorConfig
 
     public EmulatorConfig()
     {
-        WindowTitle = "SadConsole + Highbyte.DotNet6502 emulator.";
         UIFont = null;
         UIFontSize = Sizes.One;
         DefaultEmulator = "C64";

src/apps/Highbyte.DotNet6502.App.SadConsole/Highbyte.DotNet6502.App.SadConsole.csproj

@@ -5,8 +5,17 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="favicon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="favicon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\libraries\Highbyte.DotNet6502.Impl.NAudio\Highbyte.DotNet6502.Impl.NAudio.csproj" />
     <ProjectReference Include="..\..\libraries\Highbyte.DotNet6502\Highbyte.DotNet6502.csproj" />

src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs

@@ -11,7 +11,6 @@
 using SadRogue.Primitives;
 using Console = SadConsole.Console;
 
-
 namespace Highbyte.DotNet6502.App.SadConsole;
 
 /// <summary>
@@ -129,7 +128,7 @@ public void Run()
             .AddFrameRenderEvent(RenderSadConsole)
             ;
 
-        Settings.WindowTitle = _emulatorConfig.WindowTitle;
+        Settings.WindowTitle = "Highbyte.DotNet6502 emulator + SadConsole (with NAudio)";
         Settings.ResizeMode = Settings.WindowResizeOptions.None;
 
         // Start SadConsole window

src/apps/Highbyte.DotNet6502.App.SadConsole/appsettings.json

@@ -1,7 +1,5 @@
 {
   "Highbyte.DotNet6502.SadConsoleConfig": {
-
-    "WindowTitle": "Highbyte.DotNet6502 emulator + SadConsole",
     "DefaultEmulator": "C64",
     "UIFont": null, // UI Console font. Leave blank for default SadConsole font.
     "UIFontSize": "One", // UI consoles font (not Emulator console). Possible values: "Quarter", "Half, "One", "Two", "Three", "Four", "Five"

src/apps/Highbyte.DotNet6502.App.SilkNetNative/Highbyte.DotNet6502.App.SilkNetNative.csproj

@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\..\resources\images\favicon.ico" Link="Resources\Images\favicon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\libraries\Highbyte.DotNet6502.Impl.NAudio\Highbyte.DotNet6502.Impl.NAudio.csproj" />
     <ProjectReference Include="..\..\libraries\Highbyte.DotNet6502\Highbyte.DotNet6502.csproj" />
@@ -32,4 +36,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Resources\Images\" />
+  </ItemGroup>
+
 </Project>

src/apps/Highbyte.DotNet6502.App.SilkNetNative/Program.cs

@@ -62,7 +62,7 @@
 
 windowOptions.VSync = false;  // TODO: With Vsync=true Silk.NET seem to use incorrect UpdatePerSecond. The actual FPS its called is 10 lower than it should be (measured in the OnUpdate method)
 windowOptions.WindowState = WindowState.Normal;
-windowOptions.Title = "Highbyte.DotNet6502 emulator in Silk.NET window (+ SkiaSharp, OpenGL, and NAudio)";
+windowOptions.Title = "Highbyte.DotNet6502 emulator + Silk.NET (with SkiaSharp, OpenGL, NAudio)";
 windowOptions.Size = new Vector2D<int>(windowWidth, windowHeight);
 windowOptions.WindowBorder = WindowBorder.Fixed;
 windowOptions.API = GraphicsAPI.Default; // = Default = OpenGL 3.3 with forward compatibility

src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs

@@ -6,6 +6,7 @@
 using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Systems.Logging.InMem;
 using Microsoft.Extensions.Logging;
+using Silk.NET.Core;
 
 namespace Highbyte.DotNet6502.App.SilkNetNative;
 
@@ -115,6 +116,8 @@ protected void OnLoad()
     {
         SetUninitializedWindow();
 
+        SetIcon();
+
         _renderContextContainer = CreateRenderContext();
         _inputHandlerContext = CreateInputHandlerContext();
         _audioHandlerContext = CreateAudioHandlerContext();
@@ -143,6 +146,13 @@ protected void OnLoad()
         _imGuiWindows.Add(_logsPanel);
     }
 
+    private void SetIcon()
+    {
+        //RawImage icon = SilkNetImageLoader.ReadFileAsRawImage("../../../../../../resources/images/favicon.ico");
+        RawImage icon = SilkNetImageLoader.ReadFileAsRawImage("Highbyte.DotNet6502.App.SilkNetNative.Resources.Images.favicon.ico", isEmbeddedResource: true);
+        _window.SetWindowIcon(ref icon);
+    }
+
     protected void OnClosing()
     {
         base.Close();

src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetImageLoader.cs

@@ -0,0 +1,42 @@
+using System.Reflection;
+using Silk.NET.Core;
+
+namespace Highbyte.DotNet6502.App.SilkNetNative;
+public class SilkNetImageLoader
+{
+    public static RawImage ReadFileAsRawImage(string path, bool isEmbeddedResource = false)
+    {
+        byte[] fileBytes;
+        if (isEmbeddedResource)
+        {
+            Assembly assembly = Assembly.GetExecutingAssembly();
+            using (Stream? resourceStream = assembly.GetManifestResourceStream(path))
+            {
+                if (resourceStream == null)
+                    throw new Exception($"Cannot open stream to resource {path} in current assembly.");
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    resourceStream.CopyTo(ms);
+                    fileBytes = ms.ToArray();
+                }
+            }
+        }
+        else
+        {
+            fileBytes = File.ReadAllBytes(path);
+        }
+
+        var bitmap = SKBitmap.Decode(fileBytes);
+        byte[] bytes = new byte[bitmap.Pixels.Length * 4];
+        int index = 0;
+        foreach (var pixel in bitmap.Pixels)
+        {
+            bytes[index++] = pixel.Red;
+            bytes[index++] = pixel.Green;
+            bytes[index++] = pixel.Blue;
+            bytes[index++] = pixel.Alpha;
+        }
+        var rawImage = new RawImage(bitmap.Width, bitmap.Height, new Memory<byte>(bytes));
+        return rawImage;
+    }
+}

src/apps/Highbyte.DotNet6502.App.WASM/Highbyte.DotNet6502.App.WASM.csproj

@@ -43,6 +43,7 @@
   <ItemGroup>
     <Folder Include="wwwroot\6502binaries\C64\Assembler\" />
     <Folder Include="wwwroot\6502binaries\C64\Basic\" />
+    <Folder Include="wwwroot\images\" />
   </ItemGroup>
 
   <Target Name="CopyC64ExampleBinaries" AfterTargets="AfterBuild">
@@ -58,4 +59,8 @@
     <Copy SourceFiles="..\..\..\samples\Assembler\Generic\Build\snake6502.prg" DestinationFolder="wwwroot\6502binaries\Generic\Assembler" />
   </Target>
 
+  <Target Name="CopyImages" AfterTargets="AfterBuild">
+    <Copy SourceFiles="..\..\..\resources\images\logo.png" DestinationFolder="wwwroot\images" />
+  </Target>
+
 </Project>

src/apps/Highbyte.DotNet6502.App.WASM/Pages/Index.razor

@@ -111,9 +111,10 @@
             <div id="canvasUninitialized"
                  class="canvasUninitializedStyle">
 
-                <h2>
-                    The DotNet 6502 emulator!
-                </h2>
+                    <h2>
+                    <img src="images/logo.png" align="middle" style="width:100px;height:100px;" title="DotNet 6502 logo">
+                        The DotNet 6502 emulator!
+                    </h2>
 
                 <p>
                     A <a href="https://en.wikipedia.org/wiki/MOS_Technology_6502" target="_blank">6502 CPU</a> emulator written in <a href="https://dotnet.microsoft.com/" target="_blank">.NET</a>, rendered with <a href="https://github.com/mono/SkiaSharp" target="_blank">SkiaSharp</a>, compiled to <a href="https://en.wikipedia.org/wiki/WebAssembly" target="_blank">WebAssembly</a> via <a href="https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor" target="_blank">Blazor</a>, running in a browser.