move the design mode styles into ConsoloniaApplication.

cleanup background look and feel

src/Consolonia.Core/Infrastructure/ConsoloniaApplication.cs

@@ -1,5 +1,10 @@
 using Avalonia;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Consolonia.Core.Drawing;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -12,5 +17,47 @@ public override void RegisterServices()
             AvaloniaLocator.CurrentMutable.Bind<IKeyboardNavigationHandler>()
                 .ToConstant(new ArrowsAndKeyboardNavigationHandler(keyboardNavigationHandler));
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            base.OnFrameworkInitializationCompleted();
+
+            if (Design.IsDesignMode)
+            {
+                // For previewing in Visual Studio designer without Design.PreviewWith tag we need to set default font and colors
+                // get anything to render. This is not perfect, but nicer than getting a big error screen.
+                if (!this.Styles.TryGetResource("ThemeForegroundBrush", null, out var foregroundBrush))
+                    foregroundBrush = (ConsoleBrush)Brushes.White;
+
+                if (!this.Styles.TryGetResource("ThemeBackgroundBrush", null, out var backgroundBrush))
+                    backgroundBrush = (ConsoleBrush)Brushes.Black;
+
+                this.Styles.Add(new Style(x => x.Is<TemplatedControl>())
+                {
+                    Setters =
+                    {
+                        new Setter(TemplatedControl.FontSizeProperty, 16.0),
+                        new Setter(TemplatedControl.FontFamilyProperty, new FontFamily("Cascadia Mono")),
+                        new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(((ConsoleBrush)foregroundBrush).Color)),
+                        new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(((ConsoleBrush)backgroundBrush).Color)),
+                    }
+                });
+
+                // EXPERIMENTAL
+                // If you do RenderTRansform="scale(10.0,10.0) you can actually sort of see the UI get bigger
+                // but this doesn' seem to work when using these style setters. <sigh>
+                //this.Styles.Add(new Style(x => x.Is<Visual>())
+                //{
+                //    Setters =
+                //    {
+                //        //new Setter(Visual.RenderTransformOriginProperty, RelativePoint.TopLeft),
+                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
+                //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
+                //    }
+                //});
+            }
+
+
+        }
     }
 }

src/Consolonia.Designer/ConsolePreview.cs

@@ -1,31 +1,41 @@
 #nullable enable
+using Avalonia;
+using Avalonia.Controls;
+#if DEBUG
 using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Threading;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
 using Newtonsoft.Json;
+#endif 
 
 namespace Consolonia.Designer
 {
+
     /// <summary>
-    /// ConsolePreview is a control that can be used to preview the output of a console AXAML file in visual studio.
+    /// ConsolePreview is a control that can be used to preview the output of a console AXAML file in visual studio. 
     /// </summary>
+    /// <remarks>
+    /// This depends on Consolonia.PreviewHost application to render the view. It
+    /// launches it as a child process with a --buffer width height arguments to tell it
+    /// to output the PixelBuffer as json. The control then reads the json and renders it as a full pixel avalonia control.
+    /// </remarks>
     public class ConsolePreview : UserControl
     {
+#if DEBUG
         private object _lock = new object();
         private Process? _process;
         private Typeface _typeface = new Typeface("Cascadia Mono");
         private double _charWidth;
         private double _charHeight;
+#endif
         private bool _disposedValue;
 
         public static readonly StyledProperty<string> FileNameProperty =
@@ -42,8 +52,8 @@ public class ConsolePreview : UserControl
 
         public ConsolePreview()
         {
+#if DEBUG
             this.FontFamily = FontFamily.Parse("Cascadia Mono");
-
             Initialized += (sender, e) => LoadXaml();
 
             this.PropertyChanged += (sender, e) =>
@@ -53,6 +63,7 @@ public ConsolePreview()
                     LoadXaml();
                 }
             };
+#endif
         }
 
 
@@ -76,6 +87,8 @@ public ConsolePreview()
         /// </summary>
         public bool MonitorChanges { get => GetValue(MonitorChangesProperty); set => SetValue(MonitorChangesProperty, value); }
 
+#if DEBUG
+
         private void LoadXaml()
         {
             lock (_lock)
@@ -380,14 +393,15 @@ public void Flush(bool forceWidth = true)
                 _textRunCharWidth = 0;
             }
         }
-
+#endif
         protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)
             {
                 if (disposing)
                 {
                     // TODO: dispose managed state (managed objects)
+#if DEBUG
 #pragma warning disable CA1416 // Validate platform compatibility
                     lock (_lock)
                     {
@@ -399,6 +413,7 @@ protected virtual void Dispose(bool disposing)
                         }
                     }
 #pragma warning restore CA1416 // Validate platform compatibility
+#endif
                 }
 
                 _disposedValue = true;

src/Consolonia.Designer/Consolonia.Designer.csproj

@@ -4,16 +4,15 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
-      <ProjectReference Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
+      <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 
 </Project>

src/Consolonia.Designer/Extensions.cs

@@ -6,6 +6,17 @@ namespace Consolonia.Designer
 {
     public static class Extensions
     {
+        /// <summary>
+        /// This method is used to initialize consolonia
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// In Design mode it will load up avalonia instead of consolonia so that avalonia
+        /// previewer will attempt to render it. This mostly only works for text layout.
+        /// In release mode it will load consolonia, removing the dependency on the desktop avalonia subsystem.
+        /// NOTE: The package references for 
+        /// </remarks>
         public static AppBuilder UseConsoloniaDesigner(this AppBuilder builder)
         {
 #if DEBUG

src/Consolonia.Gallery/App.cs

@@ -5,7 +5,6 @@
 using Avalonia.Styling;
 using Consolonia.Core.Infrastructure;
 using Consolonia.Gallery.View;
-using Consolonia.Themes.TurboVision.Templates;
 using Consolonia.Themes.TurboVision.Themes.TurboVisionBlack;
 
 namespace Consolonia.Gallery
@@ -20,40 +19,9 @@ static App()
 
         public App()
         {
-            //Styles.Add(new TurboVisionTheme(new Uri("avares://Consolonia.Themes.TurboVision/Themes/TurboVisionDark/TurboVisionDark.axaml")));
+            // Styles.Add(new TurboVisionTheme(new Uri("avares://Consolonia.Themes.TurboVision/Themes/TurboVisionDark/TurboVisionDark.axaml")));
             // Styles.Add(new MaterialTheme(new Uri("avares://Consolonia.Themes.TurboVision/Themes/Material/Material.axaml")));
             Styles.Add(new MaterialTheme(new Uri("avares://Consolonia.Themes.TurboVision/Themes/Fluent/Fluent.axaml")));
-
-            //if (Design.IsDesignMode)
-            //{
-            //    // For previewing in Visual Studio designer without Design.PreviewWith tag we need to set default font and colors
-            //    // get antyhing to render
-            //    turboVisionTheme.TryGetResource("ThemeForegroundBrush", null, out var foregroundBrush);
-            //    turboVisionTheme.TryGetResource("ThemeBackgroundBrush", null, out var backgroundBrush);
-            //    this.Styles.Add(new Style(x => x.Is<TemplatedControl>())
-            //    {
-            //        Setters =
-            //        {
-            //            // new Setter(TemplatedControl.FontSizeProperty, 16.0),
-            //            new Setter(TemplatedControl.FontFamilyProperty, new FontFamily("Cascadia Mono")),
-            //            new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(((ConsoleBrush)foregroundBrush).Color)),
-            //            new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(((ConsoleBrush)backgroundBrush).Color)),
-            //        }
-            //    });
-            //    // If you do RenderTRansform="scale(10.0,10.0) you can actually sort of see the UI get bigger
-            //    // but this doesn' seem to work when using these style setters. <sigh>
-            //    //this.Styles.Add(new Style(x => x.Is<Visual>())
-            //    //{
-            //    //    Setters =
-            //    //    {
-            //    //        //new Setter(Visual.RenderTransformOriginProperty, RelativePoint.TopLeft),
-            //    //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
-            //    //        //new Setter(Visual.RenderTransformProperty, new ScaleTransform(2.0, 2.0)),
-            //    //    }
-            //    //});
-            //}
-
-            //Styles.Add(turboVisionTheme);
         }
 
         public override void OnFrameworkInitializationCompleted()

src/Consolonia.Gallery/Consolonia.Gallery.csproj

@@ -13,7 +13,7 @@
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
         <ProjectReference Include="..\Consolonia.PlatformSupport\Consolonia.PlatformSupport.csproj" />
         <ProjectReference Include="..\Consolonia.Themes.TurboVision\Consolonia.Themes.TurboVision.csproj" />
-        <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Consolonia.Designer\Consolonia.Designer.csproj" />
+        <ProjectReference Include="..\Consolonia.Designer\Consolonia.Designer.csproj" />
         <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 

src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml

@@ -3,7 +3,7 @@
              xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
+             mc:Ignorable="d" d:DesignWidth="80" d:DesignHeight="50"
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryGradientBrush">
 
     <Grid x:Name="MyGrid" RowDefinitions="Auto *">
@@ -18,5 +18,7 @@
             <Button Click="Radial_Click" Background="Gray">Radial</Button>
             <Button Click="Conic_Click" Background="Gray">Conic</Button>
         </StackPanel>
+
+        <StackPanel Grid.Row="1"/>
     </Grid>
 </UserControl>

src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml

@@ -3,7 +3,7 @@
              xmlns:galleryViews="clr-namespace:Consolonia.Gallery.Gallery.GalleryViews"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryScrollViewer">
     <Grid RowDefinitions="Auto, *">
         <StackPanel Orientation="Vertical"

src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml

@@ -3,7 +3,7 @@
              xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryTextBlock">
     <UserControl.Styles>
         <Style Selector="StackPanel">

src/Consolonia.Gallery/Program.cs

@@ -18,19 +18,13 @@ private static void Main(string[] args)
         }
 
         public static AppBuilder BuildAvaloniaApp()
-        {
+         => AppBuilder.Configure<App>()
 #if DEBUG
-            return AppBuilder.Configure<App>()
                 .UseConsoloniaDesigner()
-                .UseAutoDetectedConsole()
-                .LogToException();
 #else
-            return AppBuilder.Configure<App>()
                 .UseConsolonia()
+#endif
                 .UseAutoDetectedConsole()
                 .LogToException();
-#endif
-        }
-
     }
 }

src/Tools/Avalonia.PreviewHost/Views/MainWindow.axaml

@@ -11,7 +11,7 @@
         Icon="/Assets/avalonia-logo.ico"
         Title="PreviewHost">
 
-    <Grid RowDefinitions="Auto *">
+    <Grid RowDefinitions="Auto *" Background="#ff09161e">
         <Menu Background="LightGray" >
             <MenuItem Header="_File">
                 <MenuItem Header="_Open..." Click="OnOpen" />
@@ -33,14 +33,16 @@
 
             <GridSplitter Grid.Column="1"
                 Width="5" ShowsPreview="True"
-                HorizontalAlignment="Stretch" Background="#FF101040"/>
+                HorizontalAlignment="Stretch" Background="Black"/>
 
-            <v:ConsolePreview x:Name="PreviewPane"
-                              Grid.Column="2"
-                              DataContext="{Binding SelectedItem, ElementName=FilesListBox}"
-                              FileName="{Binding FullName}"
-                              Columns="80" Rows="80" MonitorChanges="true"
-                              HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"> 
+                <v:ConsolePreview x:Name="PreviewPane" Background="#FF101020" 
+                                  Grid.Column="2"
+                                  DataContext="{Binding SelectedItem, ElementName=FilesListBox}"
+                                  FileName="{Binding FullName}"
+                                  Columns="80" Rows="40" MonitorChanges="true"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </StackPanel>
 
         </Grid>
     </Grid>

src/Tools/Avalonia.PreviewHost/Views/MainWindow.axaml.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using Consolonia.Designer;
 using PreviewHost.ViewModels;
 
@@ -38,19 +39,23 @@ private async void OnOpen(object? sender, Avalonia.Interactivity.RoutedEventArgs
         {
             return;
         }
-        Model.Files.Clear();
-        var projectFile = files[0].Path.AbsolutePath.Replace('/','\\');
-        this.Title = projectFile;
-
-        var folderRoot = Path.GetDirectoryName(projectFile)!;
-        foreach (var file in Directory.EnumerateFiles(folderRoot, "*.axaml", SearchOption.AllDirectories))
+
+        Dispatcher.UIThread.Invoke(() =>
         {
-            Model.Files.Add(new FileViewModel()
+            Model.Files.Clear();
+            var projectFile = files[0].Path.AbsolutePath.Replace('/', '\\');
+            this.Title = projectFile;
+
+            var folderRoot = Path.GetDirectoryName(projectFile)!;
+            foreach (var file in Directory.EnumerateFiles(folderRoot, "*.axaml", SearchOption.AllDirectories))
             {
-                Name = Path.GetFileName(file), 
-                FullName = file
-            });
-        }
+                Model.Files.Add(new FileViewModel()
+                {
+                    Name = Path.GetFileName(file),
+                    FullName = file
+                });
+            }
+        });
     }
 
     public MainViewModel Model => (MainViewModel)DataContext!;

src/Tools/Consolonia.PreviewHost/Consolonia.PreviewHost.csproj

@@ -5,6 +5,8 @@
         <OutputType>Exe</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <PackAsTool>true</PackAsTool>
+        <ToolCommandName>Consolonia.PreviewHost</ToolCommandName>
     </PropertyGroup>
 
     <ItemGroup>