diff --git a/Directory.Build.props b/Directory.Build.props index 6f6e1e71..5ac9b88e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,4 +19,4 @@ - + \ No newline at end of file diff --git a/src/Consolonia.Designer/ConsolePreview.cs b/src/Consolonia.Designer/ConsolePreview.cs index 5be89b3e..9967c811 100644 --- a/src/Consolonia.Designer/ConsolePreview.cs +++ b/src/Consolonia.Designer/ConsolePreview.cs @@ -1,18 +1,18 @@ #nullable enable -using Avalonia; -using Avalonia.Controls; -using Consolonia.PreviewHost; using System; using System.Diagnostics; 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 Consolonia.PreviewHost; using Newtonsoft.Json; namespace Consolonia.Designer @@ -39,8 +39,14 @@ public class ConsolePreview : UserControl public static readonly StyledProperty MonitorChangesProperty = AvaloniaProperty.Register(nameof(MonitorChanges)); + private readonly Typeface _typeface = new("Cascadia Mono"); + private double _charHeight; + private double _charWidth; + private bool _disposedValue; + private Process? _process; + public ConsolePreview() { _process = null; @@ -119,11 +125,6 @@ public void Dispose() Dispose(true); } - private Process? _process; - private readonly Typeface _typeface = new("Cascadia Mono"); - private double _charWidth; - private double _charHeight; - private void LoadXaml() { string xamlPath; diff --git a/src/Consolonia.Designer/Extensions.cs b/src/Consolonia.Designer/Extensions.cs index 241defd3..1c8acee3 100644 --- a/src/Consolonia.Designer/Extensions.cs +++ b/src/Consolonia.Designer/Extensions.cs @@ -19,7 +19,7 @@ public static class Extensions /// public static AppBuilder UseConsoloniaDesigner(this AppBuilder builder) { - if (Design.IsDesignMode) + if (Design.IsDesignMode) return builder .UsePlatformDetect() .WithInterFont() diff --git a/src/Consolonia.Themes/Fluent/FluentColors.axaml b/src/Consolonia.Themes/Fluent/FluentColors.axaml index 9403ae2c..98def9c1 100644 --- a/src/Consolonia.Themes/Fluent/FluentColors.axaml +++ b/src/Consolonia.Themes/Fluent/FluentColors.axaml @@ -6,7 +6,7 @@ + Color="#323130" /> diff --git a/src/Tools/Consolonia.PreviewHost/App.cs b/src/Tools/Consolonia.PreviewHost/App.cs index f3657f40..a2d9e296 100644 --- a/src/Tools/Consolonia.PreviewHost/App.cs +++ b/src/Tools/Consolonia.PreviewHost/App.cs @@ -17,7 +17,7 @@ static App() public App() { - this.Styles.Add(new MaterialTheme()); + Styles.Add(new MaterialTheme()); } public override void OnFrameworkInitializationCompleted()