diff --git a/src/Artemis.Core/Extensions/SKPaintExtensions.cs b/src/Artemis.Core/Extensions/SKPaintExtensions.cs index eea179e7a..87844de0b 100644 --- a/src/Artemis.Core/Extensions/SKPaintExtensions.cs +++ b/src/Artemis.Core/Extensions/SKPaintExtensions.cs @@ -2,9 +2,16 @@ namespace Artemis.Core; -internal static class SKPaintExtensions +/// +/// A static class providing extensions +/// +public static class SKPaintExtensions { - internal static void DisposeSelfAndProperties(this SKPaint paint) + /// + /// Disposes the paint and its disposable properties such as shaders and filters. + /// + /// The pain to dispose. + public static void DisposeSelfAndProperties(this SKPaint paint) { paint.ImageFilter?.Dispose(); paint.ColorFilter?.Dispose(); diff --git a/src/Artemis.UI/ArtemisBootstrapper.cs b/src/Artemis.UI/ArtemisBootstrapper.cs index dbed7a0f4..fda2661ae 100644 --- a/src/Artemis.UI/ArtemisBootstrapper.cs +++ b/src/Artemis.UI/ArtemisBootstrapper.cs @@ -16,6 +16,7 @@ using Artemis.WebClient.Workshop.DryIoc; using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Logging; using Avalonia.Styling; using DryIoc; using ReactiveUI; @@ -32,9 +33,9 @@ public static class ArtemisBootstrapper { if (_application != null || _container != null) throw new ArtemisUIException("UI already bootstrapped"); - + Utilities.PrepareFirstLaunch(); - + application.RequestedThemeVariant = ThemeVariant.Dark; _application = application; _container = new Container(rules => rules @@ -51,6 +52,8 @@ public static class ArtemisBootstrapper configureServices?.Invoke(_container); _container.UseDryIocDependencyResolver(); + + Logger.Sink = _container.Resolve(); return _container; } diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml index 900e4d666..c02ad3d60 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml +++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml @@ -24,7 +24,8 @@ Margin="10 2" ItemsSource="{CompiledBinding SidebarScreen.Screens}" SelectedItem="{CompiledBinding SelectedScreen}" - ItemContainerTheme="{StaticResource MenuTreeViewItem}"> + ItemContainerTheme="{StaticResource MenuTreeViewItem}" + PointerReleased="InputElement_OnPointerReleased">