From 5b5acf2f76356046bbb961b8e988a45fd3acac44 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 31 Mar 2023 20:52:38 +0200 Subject: [PATCH] Fixed remaining compile errors --- src/Artemis.Core/Artemis.Core.csproj | 2 +- src/Artemis.Core/Constants.cs | 1 - src/Artemis.Core/Events/UpdateEventArgs.cs | 1 - .../WebServer/WebModuleRegistration.cs | 1 - src/Artemis.Storage/Artemis.Storage.csproj | 2 +- src/Artemis.UI.Linux/App.axaml.cs | 2 +- src/Artemis.UI.Linux/Artemis.UI.Linux.csproj | 2 +- src/Artemis.UI.MacOS/App.axaml.cs | 2 +- src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj | 2 +- .../Artemis.UI.Shared.csproj | 4 +- .../Controls/DeviceVisualizer.cs | 2 - .../Controls/EnumComboBox.axaml | 2 +- .../Controls/EnumComboBox.axaml.cs | 2 +- src/Artemis.UI.Shared/ReactiveAppWindow.cs | 32 ++- .../Services/Builders/ContentDialogBuilder.cs | 1 - src/Artemis.UI.Windows/App.axaml.cs | 2 +- .../Artemis.UI.Windows.csproj | 2 +- .../DryIoc/ContainerExtensions.cs | 2 +- .../Properties/launchSettings.json | 2 +- .../Providers/Input/SpongeWindow.cs | 25 --- .../Providers/Input/SpongeWindowEventArgs.cs | 19 -- .../Providers/Input/WindowsInputProvider.cs | 30 ++- .../WindowsUpdateNotificationProvider.cs | 1 - .../SkiaSharp/Vulkan/Win32VkContext.cs | 9 +- src/Artemis.UI/Artemis.UI.csproj | 6 +- src/Artemis.UI/MainWindow.axaml | 5 +- src/Artemis.UI/MainWindow.axaml.cs | 19 +- .../PerformanceDebugProfilerView.axaml | 1 - src/Artemis.UI/Screens/Home/HomeView.axaml | 2 +- .../Plugins/PluginPrerequisiteView.axaml | 2 +- .../Screens/Plugins/PluginView.axaml.cs | 1 - .../Screens/Plugins/PluginViewModel.cs | 1 - .../Behaviors/ProfileTreeViewDropHandler.cs | 1 - .../ProfileTree/FolderTreeItemView.axaml.cs | 1 - .../ProfileTree/LayerTreeItemView.axaml.cs | 1 - .../Panels/ProfileTree/ProfileTreeView.axaml | 14 +- .../ProfileTree/ProfileTreeView.axaml.cs | 2 +- .../Timeline/Segments/EndSegmentView.axaml.cs | 2 - .../Segments/MainSegmentView.axaml.cs | 2 - .../Segments/StartSegmentView.axaml.cs | 2 - .../Segments/StartSegmentViewModel.cs | 1 - .../Segments/TimelineSegmentViewModel.cs | 1 - .../Properties/Timeline/TimelineView.axaml.cs | 2 - .../Tools/TransformToolView.axaml.cs | 1 - .../LayerShapeVisualizerView.axaml.cs | 2 - .../Visualizers/LayerVisualizerView.axaml.cs | 2 - .../ProfileEditorTitleBarView.axaml.cs | 1 - .../ProfileEditor/ProfileEditorView.axaml | 3 +- .../ProfileEditor/ProfileEditorView.axaml.cs | 1 - .../Screens/Settings/Tabs/AboutTabView.axaml | 2 +- .../Settings/Tabs/PluginsTabView.axaml | 2 +- .../Settings/Updating/ReleaseView.axaml | 161 +-------------- .../ProfileConfigurationDropHandler.cs | 1 - .../ProfileConfigurationEditView.axaml.cs | 1 - .../Screens/Sidebar/SidebarView.axaml | 7 +- .../StartupWizard/StartupWizardView.axaml.cs | 2 - .../StartupWizard/StartupWizardViewModel.cs | 3 - .../StartupWizard/Steps/WelcomeStep.axaml | 2 +- .../SurfaceEditor/SurfaceEditorView.axaml | 2 +- .../SurfaceEditor/SurfaceEditorView.axaml.cs | 10 +- .../VisualScripting/CableView.axaml.cs | 2 - .../VisualScripting/DragCableView.axaml.cs | 3 - .../VisualScripting/NodePickerView.axaml.cs | 2 - .../VisualScripting/NodeScriptView.axaml | 4 +- .../VisualScripting/NodeScriptView.axaml.cs | 58 +++--- .../Services/Updating/UpdateService.cs | 7 +- src/Artemis.UI/Styles/Artemis.axaml | 7 +- src/Artemis.UI/Styles/Markdown.axaml | 191 ------------------ src/Artemis.UI/ViewLocator.cs | 2 +- .../Artemis.VisualScripting.csproj | 2 +- .../ColorGradientNodeCustomView.axaml.cs | 2 +- .../RampSKColorNodeCustomView.axaml.cs | 2 +- ...DataModelEventCycleNodeCustomView.axaml.cs | 2 +- .../DataModelEventNodeCustomView.axaml.cs | 2 +- .../Screens/DataModelNodeCustomView.axaml.cs | 2 +- .../LayerPropertyNodeCustomView.axaml.cs | 2 +- .../LayerPropertyNodeCustomViewModel.cs | 2 +- ...HotkeyEnableDisableNodeCustomView.axaml.cs | 2 - .../HotkeyEnableDisableNodeCustomViewModel.cs | 2 +- .../HotkeyPressNodeCustomView.axaml.cs | 2 - .../Screens/HotkeyPressNodeCustomViewModel.cs | 2 +- .../HotkeyToggleNodeCustomView.axaml.cs | 2 - .../HotkeyToggleNodeCustomViewModel.cs | 2 +- .../PressedKeyPositionNodeCustomViewModel.cs | 2 +- .../MathExpressionNodeCustomView.axaml.cs | 2 +- .../MathExpressionNodeCustomViewModel.cs | 4 +- .../Screens/EnumEqualsNodeCustomView.axaml | 1 - .../Screens/EnumEqualsNodeCustomView.axaml.cs | 2 +- .../Screens/EnumEqualsNodeCustomViewModel.cs | 2 +- .../DisplayValueNodeCustomView.axaml.cs | 2 +- .../StaticNumericValueNodeCustomView.axaml.cs | 2 +- .../StaticSKColorValueNodeCustomView.axaml.cs | 2 +- .../StaticStringValueNodeCustomView.axaml.cs | 2 +- .../EasingFunctionNodeCustomView.axaml.cs | 2 +- .../Screens/EasingFunctionView.axaml.cs | 2 +- .../Artemis.WebClient.Updating.csproj | 2 +- 96 files changed, 167 insertions(+), 583 deletions(-) delete mode 100644 src/Artemis.UI.Windows/Providers/Input/SpongeWindow.cs delete mode 100644 src/Artemis.UI.Windows/Providers/Input/SpongeWindowEventArgs.cs delete mode 100644 src/Artemis.UI/Styles/Markdown.axaml diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index db11e2724..b864770d7 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 false false Artemis.Core diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs index fd0300579..b5341f3e5 100644 --- a/src/Artemis.Core/Constants.cs +++ b/src/Artemis.Core/Constants.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Reflection; using Artemis.Core.JsonConverters; using Artemis.Core.Services; -using Artemis.Core.Services.Core; using Artemis.Core.SkiaSharp; using Newtonsoft.Json; diff --git a/src/Artemis.Core/Events/UpdateEventArgs.cs b/src/Artemis.Core/Events/UpdateEventArgs.cs index d513bae5e..977e4fe91 100644 --- a/src/Artemis.Core/Events/UpdateEventArgs.cs +++ b/src/Artemis.Core/Events/UpdateEventArgs.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace Artemis.Core; diff --git a/src/Artemis.Core/Services/WebServer/WebModuleRegistration.cs b/src/Artemis.Core/Services/WebServer/WebModuleRegistration.cs index 450ac7435..270a5ec4d 100644 --- a/src/Artemis.Core/Services/WebServer/WebModuleRegistration.cs +++ b/src/Artemis.Core/Services/WebServer/WebModuleRegistration.cs @@ -1,6 +1,5 @@ using System; using EmbedIO; -using DryIoc; namespace Artemis.Core.Services; diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj index 2e7bb99ae..a8606b171 100644 --- a/src/Artemis.Storage/Artemis.Storage.csproj +++ b/src/Artemis.Storage/Artemis.Storage.csproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 false x64 diff --git a/src/Artemis.UI.Linux/App.axaml.cs b/src/Artemis.UI.Linux/App.axaml.cs index 7040f8183..1a6cd64a5 100644 --- a/src/Artemis.UI.Linux/App.axaml.cs +++ b/src/Artemis.UI.Linux/App.axaml.cs @@ -5,7 +5,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using Avalonia.Threading; +using Avalonia.ReactiveUI; using DryIoc; using ReactiveUI; diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj index 86ccbb134..fb6d0c80e 100644 --- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj +++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj @@ -1,7 +1,7 @@ WinExe - net6.0 + net7.0 enable x64 x64 diff --git a/src/Artemis.UI.MacOS/App.axaml.cs b/src/Artemis.UI.MacOS/App.axaml.cs index f1aed23d3..0d81b318d 100644 --- a/src/Artemis.UI.MacOS/App.axaml.cs +++ b/src/Artemis.UI.MacOS/App.axaml.cs @@ -1,7 +1,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using Avalonia.Threading; +using Avalonia.ReactiveUI; using DryIoc; using ReactiveUI; diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj index f5f4606ce..000fe864e 100644 --- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj +++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + net7.0 enable x64 x64 diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index af6424e4c..275ab7f87 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -1,7 +1,7 @@  Library - net6.0 + net7.0 enable bin\ x64 @@ -17,7 +17,7 @@ - + diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs index b751bc6cb..b995da975 100644 --- a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs +++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs @@ -12,8 +12,6 @@ using Avalonia.Input; using Avalonia.LogicalTree; using Avalonia.Media; using Avalonia.Media.Imaging; -using Avalonia.Platform; -using Avalonia.Rendering; using Avalonia.Threading; namespace Artemis.UI.Shared; diff --git a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml index 59195d73a..1849c97e5 100644 --- a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml +++ b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Shared.EnumComboBox"> - + diff --git a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs index d7ecc43c6..3048f239b 100644 --- a/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs +++ b/src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs @@ -90,7 +90,7 @@ public partial class EnumComboBox : UserControl /// protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) { - _enumComboBox = this.Get("EnumComboBox"); + _enumComboBox = this.Get("ChildEnumComboBox"); _enumComboBox.Items = _currentValues; UpdateValues(); diff --git a/src/Artemis.UI.Shared/ReactiveAppWindow.cs b/src/Artemis.UI.Shared/ReactiveAppWindow.cs index 36483f57c..58f4ad820 100644 --- a/src/Artemis.UI.Shared/ReactiveAppWindow.cs +++ b/src/Artemis.UI.Shared/ReactiveAppWindow.cs @@ -4,6 +4,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Media; using Avalonia.Media.Immutable; +using Avalonia.Styling; using FluentAvalonia.UI.Media; using FluentAvalonia.UI.Windowing; using ReactiveUI; @@ -46,13 +47,9 @@ public class ReactiveAppWindow : AppWindow, IViewFor whe if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || !IsWindows11) return; - // Enable Mica on Windows 11, based on the FluentAvalonia sample application TransparencyBackgroundFallback = Brushes.Transparent; TransparencyLevelHint = WindowTransparencyLevel.Mica; - - Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", out object? value) ? (Color) value! : new Color2(32, 32, 32); - color = color.LightenPercent(-0.5f); - Background = new ImmutableSolidColorBrush(color, 0.82); + TryEnableMicaEffect(); } private void OnDataContextChanged(object? value) @@ -70,6 +67,31 @@ public class ReactiveAppWindow : AppWindow, IViewFor whe else if (DataContext != value) DataContext = value; } + private void TryEnableMicaEffect() + { + // The background colors for the Mica brush are still based around SolidBackgroundFillColorBase resource + // BUT since we can't control the actual Mica brush color, we have to use the window background to create + // the same effect. However, we can't use SolidBackgroundFillColorBase directly since its opaque, and if + // we set the opacity the color become lighter than we want. So we take the normal color, darken it and + // apply the opacity until we get the roughly the correct color + // NOTE that the effect still doesn't look right, but it suffices. Ideally we need access to the Mica + // CompositionBrush to properly change the color but I don't know if we can do that or not + if (ActualThemeVariant == ThemeVariant.Dark) + { + Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", ThemeVariant.Dark, out object? value) ? (Color) value : new Color2(32, 32, 32); + color = color.LightenPercent(-0.5f); + + Background = new ImmutableSolidColorBrush(color, 0.78); + } + else if (ActualThemeVariant == ThemeVariant.Light) + { + // Similar effect here + Color2 color = this.TryFindResource("SolidBackgroundFillColorBase", ThemeVariant.Light, out object? value) ? (Color) value : new Color2(243, 243, 243); + color = color.LightenPercent(0.5f); + + Background = new ImmutableSolidColorBrush(color, 0.9); + } + } /// /// The ViewModel. diff --git a/src/Artemis.UI.Shared/Services/Builders/ContentDialogBuilder.cs b/src/Artemis.UI.Shared/Services/Builders/ContentDialogBuilder.cs index 275345b0e..92e681433 100644 --- a/src/Artemis.UI.Shared/Services/Builders/ContentDialogBuilder.cs +++ b/src/Artemis.UI.Shared/Services/Builders/ContentDialogBuilder.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Threading.Tasks; using System.Windows.Input; using Avalonia.Controls; diff --git a/src/Artemis.UI.Windows/App.axaml.cs b/src/Artemis.UI.Windows/App.axaml.cs index 9444327c6..617858fb9 100644 --- a/src/Artemis.UI.Windows/App.axaml.cs +++ b/src/Artemis.UI.Windows/App.axaml.cs @@ -13,7 +13,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using Avalonia.Threading; +using Avalonia.ReactiveUI; using DryIoc; using ReactiveUI; diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 9d6fc1088..c06b62687 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows10.0.17763.0 + net7.0-windows10.0.17763.0 enable x64 bin diff --git a/src/Artemis.UI.Windows/DryIoc/ContainerExtensions.cs b/src/Artemis.UI.Windows/DryIoc/ContainerExtensions.cs index 337e21744..de6fb01df 100644 --- a/src/Artemis.UI.Windows/DryIoc/ContainerExtensions.cs +++ b/src/Artemis.UI.Windows/DryIoc/ContainerExtensions.cs @@ -20,7 +20,7 @@ public static class UIContainerExtensions public static void RegisterProviders(this IContainer container) { container.Register(Reuse.Singleton); - container.Register(Reuse.Singleton); + // container.Register(Reuse.Singleton); container.Register(); container.Register(serviceKey: WindowsInputProvider.Id); container.Register(); diff --git a/src/Artemis.UI.Windows/Properties/launchSettings.json b/src/Artemis.UI.Windows/Properties/launchSettings.json index a1588c6f9..cb8118713 100644 --- a/src/Artemis.UI.Windows/Properties/launchSettings.json +++ b/src/Artemis.UI.Windows/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Artemis.UI.Windows": { "commandName": "Project", - "commandLineArgs": "--force-elevation --disable-forced-shutdown --pcmr" + "commandLineArgs": "--disable-forced-shutdown --pcmr" } } } \ No newline at end of file diff --git a/src/Artemis.UI.Windows/Providers/Input/SpongeWindow.cs b/src/Artemis.UI.Windows/Providers/Input/SpongeWindow.cs deleted file mode 100644 index ec8f6d04b..000000000 --- a/src/Artemis.UI.Windows/Providers/Input/SpongeWindow.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using Avalonia.Win32; - -namespace Artemis.UI.Windows.Providers.Input; - -public class SpongeWindow : WindowImpl -{ - public event EventHandler? WndProcCalled; - - #region Overrides of WindowImpl - - /// - protected override IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam) - { - OnWndProcCalled(new SpongeWindowEventArgs(hWnd, msg, wParam, lParam)); - return base.WndProc(hWnd, msg, wParam, lParam); - } - - #endregion - - protected virtual void OnWndProcCalled(SpongeWindowEventArgs e) - { - WndProcCalled?.Invoke(this, e); - } -} \ No newline at end of file diff --git a/src/Artemis.UI.Windows/Providers/Input/SpongeWindowEventArgs.cs b/src/Artemis.UI.Windows/Providers/Input/SpongeWindowEventArgs.cs deleted file mode 100644 index 507b42d8c..000000000 --- a/src/Artemis.UI.Windows/Providers/Input/SpongeWindowEventArgs.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace Artemis.UI.Windows.Providers.Input; - -public class SpongeWindowEventArgs : EventArgs -{ - public SpongeWindowEventArgs(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam) - { - HWnd = hWnd; - Msg = msg; - WParam = wParam; - LParam = lParam; - } - - public IntPtr HWnd { get; } - public uint Msg { get; } - public IntPtr WParam { get; } - public IntPtr LParam { get; } -} \ No newline at end of file diff --git a/src/Artemis.UI.Windows/Providers/Input/WindowsInputProvider.cs b/src/Artemis.UI.Windows/Providers/Input/WindowsInputProvider.cs index ef8f168ec..cd3004b69 100644 --- a/src/Artemis.UI.Windows/Providers/Input/WindowsInputProvider.cs +++ b/src/Artemis.UI.Windows/Providers/Input/WindowsInputProvider.cs @@ -5,6 +5,8 @@ using System.Timers; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Windows.Utilities; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Platform; using Linearstar.Windows.RawInput; using Linearstar.Windows.RawInput.Native; using Serilog; @@ -17,7 +19,6 @@ public class WindowsInputProvider : InputProvider private readonly IInputService _inputService; private readonly ILogger _logger; - private readonly SpongeWindow _sponge; private readonly Timer _taskManagerTimer; private int _lastProcessId; @@ -25,16 +26,24 @@ public class WindowsInputProvider : InputProvider { _logger = logger; _inputService = inputService; - - _sponge = new SpongeWindow(); - _sponge.WndProcCalled += SpongeOnWndProcCalled; - + _taskManagerTimer = new Timer(500); _taskManagerTimer.Elapsed += TaskManagerTimerOnElapsed; _taskManagerTimer.Start(); - RawInputDevice.RegisterDevice(HidUsageAndPage.Keyboard, RawInputDeviceFlags.InputSink, _sponge.Handle.Handle); - RawInputDevice.RegisterDevice(HidUsageAndPage.Mouse, RawInputDeviceFlags.InputSink, _sponge.Handle.Handle); + // if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + // { + // IWindowImpl window = desktop.MainWindow!.PlatformImpl!; + // + // // https://github.com/sanjay900/guitar-configurator/blob/master/Notify/WindowsDeviceNotifierAvalonia.cs + // // _hWndProcHook = GetWindowLongPtr(window.Handle.Handle, GwlWndproc); + // // _fnWndProcHook = CustomWndProc; + // // var newLong = Marshal.GetFunctionPointerForDelegate(_fnWndProcHook); + // // SetWindowLongPtr(window.Handle.Handle, GwlWndproc, newLong); + // + // RawInputDevice.RegisterDevice(HidUsageAndPage.Keyboard, RawInputDeviceFlags.InputSink, window.Handle.Handle); + // RawInputDevice.RegisterDevice(HidUsageAndPage.Mouse, RawInputDeviceFlags.InputSink, window.Handle.Handle); + // } } public static Guid Id { get; } = new("6737b204-ffb1-4cd9-8776-9fb851db303a"); @@ -55,19 +64,18 @@ public class WindowsInputProvider : InputProvider { if (disposing) { - _sponge.Dispose(); _taskManagerTimer.Dispose(); } base.Dispose(disposing); } - private void SpongeOnWndProcCalled(object? sender, SpongeWindowEventArgs message) + private void OnWndProcCalled(nint hWnd, uint msg, nint wParam, nint lParam) { - if (message.Msg != WM_INPUT) + if (msg != WM_INPUT) return; - RawInputData data = RawInputData.FromHandle(message.LParam); + RawInputData data = RawInputData.FromHandle(lParam); switch (data) { case RawInputMouseData mouse: diff --git a/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs b/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs index 7af9d6927..f77ee9226 100644 --- a/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs +++ b/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs @@ -9,7 +9,6 @@ using Artemis.UI.Screens.Settings; using Artemis.UI.Services.Updating; using Artemis.UI.Shared.Services.MainWindow; using Avalonia.Threading; -using DryIoc.ImTools; using Microsoft.Toolkit.Uwp.Notifications; using ReactiveUI; diff --git a/src/Artemis.UI.Windows/SkiaSharp/Vulkan/Win32VkContext.cs b/src/Artemis.UI.Windows/SkiaSharp/Vulkan/Win32VkContext.cs index 7c95696c3..01a2f92d2 100644 --- a/src/Artemis.UI.Windows/SkiaSharp/Vulkan/Win32VkContext.cs +++ b/src/Artemis.UI.Windows/SkiaSharp/Vulkan/Win32VkContext.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Avalonia.Controls; using Avalonia.Win32; using SharpVk; using SharpVk.Khronos; @@ -10,10 +11,10 @@ internal sealed class Win32VkContext : VkContext { public Win32VkContext() { - Window = new WindowImpl(); + Window = new Window(); Instance = Instance.Create(null, new[] {"VK_KHR_surface", "VK_KHR_win32_surface"}); PhysicalDevice = Instance.EnumeratePhysicalDevices().First(); - Surface = Instance.CreateWin32Surface(Kernel32.CurrentModuleHandle, Window.Handle.Handle); + Surface = Instance.CreateWin32Surface(Kernel32.CurrentModuleHandle, Window.PlatformImpl!.Handle.Handle); (GraphicsFamily, PresentFamily) = FindQueueFamilies(); @@ -43,12 +44,12 @@ internal sealed class Win32VkContext : VkContext }; } - public WindowImpl Window { get; } + public Window Window { get; } public override void Dispose() { base.Dispose(); - Window.Dispose(); + Window.Close(); } private IntPtr Proc(string name, IntPtr instanceHandle, IntPtr deviceHandle) diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 799eb4dff..cffb4d57c 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -1,7 +1,7 @@ Library - net6.0 + net7.0 enable bin/ x64 @@ -29,8 +29,8 @@ - - + + diff --git a/src/Artemis.UI/MainWindow.axaml b/src/Artemis.UI/MainWindow.axaml index 7be2a5e6e..a0db3275e 100644 --- a/src/Artemis.UI/MainWindow.axaml +++ b/src/Artemis.UI/MainWindow.axaml @@ -1,8 +1,9 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/Artemis.UI/MainWindow.axaml.cs b/src/Artemis.UI/MainWindow.axaml.cs index a8a49b6b2..4cc1d9fe5 100644 --- a/src/Artemis.UI/MainWindow.axaml.cs +++ b/src/Artemis.UI/MainWindow.axaml.cs @@ -7,13 +7,12 @@ using Artemis.UI.Shared; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using Avalonia.Threading; -using FluentAvalonia.Core.ApplicationModel; +using Avalonia.ReactiveUI; using ReactiveUI; namespace Artemis.UI; -public class MainWindow : ReactiveAppWindow +public partial class MainWindow : ReactiveAppWindow { private readonly Panel _rootPanel; private readonly ContentControl _sidebarContentControl; @@ -25,7 +24,7 @@ public class MainWindow : ReactiveAppWindow Activated += OnActivated; Deactivated += OnDeactivated; - ApplyWindowSize(); + // ApplyWindowSize(); InitializeComponent(); _rootPanel = this.Get("RootPanel"); @@ -67,12 +66,12 @@ public class MainWindow : ReactiveAppWindow private void OnOpened(object? sender, EventArgs e) { Opened -= OnOpened; - ICoreApplicationView coreAppTitleBar = this; - if (coreAppTitleBar.TitleBar != null) - { - coreAppTitleBar.TitleBar.ExtendViewIntoTitleBar = true; - SetTitleBar(this.Get("DragHandle")); - } + // ICoreApplicationView coreAppTitleBar = this; + // if (coreAppTitleBar.TitleBar != null) + // { + // coreAppTitleBar.TitleBar.ExtendViewIntoTitleBar = true; + // SetTitleBar(this.Get("DragHandle")); + // } } private void OnActivated(object? sender, EventArgs e) diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml index d9f712498..27c44a856 100644 --- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml +++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml @@ -9,7 +9,6 @@ Feel like making a donation? It would be gratefully received. Click the button to donate via PayPal. diff --git a/src/Artemis.UI/Screens/Plugins/PluginPrerequisiteView.axaml b/src/Artemis.UI/Screens/Plugins/PluginPrerequisiteView.axaml index 54996af62..af5ac19bf 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginPrerequisiteView.axaml +++ b/src/Artemis.UI/Screens/Plugins/PluginPrerequisiteView.axaml @@ -18,7 +18,7 @@ - + diff --git a/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs b/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs index 4d217c623..2f2db039a 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginView.axaml.cs @@ -1,5 +1,4 @@ using System; -using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs b/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs index 24102dc8c..35d37aa0e 100644 --- a/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs +++ b/src/Artemis.UI/Screens/Plugins/PluginViewModel.cs @@ -13,7 +13,6 @@ using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Avalonia.Controls; using Avalonia.Threading; -using DryIoc; using Material.Icons; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs index 740da8dc6..0a7ba090f 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs @@ -3,7 +3,6 @@ using System.Collections.ObjectModel; using System.Linq; using Avalonia; using Avalonia.Controls; -using Avalonia.Controls.Generators; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.VisualTree; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs index 5fed64811..90957212b 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs @@ -1,6 +1,5 @@ using System; using System.Reactive.Disposables; -using Avalonia.Controls; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs index c912738fb..4f730bd43 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs @@ -1,6 +1,5 @@ using System; using System.Reactive.Disposables; -using Avalonia.Controls; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml index f2438acb5..286b33c93 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml @@ -23,8 +23,8 @@ - - - - - - - diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs index 101a9dd1f..cc0e31197 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs @@ -120,6 +120,6 @@ public partial class ProfileTreeView : ReactiveUserControl private void ProfileTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e) { - ProfileTreeView.Focus(); + Profile.Focus(); } } \ No newline at end of file diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs index b298d9315..846da1b66 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs @@ -1,5 +1,3 @@ -using Avalonia.Controls; -using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs index 6ec76a3b7..db6cb5928 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs @@ -1,5 +1,3 @@ -using Avalonia.Controls; -using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs index 37c6b24fa..2f567292c 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs @@ -1,5 +1,3 @@ -using Avalonia.Controls; -using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs index de289fb17..38acf3c31 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs @@ -5,7 +5,6 @@ using Artemis.Core; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia.Controls.Mixins; using ReactiveUI; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs index f5e39b592..be9c471d4 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs @@ -12,7 +12,6 @@ using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.ProfileEditor; using Artemis.UI.Shared.Services.ProfileEditor.Commands; -using Avalonia.Controls.Mixins; using ReactiveUI; namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs index 37cf942b9..f9b994284 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using System.Linq; using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes; -using Artemis.UI.Shared; using Artemis.UI.Shared.Events; using Artemis.UI.Shared.Extensions; using Avalonia; -using Avalonia.Controls; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs index eede83c42..bfca6c46a 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs @@ -6,7 +6,6 @@ using Artemis.Core; using Artemis.UI.Shared.Extensions; using Avalonia; using Avalonia.Controls; -using Avalonia.Controls.Mixins; using Avalonia.Controls.PanAndZoom; using Avalonia.Controls.Shapes; using Avalonia.Input; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs index 95cc4eca6..aa1e6eda4 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs @@ -2,9 +2,7 @@ using System; using System.Linq; using System.Reactive.Disposables; using Avalonia; -using Avalonia.Controls; using Avalonia.Controls.PanAndZoom; -using Avalonia.Controls.Shapes; using Avalonia.LogicalTree; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs index a7d19a23d..6882addb0 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs @@ -1,9 +1,7 @@ using System; using System.Linq; using Avalonia; -using Avalonia.Controls; using Avalonia.Controls.PanAndZoom; -using Avalonia.Controls.Shapes; using Avalonia.LogicalTree; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs index 54e33fa6e..abce2bd21 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Interactivity; using Avalonia.Markup.Xaml; namespace Artemis.UI.Screens.ProfileEditor; diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml index 3f857f1d2..2e6af4e05 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml @@ -8,8 +8,7 @@ xmlns:shared="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Screens.ProfileEditor.ProfileEditorView" - x:DataType="profileEditor:ProfileEditorViewModel" - Name="ProfileEditorView"> + x:DataType="profileEditor:ProfileEditorViewModel"> diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs index ecdc2dfb8..ee2319ea3 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs @@ -1,5 +1,4 @@ using Avalonia; -using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml index 3f3571c93..ce9f301d8 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml +++ b/src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml @@ -29,7 +29,7 @@ - + diff --git a/src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml b/src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml index b1f10bdab..bdec0d278 100644 --- a/src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml +++ b/src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml @@ -157,166 +157,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Artemis.UI/Screens/Sidebar/Behaviors/ProfileConfigurationDropHandler.cs b/src/Artemis.UI/Screens/Sidebar/Behaviors/ProfileConfigurationDropHandler.cs index 7d6977eb8..8e4d4d108 100644 --- a/src/Artemis.UI/Screens/Sidebar/Behaviors/ProfileConfigurationDropHandler.cs +++ b/src/Artemis.UI/Screens/Sidebar/Behaviors/ProfileConfigurationDropHandler.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.Controls; -using Avalonia.Controls.Generators; using Avalonia.Input; using Avalonia.VisualTree; using Avalonia.Xaml.Interactions.DragAndDrop; diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs index 0b134ddc5..fc6a5f097 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml.cs @@ -2,7 +2,6 @@ using System; using System.Reactive.Disposables; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Controls; using Avalonia.Markup.Xaml; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml index d20036165..e4e9a7c40 100644 --- a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml +++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml @@ -9,15 +9,12 @@ x:Class="Artemis.UI.Screens.Sidebar.SidebarView" x:DataType="sidebar:SidebarViewModel"> - + - + Artemis 2 diff --git a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs index a4f4e9c04..1e6d7b00f 100644 --- a/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs +++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs @@ -3,9 +3,7 @@ using System.Reactive.Disposables; using Artemis.UI.Screens.StartupWizard.Steps; using Artemis.UI.Shared; using Avalonia; -using Avalonia.Controls; using Avalonia.Markup.Xaml; -using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Navigation; using ReactiveUI; diff --git a/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs b/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs index 99d0eb719..05bbc060c 100644 --- a/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs +++ b/src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs @@ -3,15 +3,12 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive; using System.Reactive.Disposables; -using System.Reflection; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.DeviceProviders; using Artemis.Core.Services; using Artemis.UI.DryIoc.Factories; using Artemis.UI.Screens.Plugins; -using Artemis.UI.Services.Interfaces; -using Artemis.UI.Services.Updating; using Artemis.UI.Shared; using Artemis.UI.Shared.Providers; using Artemis.UI.Shared.Services; diff --git a/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml index f9184e406..6422e2508 100644 --- a/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml +++ b/src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml @@ -30,7 +30,7 @@ - - { InitializeComponent(); - ZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged; - UpdateZoomBorderBackground(); - - ZoomBorder.AddHandler(PointerReleasedEvent, CanvasOnPointerReleased, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); - ZoomBorder.AddHandler(PointerWheelChangedEvent, ZoomOnPointerWheelChanged, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); - ZoomBorder.AddHandler(PointerMovedEvent, ZoomOnPointerMoved, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); - - this.WhenActivated(d => - { - ViewModel!.AutoFitRequested += ViewModelOnAutoFitRequested; - ViewModel.PickerPositionSubject.Subscribe(ShowPickerAt).DisposeWith(d); - if (ViewModel.IsPreview) - { - BoundsProperty.Changed.Subscribe(BoundsPropertyChanged).DisposeWith(d); - ViewModel.NodeViewModels.ToObservableChangeSet().Subscribe(_ => AutoFitIfPreview()).DisposeWith(d); - } - - Dispatcher.UIThread.InvokeAsync(() => AutoFit(true), DispatcherPriority.ContextIdle); - Disposable.Create(() => ViewModel.AutoFitRequested -= ViewModelOnAutoFitRequested).DisposeWith(d); - }); + // NodeScriptZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged; + // UpdateZoomBorderBackground(); + // + // NodeScriptZoomBorder.AddHandler(PointerReleasedEvent, CanvasOnPointerReleased, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); + // NodeScriptZoomBorder.AddHandler(PointerWheelChangedEvent, ZoomOnPointerWheelChanged, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); + // NodeScriptZoomBorder.AddHandler(PointerMovedEvent, ZoomOnPointerMoved, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true); + // + // this.WhenActivated(d => + // { + // ViewModel!.AutoFitRequested += ViewModelOnAutoFitRequested; + // ViewModel.PickerPositionSubject.Subscribe(ShowPickerAt).DisposeWith(d); + // if (ViewModel.IsPreview) + // { + // BoundsProperty.Changed.Subscribe(BoundsPropertyChanged).DisposeWith(d); + // ViewModel.NodeViewModels.ToObservableChangeSet().Subscribe(_ => AutoFitIfPreview()).DisposeWith(d); + // } + // + // Dispatcher.UIThread.InvokeAsync(() => AutoFit(true), DispatcherPriority.ContextIdle); + // Disposable.Create(() => ViewModel.AutoFitRequested -= ViewModelOnAutoFitRequested).DisposeWith(d); + // }); } protected override Size MeasureOverride(Size availableSize) @@ -56,7 +54,7 @@ public partial class NodeScriptView : ReactiveUserControl private void ZoomOnPointerWheelChanged(object? sender, PointerWheelEventArgs e) { // If scroll events aren't handled here the ZoomBorder does some random panning when at the zoom limit - if (e.Delta.Y > 0 && ZoomBorder.ZoomX >= 1) + if (e.Delta.Y > 0 && NodeScriptZoomBorder.ZoomX >= 1) e.Handled = true; } @@ -71,7 +69,7 @@ public partial class NodeScriptView : ReactiveUserControl if (ViewModel == null) return; ViewModel.NodePickerViewModel.Position = point; - ZoomBorder?.ContextFlyout?.ShowAt(ZoomBorder); + NodeScriptZoomBorder?.ContextFlyout?.ShowAt(NodeScriptZoomBorder); } private void AutoFitIfPreview() @@ -111,8 +109,8 @@ public partial class NodeScriptView : ReactiveUserControl double scale = Math.Min(1, Math.Min(Bounds.Width / scriptRect.Width, Bounds.Height / scriptRect.Height)); // Pan and zoom to make the script fit - ZoomBorder.Zoom(scale, 0, 0, skipTransitions); - ZoomBorder.Pan(Bounds.Center.X - scriptRect.Center.X * scale, Bounds.Center.Y - scriptRect.Center.Y * scale, skipTransitions); + NodeScriptZoomBorder.Zoom(scale, 0, 0, skipTransitions); + NodeScriptZoomBorder.Pan(Bounds.Center.X - scriptRect.Center.X * scale, Bounds.Center.Y - scriptRect.Center.Y * scale, skipTransitions); } private void ViewModelOnAutoFitRequested(object? sender, EventArgs e) @@ -122,14 +120,14 @@ public partial class NodeScriptView : ReactiveUserControl private void ZoomBorderOnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e) { - if (e.Property.Name == nameof(ZoomBorder.Background)) + if (e.Property.Name == nameof(NodeScriptZoomBorder.Background)) UpdateZoomBorderBackground(); } private void UpdateZoomBorderBackground() { - if (ZoomBorder.Background is VisualBrush visualBrush) - visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute); + if (NodeScriptZoomBorder.Background is VisualBrush visualBrush) + visualBrush.DestinationRect = new RelativeRect(NodeScriptZoomBorder.OffsetX * -1, NodeScriptZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute); } private void InitializeComponent() @@ -140,7 +138,7 @@ public partial class NodeScriptView : ReactiveUserControl private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e) { if (ViewModel != null) - ViewModel.PanMatrix = ZoomBorder.Matrix; + ViewModel.PanMatrix = NodeScriptZoomBorder.Matrix; UpdateZoomBorderBackground(); } diff --git a/src/Artemis.UI/Services/Updating/UpdateService.cs b/src/Artemis.UI/Services/Updating/UpdateService.cs index fee0b93b0..15e66985e 100644 --- a/src/Artemis.UI/Services/Updating/UpdateService.cs +++ b/src/Artemis.UI/Services/Updating/UpdateService.cs @@ -5,7 +5,6 @@ using System.Threading; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; -using Artemis.Storage.Entities.General; using Artemis.Storage.Repositories; using Artemis.UI.Exceptions; using Artemis.UI.Shared.Services.MainWindow; @@ -110,6 +109,9 @@ public class UpdateService : IUpdateService private async void HandleAutoUpdateEvent(object? sender, EventArgs e) { + if (Constants.CurrentVersion == "local") + return; + // The event can trigger from multiple sources with a timer acting as a fallback, only actual perform an action once per max 59 minutes if (DateTime.UtcNow - _lastAutoUpdateCheck < TimeSpan.FromMinutes(59)) return; @@ -204,6 +206,9 @@ public class UpdateService : IUpdateService /// public bool Initialize() { + if (Constants.CurrentVersion == "local") + return false; + string? channelArgument = Constants.StartupArguments.FirstOrDefault(a => a.StartsWith("--channel=")); if (channelArgument != null) Channel = channelArgument.Split("=")[1]; diff --git a/src/Artemis.UI/Styles/Artemis.axaml b/src/Artemis.UI/Styles/Artemis.axaml index d92851a90..c8febf069 100644 --- a/src/Artemis.UI/Styles/Artemis.axaml +++ b/src/Artemis.UI/Styles/Artemis.axaml @@ -1,10 +1,11 @@  + xmlns:styling="clr-namespace:FluentAvalonia.Styling;assembly=FluentAvalonia" + xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"> + + - - \ No newline at end of file diff --git a/src/Artemis.UI/Styles/Markdown.axaml b/src/Artemis.UI/Styles/Markdown.axaml deleted file mode 100644 index 34acbe75f..000000000 --- a/src/Artemis.UI/Styles/Markdown.axaml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ## Core - * Cleaned up ProfileService render condition - * Core - Added fading in and out of profiles - * Core - Apply opacity layer only when fading - * Core - Fixed when condition stops being true mid-fade - * Core - Removed FadingStatus enum - - # General - - Meta - Fixed warnings - - Meta - Update RGB.NET - - # Plugins - - Plugins - Ignore version when loading shared assemblies - - # UI - - Sidebar - Improved category reordering code - - - - - - \ No newline at end of file diff --git a/src/Artemis.UI/ViewLocator.cs b/src/Artemis.UI/ViewLocator.cs index 45ceec2d2..d95012653 100644 --- a/src/Artemis.UI/ViewLocator.cs +++ b/src/Artemis.UI/ViewLocator.cs @@ -11,7 +11,7 @@ namespace Artemis.UI; public class ViewLocator : IDataTemplate { - public IControl Build(object data) + public Control Build(object data) { Type dataType = data.GetType(); string name = dataType.FullName!.Split('`')[0].Replace("ViewModel", "View"); diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj index fedc59d0a..56819af53 100644 --- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj +++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable x64 diff --git a/src/Artemis.VisualScripting/Nodes/Color/Screens/ColorGradientNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Color/Screens/ColorGradientNodeCustomView.axaml.cs index 183d660fd..b83bc475e 100644 --- a/src/Artemis.VisualScripting/Nodes/Color/Screens/ColorGradientNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Color/Screens/ColorGradientNodeCustomView.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Color.Screens; -public class ColorGradientNodeCustomView : ReactiveUserControl +public partial class ColorGradientNodeCustomView : ReactiveUserControl { public ColorGradientNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Color/Screens/RampSKColorNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Color/Screens/RampSKColorNodeCustomView.axaml.cs index b0133dcc3..1727e477c 100644 --- a/src/Artemis.VisualScripting/Nodes/Color/Screens/RampSKColorNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Color/Screens/RampSKColorNodeCustomView.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Color.Screens; -public class RampSKColorNodeCustomView : ReactiveUserControl +public partial class RampSKColorNodeCustomView : ReactiveUserControl { public RampSKColorNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventCycleNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventCycleNodeCustomView.axaml.cs index 3df2bafcc..c6ff737f2 100644 --- a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventCycleNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventCycleNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.DataModel.Screens; -public class DataModelEventCycleNodeCustomView : ReactiveUserControl +public partial class DataModelEventCycleNodeCustomView : ReactiveUserControl { public DataModelEventCycleNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventNodeCustomView.axaml.cs index fc75675af..d0490def8 100644 --- a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelEventNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.DataModel.Screens; -public class DataModelEventNodeCustomView : ReactiveUserControl +public partial class DataModelEventNodeCustomView : ReactiveUserControl { public DataModelEventNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelNodeCustomView.axaml.cs index 9be092730..5447d7056 100644 --- a/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/DataModel/Screens/DataModelNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.DataModel.Screens; -public class DataModelNodeCustomView : ReactiveUserControl +public partial class DataModelNodeCustomView : ReactiveUserControl { public DataModelNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomView.axaml.cs index 5f4996c3a..7573160d2 100644 --- a/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.External.Screens; -public class LayerPropertyNodeCustomView : ReactiveUserControl +public partial class LayerPropertyNodeCustomView : ReactiveUserControl { public LayerPropertyNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomViewModel.cs index c9cb56289..bca028ff6 100644 --- a/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/External/Screens/LayerPropertyNodeCustomViewModel.cs @@ -1,10 +1,10 @@ using System.Collections.ObjectModel; +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.VisualScripting; using Artemis.VisualScripting.Nodes.External.Commands; -using Avalonia.Controls.Mixins; using DynamicData; using ReactiveUI; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomView.axaml.cs index 90bf774e0..db71d47c1 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomView.axaml.cs @@ -1,6 +1,4 @@ using Artemis.UI.Shared; -using Avalonia; -using Avalonia.Controls; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomViewModel.cs index ccb1d7342..abf8bcbb8 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyEnableDisableNodeCustomViewModel.cs @@ -1,9 +1,9 @@ +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using ReactiveUI; namespace Artemis.VisualScripting.Nodes.Input.Screens; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomView.axaml.cs index fb8f76f7d..3d3672e6e 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomView.axaml.cs @@ -1,6 +1,4 @@ using Artemis.UI.Shared; -using Avalonia; -using Avalonia.Controls; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomViewModel.cs index 631a4644a..a161de70b 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyPressNodeCustomViewModel.cs @@ -1,9 +1,9 @@ +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using ReactiveUI; namespace Artemis.VisualScripting.Nodes.Input.Screens; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomView.axaml.cs index 46aed80ce..6fc0f45e5 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomView.axaml.cs @@ -1,6 +1,4 @@ using Artemis.UI.Shared; -using Avalonia; -using Avalonia.Controls; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomViewModel.cs index 57ea098d6..c7dc683ea 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/HotkeyToggleNodeCustomViewModel.cs @@ -1,9 +1,9 @@ +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using ReactiveUI; namespace Artemis.VisualScripting.Nodes.Input.Screens; diff --git a/src/Artemis.VisualScripting/Nodes/Input/Screens/PressedKeyPositionNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Input/Screens/PressedKeyPositionNodeCustomViewModel.cs index fce2c13a3..2cc2660e1 100644 --- a/src/Artemis.VisualScripting/Nodes/Input/Screens/PressedKeyPositionNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Input/Screens/PressedKeyPositionNodeCustomViewModel.cs @@ -1,10 +1,10 @@ using System.Collections.ObjectModel; +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using ReactiveUI; using static Artemis.VisualScripting.Nodes.Input.PressedKeyPositionNodeEntity; diff --git a/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomView.axaml.cs index a7fbe2304..675b4c226 100644 --- a/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomView.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Mathematics.Screens; -public class MathExpressionNodeCustomView : ReactiveUserControl +public partial class MathExpressionNodeCustomView : ReactiveUserControl { public MathExpressionNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomViewModel.cs index 46c5c337b..4cd475a8d 100644 --- a/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Mathematics/Screens/MathExpressionNodeCustomViewModel.cs @@ -1,10 +1,10 @@ -using System.Reactive.Linq; +using System.Reactive.Disposables; +using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Events; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using ReactiveUI; using ReactiveUI.Validation.Extensions; diff --git a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml index 0b19e7bd5..b97440803 100644 --- a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml +++ b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml @@ -7,7 +7,6 @@ diff --git a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml.cs index 0252616f0..373042a5a 100644 --- a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Operators.Screens; -public class EnumEqualsNodeCustomView : ReactiveUserControl +public partial class EnumEqualsNodeCustomView : ReactiveUserControl { public EnumEqualsNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomViewModel.cs index dfff67695..7fee56fa6 100644 --- a/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/Operators/Screens/EnumEqualsNodeCustomViewModel.cs @@ -1,11 +1,11 @@ using System.Collections.ObjectModel; +using System.Reactive.Disposables; using System.Reactive.Linq; using Artemis.Core; using Artemis.Core.Events; using Artemis.UI.Shared.Services.NodeEditor; using Artemis.UI.Shared.Services.NodeEditor.Commands; using Artemis.UI.Shared.VisualScripting; -using Avalonia.Controls.Mixins; using Avalonia.Threading; using DynamicData; using Humanizer; diff --git a/src/Artemis.VisualScripting/Nodes/Static/Screens/DisplayValueNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Static/Screens/DisplayValueNodeCustomView.axaml.cs index 9a448c403..fda8da8f9 100644 --- a/src/Artemis.VisualScripting/Nodes/Static/Screens/DisplayValueNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Static/Screens/DisplayValueNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Static.Screens; -public class DisplayValueNodeCustomView : ReactiveUserControl +public partial class DisplayValueNodeCustomView : ReactiveUserControl { public DisplayValueNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticNumericValueNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticNumericValueNodeCustomView.axaml.cs index 913c0f22b..d6479a2ee 100644 --- a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticNumericValueNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticNumericValueNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Static.Screens; -public class StaticNumericValueNodeCustomView : ReactiveUserControl +public partial class StaticNumericValueNodeCustomView : ReactiveUserControl { public StaticNumericValueNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticSKColorValueNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticSKColorValueNodeCustomView.axaml.cs index 285069694..13c598ed5 100644 --- a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticSKColorValueNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticSKColorValueNodeCustomView.axaml.cs @@ -4,7 +4,7 @@ using FluentAvalonia.UI.Controls; namespace Artemis.VisualScripting.Nodes.Static.Screens; -public class StaticSKColorValueNodeCustomView : ReactiveUserControl +public partial class StaticSKColorValueNodeCustomView : ReactiveUserControl { public StaticSKColorValueNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticStringValueNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticStringValueNodeCustomView.axaml.cs index 427382854..c973f92eb 100644 --- a/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticStringValueNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Static/Screens/StaticStringValueNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Static.Screens; -public class StaticStringValueNodeCustomView : ReactiveUserControl +public partial class StaticStringValueNodeCustomView : ReactiveUserControl { public StaticStringValueNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionNodeCustomView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionNodeCustomView.axaml.cs index 9af92d995..7ecbb69cc 100644 --- a/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionNodeCustomView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionNodeCustomView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.ReactiveUI; namespace Artemis.VisualScripting.Nodes.Transition.Screens; -public class EasingFunctionNodeCustomView : ReactiveUserControl +public partial class EasingFunctionNodeCustomView : ReactiveUserControl { public EasingFunctionNodeCustomView() { diff --git a/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionView.axaml.cs b/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionView.axaml.cs index 3ff2acb0a..95fb590a0 100644 --- a/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionView.axaml.cs +++ b/src/Artemis.VisualScripting/Nodes/Transition/Screens/EasingFunctionView.axaml.cs @@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml; namespace Artemis.VisualScripting.Nodes.Transition.Screens; -public class EasingFunctionView : UserControl +public partial class EasingFunctionView : UserControl { public EasingFunctionView() { diff --git a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj index f087e1de1..1f56c0bf2 100644 --- a/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj +++ b/src/Artemis.WebClient.Updating/Artemis.WebClient.Updating.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable