Skip to content

Commit e329038

Browse files
authored
Fix startup crash: remove manual InitializeComponent() overrides shadowing Avalonia source-generated field assignments
1 parent 8654085 commit e329038

14 files changed

Lines changed: 0 additions & 20 deletions

llcom-avalonia/llcom/Pages/AboutPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ namespace llcom.Pages
88
public partial class AboutPage : UserControl
99
{
1010
public AboutPage() { InitializeComponent(); }
11-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
1211

1312
private void Page_Loaded(object? sender, RoutedEventArgs e)
1413
{

llcom-avalonia/llcom/Pages/ConvertPage.axaml.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ public ConvertPage()
1919
ConvertNamesComBox.Items.Add(key);
2020
}
2121

22-
private void InitializeComponent()
23-
=> Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
24-
2522
private void DoConvert()
2623
{
2724
byte[] row = Encoding.UTF8.GetBytes(RawTextBox.Text ?? "");

llcom-avalonia/llcom/Pages/DataShowPage.axaml.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ public DataShowPage()
2626
PacketList.ItemsSource = _items;
2727
}
2828

29-
private void InitializeComponent()
30-
{
31-
Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
32-
}
33-
3429
protected override void OnLoaded(RoutedEventArgs e)
3530
{
3631
base.OnLoaded(e);

llcom-avalonia/llcom/Pages/EncodingFixPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public partial class EncodingFixPage : UserControl
1111
private readonly string[] _encodings = { "UTF-8", "GBK", "windows-1252", "Big5", "Shift_JIS", "iso-8859-1" };
1212

1313
public EncodingFixPage() { InitializeComponent(); }
14-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
1514

1615
private void RawTextBox_TextChanged(object? sender, Avalonia.Controls.TextChangedEventArgs e)
1716
{

llcom-avalonia/llcom/Pages/MqttTestPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public partial class MqttTestPage : UserControl
2121
private bool _initialized;
2222

2323
public MqttTestPage() { InitializeComponent(); }
24-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
2524

2625
private void Page_Loaded(object? sender, RoutedEventArgs e)
2726
{

llcom-avalonia/llcom/Pages/OnlineScriptsPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public partial class OnlineScriptsPage : UserControl
1717
private OnlineScript? _scriptNow;
1818

1919
public OnlineScriptsPage() { InitializeComponent(); }
20-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
2120

2221
private async void Page_Loaded(object? sender, RoutedEventArgs e)
2322
{

llcom-avalonia/llcom/Pages/PlotPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public partial class PlotPage : UserControl
1919
private bool _initialized;
2020

2121
public PlotPage() { InitializeComponent(); }
22-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
2322

2423
private void Page_Loaded(object? sender, RoutedEventArgs e)
2524
{

llcom-avalonia/llcom/Pages/SerialMonitorPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ private enum State { Disconnect = 2, Receive, Send }
5656
private CallbackDelegate? _cb;
5757

5858
public SerialMonitorPage() { InitializeComponent(); }
59-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
6059

6160
private void Page_Loaded(object? sender, RoutedEventArgs e)
6261
{

llcom-avalonia/llcom/Pages/SocketClientPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public partial class SocketClientPage : UserControl
1717
private System.Timers.Timer? _reconnectTimer;
1818

1919
public SocketClientPage() { InitializeComponent(); }
20-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
2120

2221
private void Page_Loaded(object? sender, RoutedEventArgs e)
2322
{

llcom-avalonia/llcom/Pages/TcpLocalPage.axaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public partial class TcpLocalPage : UserControl
1616
private bool _initialized;
1717

1818
public TcpLocalPage() { InitializeComponent(); }
19-
private void InitializeComponent() => Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
2019

2120
private void Page_Loaded(object? sender, RoutedEventArgs e)
2221
{

0 commit comments

Comments
 (0)