1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00

Fixed lots of runtime errors

This commit is contained in:
Robert 2023-03-31 21:17:14 +02:00
parent 5b5acf2f76
commit 4518691907
163 changed files with 91 additions and 688 deletions

View File

@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colorscience_005Cquantization/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colorscience_005Cquantization/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colorscience_005Csorting/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=colorscience_005Csorting/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=defaulttypes/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=defaulttypes/@EntryIndexedValue">True</s:Boolean>

View File

@ -11,12 +11,12 @@ using DryIoc;
namespace Artemis.Core.DryIoc; namespace Artemis.Core.DryIoc;
/// <summary> /// <summary>
/// Provides an extension method to register services onto a DryIoc <see cref="IContainer"/>. /// Provides an extension method to register services onto a DryIoc <see cref="IContainer" />.
/// </summary> /// </summary>
public static class ContainerExtensions public static class ContainerExtensions
{ {
/// <summary> /// <summary>
/// Registers core services into the container. /// Registers core services into the container.
/// </summary> /// </summary>
/// <param name="container">The builder building the current container</param> /// <param name="container">The builder building the current container</param>
public static void RegisterCore(this IContainer container) public static void RegisterCore(this IContainer container)
@ -37,13 +37,13 @@ public static class ContainerExtensions
container.RegisterMany(storageAssembly, type => type.IsAssignableTo<IStorageMigration>(), Reuse.Singleton, nonPublicServiceTypes: true); container.RegisterMany(storageAssembly, type => type.IsAssignableTo<IStorageMigration>(), Reuse.Singleton, nonPublicServiceTypes: true);
container.Register<IPluginSettingsFactory, PluginSettingsFactory>(Reuse.Singleton); container.Register<IPluginSettingsFactory, PluginSettingsFactory>(Reuse.Singleton);
container.Register(made: Made.Of(_ => ServiceInfo.Of<IPluginSettingsFactory>(), f => f.CreatePluginSettings(Arg.Index<Type>(0)), r => r.Parent.ImplementationType)); container.Register(Made.Of(_ => ServiceInfo.Of<IPluginSettingsFactory>(), f => f.CreatePluginSettings(Arg.Index<Type>(0)), r => r.Parent.ImplementationType));
container.Register<ILoggerFactory, LoggerFactory>(Reuse.Singleton); container.Register<ILoggerFactory, LoggerFactory>(Reuse.Singleton);
container.Register(made: Made.Of(_ => ServiceInfo.Of<ILoggerFactory>(), f => f.CreateLogger(Arg.Index<Type>(0)), r => r.Parent.ImplementationType)); container.Register(Made.Of(_ => ServiceInfo.Of<ILoggerFactory>(), f => f.CreateLogger(Arg.Index<Type>(0)), r => r.Parent.ImplementationType));
} }
/// <summary> /// <summary>
/// Registers plugin services into the container, this is typically a child container. /// Registers plugin services into the container, this is typically a child container.
/// </summary> /// </summary>
/// <param name="container">The builder building the current container</param> /// <param name="container">The builder building the current container</param>
/// <param name="plugin">The plugin to register</param> /// <param name="plugin">The plugin to register</param>

View File

@ -13,7 +13,7 @@ public class UpdateEventArgs : EventArgs
} }
/// <summary> /// <summary>
/// Gets a boolean indicating whether to silently update or not. /// Gets a boolean indicating whether to silently update or not.
/// </summary> /// </summary>
public bool Silent { get; } public bool Silent { get; }
} }

View File

@ -21,17 +21,17 @@ public static class ProcessExtensions
{ {
int capacity = 2000; int capacity = 2000;
StringBuilder builder = new(capacity); StringBuilder builder = new(capacity);
IntPtr ptr = OpenProcess(ProcessAccessFlags.QueryLimitedInformation, false, p.Id); nint ptr = OpenProcess(ProcessAccessFlags.QueryLimitedInformation, false, p.Id);
if (!QueryFullProcessImageName(ptr, 0, builder, ref capacity)) return string.Empty; if (!QueryFullProcessImageName(ptr, 0, builder, ref capacity)) return string.Empty;
return builder.ToString(); return builder.ToString();
} }
[DllImport("kernel32.dll", CharSet = CharSet.Unicode)] [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
private static extern bool QueryFullProcessImageName([In] IntPtr hProcess, [In] int dwFlags, [Out] StringBuilder lpExeName, ref int lpdwSize); private static extern bool QueryFullProcessImageName([In] nint hProcess, [In] int dwFlags, [Out] StringBuilder lpExeName, ref int lpdwSize);
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
private static extern IntPtr OpenProcess(ProcessAccessFlags processAccess, bool bInheritHandle, int processId); private static extern nint OpenProcess(ProcessAccessFlags processAccess, bool bInheritHandle, int processId);
[Flags] [Flags]
private enum ProcessAccessFlags : uint private enum ProcessAccessFlags : uint

View File

@ -5,7 +5,7 @@ namespace Artemis.Storage.Entities.General;
public class ReleaseEntity public class ReleaseEntity
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public string Version { get; set; } public string Version { get; set; }
public DateTimeOffset? InstalledAt { get; set; } public DateTimeOffset? InstalledAt { get; set; }
} }

View File

@ -5,6 +5,11 @@ namespace Artemis.Storage.Entities.Profile;
public class LedEntity public class LedEntity
{ {
public string LedName { get; set; }
public string DeviceIdentifier { get; set; }
public int? PhysicalLayout { get; set; }
#region LedEntityEqualityComparer #region LedEntityEqualityComparer
private sealed class LedEntityEqualityComparer : IEqualityComparer<LedEntity> private sealed class LedEntityEqualityComparer : IEqualityComparer<LedEntity>
@ -31,9 +36,4 @@ public class LedEntity
public static IEqualityComparer<LedEntity> LedEntityComparer { get; } = new LedEntityEqualityComparer(); public static IEqualityComparer<LedEntity> LedEntityComparer { get; } = new LedEntityEqualityComparer();
#endregion #endregion
public string LedName { get; set; }
public string DeviceIdentifier { get; set; }
public int? PhysicalLayout { get; set; }
} }

View File

@ -51,7 +51,7 @@ public class M0021GradientNodes : IStorageMigration
TargetType = "ColorGradient", TargetType = "ColorGradient",
TargetNode = gradientNode.Id, TargetNode = gradientNode.Id,
TargetPinCollectionId = -1, TargetPinCollectionId = -1,
TargetPinId = 0, TargetPinId = 0
}); });
// Move the exit node to the right // Move the exit node to the right
@ -59,6 +59,18 @@ public class M0021GradientNodes : IStorageMigration
exitNode.Y += 30; exitNode.Y += 30;
} }
private void MigrateDataBinding(PropertyGroupEntity propertyGroup)
{
foreach (PropertyGroupEntity propertyGroupPropertyGroup in propertyGroup.PropertyGroups)
MigrateDataBinding(propertyGroupPropertyGroup);
foreach (PropertyEntity property in propertyGroup.Properties)
{
if (property.Value.StartsWith("[{\"Color\":\"") && property.DataBinding?.NodeScript != null && property.DataBinding.IsEnabled)
MigrateDataBinding(property);
}
}
public int UserVersion => 21; public int UserVersion => 21;
public void Apply(LiteRepository repository) public void Apply(LiteRepository repository)
@ -73,16 +85,4 @@ public class M0021GradientNodes : IStorageMigration
repository.Update(profileEntity); repository.Update(profileEntity);
} }
} }
private void MigrateDataBinding(PropertyGroupEntity propertyGroup)
{
foreach (PropertyGroupEntity propertyGroupPropertyGroup in propertyGroup.PropertyGroups)
MigrateDataBinding(propertyGroupPropertyGroup);
foreach (PropertyEntity property in propertyGroup.Properties)
{
if (property.Value.StartsWith("[{\"Color\":\"") && property.DataBinding?.NodeScript != null && property.DataBinding.IsEnabled)
MigrateDataBinding(property);
}
}
} }

View File

@ -22,7 +22,7 @@ public class M0022TransitionNodes : IStorageMigration
else if (node.Type == "ColorGradientEasingNode") else if (node.Type == "ColorGradientEasingNode")
node.Type = "ColorGradientTransitionNode"; node.Type = "ColorGradientTransitionNode";
else if (node.Type == "SKColorEasingNode") else if (node.Type == "SKColorEasingNode")
node.Type = "SKColorTransitionNode"; node.Type = "SKColorTransitionNode";
else if (node.Type == "EasingTypeNode") else if (node.Type == "EasingTypeNode")
node.Type = "EasingFunctionNode"; node.Type = "EasingFunctionNode";
} }

View File

@ -46,7 +46,7 @@ public class QueuedActionRepository : IQueuedActionRepository
{ {
return _repository.Query<QueuedActionEntity>().Where(q => q.Type == type).Count() > 0; return _repository.Query<QueuedActionEntity>().Where(q => q.Type == type).Count() > 0;
} }
/// <inheritdoc /> /// <inheritdoc />
public void ClearByType(string type) public void ClearByType(string type)
{ {

View File

@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=exceptions/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=exceptions/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwindow/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cwindow/@EntryIndexedValue">True</s:Boolean>

View File

@ -93,11 +93,6 @@ public partial class ArtemisIcon : UserControl
disposable.Dispose(); disposable.Dispose();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
#region Properties #region Properties
/// <summary> /// <summary>

View File

@ -179,11 +179,6 @@ public partial class DraggableNumberBox : UserControl
FocusManager.Instance?.Focus(Parent as IInputElement); FocusManager.Instance?.Focus(Parent as IInputElement);
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void OnPointerPressed(object? sender, PointerPressedEventArgs e) private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {
PointerPoint point = e.GetCurrentPoint(this); PointerPoint point = e.GetCurrentPoint(this);

View File

@ -47,11 +47,6 @@ public partial class EnumComboBox : UserControl
} }
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e) private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {
if (_enumComboBox == null || _enumComboBox.SelectedIndex == -1) if (_enumComboBox == null || _enumComboBox.SelectedIndex == -1)

View File

@ -68,11 +68,6 @@ public partial class HotkeyBox : UserControl
_displayTextBox.CaretIndex = _displayTextBox.Text?.Length ?? 0; _displayTextBox.CaretIndex = _displayTextBox.Text?.Length ?? 0;
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void Button_OnClick(object? sender, RoutedEventArgs e) private void Button_OnClick(object? sender, RoutedEventArgs e)
{ {
Hotkey = null; Hotkey = null;

View File

@ -79,11 +79,6 @@ public partial class ProfileConfigurationIcon : UserControl, IDisposable
}; };
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void OnDetachedFromLogicalTree(object? sender, LogicalTreeAttachmentEventArgs e) private void OnDetachedFromLogicalTree(object? sender, LogicalTreeAttachmentEventArgs e)
{ {
if (ConfigurationIcon != null) if (ConfigurationIcon != null)

View File

@ -15,9 +15,4 @@ public partial class DefaultDataModelDisplayView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -17,8 +17,4 @@ public partial class SKColorDataModelDisplayView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -14,8 +14,4 @@ internal partial class ExceptionDialogView : ReactiveWindow<ExceptionDialogViewM
#endif #endif
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -35,22 +35,20 @@
<ControlTemplate> <ControlTemplate>
<DataValidationErrors> <DataValidationErrors>
<Panel> <Panel>
<!-- This is flipped (scaleY(-1)) for the elevation brush effect <Border Name="PART_BorderElement"
--> Background="{TemplateBinding Background}"
<Border BorderBrush="{TemplateBinding BorderBrush}"
Name="PART_BorderElement" BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}" MinWidth="{TemplateBinding MinWidth}"
BorderThickness="{TemplateBinding BorderThickness}" MinHeight="{TemplateBinding MinHeight}">
MinWidth="{TemplateBinding MinWidth}" </Border>
MinHeight="{TemplateBinding MinHeight}"
RenderTransform="scaleY(-1)"
CornerRadius="{TemplateBinding CornerRadius}" />
<Border <Border Margin="{TemplateBinding BorderThickness}">
Margin="{TemplateBinding BorderThickness}"> <Grid ColumnDefinitions="Auto,*,Auto" >
<Grid ColumnDefinitions="Auto,*,Auto"> <ContentPresenter Grid.Column="0"
<ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" /> Grid.ColumnSpan="1"
Content="{TemplateBinding InnerLeftContent}"/>
<Grid x:Name="PART_InnerGrid" <Grid x:Name="PART_InnerGrid"
Grid.Column="1" Grid.Column="1"
RowDefinitions="Auto,Auto" RowDefinitions="Auto,Auto"
@ -62,6 +60,7 @@
Name="PART_FloatingWatermark" Name="PART_FloatingWatermark"
Foreground="{DynamicResource SystemAccentColor}" Foreground="{DynamicResource SystemAccentColor}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
IsVisible="False"
Text="{TemplateBinding Watermark}" /> Text="{TemplateBinding Watermark}" />
<TextBlock Grid.Row="1" <TextBlock Grid.Row="1"
@ -75,30 +74,33 @@
<ScrollViewer Grid.Row="1" <ScrollViewer Grid.Row="1"
Grid.Column="1" Grid.Column="1"
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
<Panel> <Panel>
<TextBlock Name="PART_Watermark" <TextBlock Name="PART_Watermark"
Foreground="{DynamicResource TextControlPlaceholderForeground}"
Text="{TemplateBinding Watermark}" Text="{TemplateBinding Watermark}"
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" TextWrapping="{TemplateBinding TextWrapping}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}" IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
IsHitTestVisible="False" />
<TextPresenter Name="PART_TextPresenter" <TextPresenter Name="PART_TextPresenter"
Text="{TemplateBinding Text, Mode=TwoWay}" Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}" CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}" SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}" SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" TextWrapping="{TemplateBinding TextWrapping}"
PasswordChar="{TemplateBinding PasswordChar}" LineHeight="{TemplateBinding LineHeight}"
RevealPassword="{TemplateBinding RevealPassword}" PasswordChar="{TemplateBinding PasswordChar}"
SelectionBrush="{TemplateBinding SelectionBrush}" RevealPassword="{TemplateBinding RevealPassword}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
CaretBrush="{TemplateBinding CaretBrush}" SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" CaretBrush="{TemplateBinding CaretBrush}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" /> HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Panel> </Panel>
</ScrollViewer> </ScrollViewer>

View File

@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdebugger_005Ctabs/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdebugger_005Ctabs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdevice_005Ctabs/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdevice_005Ctabs/@EntryIndexedValue">True</s:Boolean>

View File

@ -10,8 +10,4 @@ public partial class BoolPropertyInputView : ReactiveUserControl<BoolPropertyInp
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class BrushPropertyInputView : ReactiveUserControl<BrushPropertyI
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -12,10 +12,6 @@ public partial class ColorGradientPropertyInputView : ReactiveUserControl<ColorG
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void GradientPickerButton_OnFlyoutOpened(GradientPickerButton sender, EventArgs args) private void GradientPickerButton_OnFlyoutOpened(GradientPickerButton sender, EventArgs args)
{ {

View File

@ -11,8 +11,4 @@ public partial class EnumPropertyInputView : ReactiveUserControl<PropertyInputVi
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -12,10 +12,6 @@ public partial class FloatPropertyInputView : ReactiveUserControl<FloatPropertyI
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class FloatRangePropertyInputView : ReactiveUserControl<FloatRang
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class IntPropertyInputView : ReactiveUserControl<IntPropertyInput
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class IntRangePropertyInputView : ReactiveUserControl<IntRangePro
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class SKColorPropertyInputView : ReactiveUserControl<SKColorPrope
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void ColorPickerButton_OnFlyoutOpened(ColorPickerButton sender, EventArgs args) private void ColorPickerButton_OnFlyoutOpened(ColorPickerButton sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class SKPointPropertyInputView : ReactiveUserControl<SKPointPrope
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class SKSizePropertyInputView : ReactiveUserControl<SKSizePropert
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args) private void DraggableNumberBox_OnDragStarted(DraggableNumberBox sender, EventArgs args)
{ {

View File

@ -12,10 +12,6 @@ public partial class StringPropertyInputView : ReactiveUserControl<FloatProperty
AddHandler(KeyUpEvent, OnRoutedKeyUp, handledEventsToo: true); AddHandler(KeyUpEvent, OnRoutedKeyUp, handledEventsToo: true);
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void OnRoutedKeyUp(object? sender, KeyEventArgs e) private void OnRoutedKeyUp(object? sender, KeyEventArgs e)
{ {

View File

@ -84,8 +84,4 @@ public partial class MainWindow : ReactiveAppWindow<RootViewModel>
ViewModel?.Unfocused(); ViewModel?.Unfocused();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -29,10 +29,6 @@ public partial class DebugView : ReactiveAppWindow<DebugViewModel>
}); });
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DeviceVisualizer_OnLedClicked(object? sender, LedClickedEventArgs e) private void DeviceVisualizer_OnLedClicked(object? sender, LedClickedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class DataModelDebugView : ReactiveUserControl<DataModelDebugView
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -15,10 +15,6 @@ public partial class LogsDebugView : ReactiveUserControl<LogsDebugViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
protected override void OnInitialized() protected override void OnInitialized()
{ {

View File

@ -10,8 +10,4 @@ public partial class PerformanceDebugPluginView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PerformanceDebugProfilerView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PerformanceDebugView : ReactiveUserControl<PerformanceDebug
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class RenderDebugView : ReactiveUserControl<RenderDebugViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DebugSettingsView : ReactiveUserControl<DebugSettingsViewMo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DeviceDetectInputView : ReactiveUserControl<DeviceDetectInp
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -17,10 +17,6 @@ public partial class DevicePropertiesView : ReactiveAppWindow<DevicePropertiesVi
#endif #endif
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DeviceVisualizer_OnLedClicked(object? sender, LedClickedEventArgs e) private void DeviceVisualizer_OnLedClicked(object? sender, LedClickedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class DeviceSettingsView : ReactiveUserControl<DeviceSettingsView
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DeviceInfoTabView : ReactiveUserControl<DeviceInfoTabViewMo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DeviceLedsTabView : ReactiveUserControl<DeviceLedsTabViewMo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -37,8 +37,4 @@ public partial class DeviceLogicalLayoutDialogView : ReactiveUserControl<DeviceL
regionInfo.TwoLetterISORegionName.Contains(search, StringComparison.OrdinalIgnoreCase); regionInfo.TwoLetterISORegionName.Contains(search, StringComparison.OrdinalIgnoreCase);
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DevicePhysicalLayoutDialogView : ReactiveUserControl<Device
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -11,10 +11,6 @@ public partial class DevicePropertiesTabView : ReactiveUserControl<DevicePropert
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e) private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class InputMappingsTabView : ReactiveUserControl<InputMappingsTab
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class HomeView : ReactiveUserControl<HomeViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginPrerequisitesInstallDialogView : ReactiveUserControl<
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginPrerequisitesUninstallDialogView : ReactiveUserContro
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginFeatureView : ReactiveUserControl<PluginFeatureViewMo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginPlatformView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginPrerequisiteActionView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginPrerequisiteView : ReactiveUserControl<PluginPrerequi
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PluginSettingsView : ReactiveUserControl<PluginSettingsView
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -29,8 +29,4 @@ public partial class PluginSettingsWindowView : ReactiveAppWindow<PluginSettings
); );
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -14,10 +14,6 @@ public partial class PluginView : ReactiveUserControl<PluginViewModel>
EnabledToggle.Click += EnabledToggleOnClick; EnabledToggle.Click += EnabledToggleOnClick;
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void EnabledToggleOnClick(object? sender, RoutedEventArgs e) private void EnabledToggleOnClick(object? sender, RoutedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class AlwaysOnConditionView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class EventConditionView : ReactiveUserControl<EventConditionView
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class PlayOnceConditionView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class StaticConditionView : ReactiveUserControl<StaticConditionVi
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DisplayConditionScriptView : ReactiveUserControl<DisplayCon
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -13,10 +13,6 @@ public partial class MenuBarView : ReactiveUserControl<MenuBarViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void MenuBase_OnMenuClosed(object? sender, RoutedEventArgs e) private void MenuBase_OnMenuClosed(object? sender, RoutedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class PlaybackView : ReactiveUserControl<PlaybackViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class CategoryAdaptionHintView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DeviceAdaptionHintView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class KeyboardSectionAdaptionHintView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -14,8 +14,4 @@ public partial class LayerHintsDialogView : ReactiveAppWindow<LayerHintsDialogVi
#endif #endif
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -23,10 +23,6 @@ public partial class FolderTreeItemView : ReactiveUserControl<FolderTreeItemView
}); });
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnKeyUp(object? sender, KeyEventArgs e) private void InputElement_OnKeyUp(object? sender, KeyEventArgs e)
{ {

View File

@ -23,10 +23,6 @@ public partial class LayerTreeItemView : ReactiveUserControl<LayerTreeItemViewMo
}); });
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnKeyUp(object? sender, KeyEventArgs e) private void InputElement_OnKeyUp(object? sender, KeyEventArgs e)
{ {

View File

@ -113,10 +113,6 @@ public partial class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
_dragAdorner.RenderTransform = new TranslateTransform(_dragStartPosition.X - _elementDragOffset.X, position.Y - _elementDragOffset.Y); _dragAdorner.RenderTransform = new TranslateTransform(_dragStartPosition.X - _elementDragOffset.X, position.Y - _elementDragOffset.Y);
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void ProfileTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e) private void ProfileTreeView_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class DataBindingView : ReactiveUserControl<DataBindingViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -13,10 +13,6 @@ public partial class AddEffectView : ReactiveUserControl<AddEffectViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e) private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class TimelineSegmentEditView : ReactiveUserControl<TimelineSegme
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -16,10 +16,6 @@ public partial class PropertiesView : ReactiveUserControl<PropertiesViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void ApplyTransition(bool enable) private void ApplyTransition(bool enable)
{ {

View File

@ -10,8 +10,4 @@ public partial class TimelineEasingView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -30,10 +30,6 @@ public partial class TimelineKeyframeView : ReactiveUserControl<ITimelineKeyfram
#endregion #endregion
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e) private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {

View File

@ -13,10 +13,6 @@ public partial class EndSegmentView : ReactiveUserControl<EndSegmentViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e) private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {

View File

@ -13,10 +13,6 @@ public partial class MainSegmentView : ReactiveUserControl<MainSegmentViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e) private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {

View File

@ -13,10 +13,6 @@ public partial class StartSegmentView : ReactiveUserControl<StartSegmentViewMode
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e) private void KeyframeDragAnchor_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class TimelineGroupView : ReactiveUserControl<TimelineGroupViewMo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class TimelinePropertyView : ReactiveUserControl<ITimelinePropert
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -18,10 +18,6 @@ public partial class TimelineView : ReactiveUserControl<TimelineViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e) private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e)
{ {

View File

@ -27,8 +27,4 @@ public partial class LayerEffectRenameView : ReactiveUserControl<LayerEffectRena
NameTextBox.Focus(); NameTextBox.Focus();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -13,10 +13,6 @@ public partial class LayerBrushPresetView : ReactiveUserControl<LayerBrushPreset
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e) private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
{ {

View File

@ -11,10 +11,6 @@ public partial class TreeGroupView : ReactiveUserControl<TreeGroupViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e) private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{ {

View File

@ -23,10 +23,6 @@ public partial class TreePropertyView : ReactiveUserControl<ITreePropertyViewMod
}); });
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void DataBindingToggleButton_OnClick(object? sender, RoutedEventArgs e) private void DataBindingToggleButton_OnClick(object? sender, RoutedEventArgs e)
{ {

View File

@ -10,8 +10,4 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -13,10 +13,6 @@ public partial class SelectionAddToolView : ReactiveUserControl<SelectionAddTool
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e) private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e)
{ {

View File

@ -12,10 +12,6 @@ public partial class SelectionRemoveToolView : ReactiveUserControl<SelectionRemo
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e) private void SelectionRectangle_OnSelectionFinished(object? sender, SelectionRectangleEventArgs e)
{ {

View File

@ -70,10 +70,6 @@ public partial class TransformToolView : ReactiveUserControl<TransformToolViewMo
control.RenderTransform = counterScale; control.RenderTransform = counterScale;
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private SKPoint GetPositionForViewModel(PointerEventArgs e) private SKPoint GetPositionForViewModel(PointerEventArgs e)
{ {

View File

@ -66,10 +66,6 @@ public partial class VisualEditorView : ReactiveUserControl<VisualEditorViewMode
visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute); visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e) private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e)
{ {

View File

@ -20,10 +20,6 @@ public partial class LayerShapeVisualizerView : ReactiveUserControl<LayerShapeVi
this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Selected).Subscribe(_ => UpdateStrokeThickness()).DisposeWith(d)); this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Selected).Subscribe(_ => UpdateStrokeThickness()).DisposeWith(d));
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
#region Overrides of TemplatedControl #region Overrides of TemplatedControl

View File

@ -17,10 +17,6 @@ public partial class LayerVisualizerView : ReactiveUserControl<LayerVisualizerVi
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
#region Overrides of TemplatedControl #region Overrides of TemplatedControl

View File

@ -10,8 +10,4 @@ public partial class ProfileEditorTitleBarView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -22,8 +22,4 @@ public partial class ProfileEditorView : ReactiveUserControl<ProfileEditorViewMo
#endregion #endregion
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

View File

@ -10,8 +10,4 @@ public partial class DefaultTitleBarView : UserControl
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

Some files were not shown because too many files have changed in this diff Show More