From 485b27614c61e42434f7f75ddfa82be61adc16ae Mon Sep 17 00:00:00 2001 From: vddCore Date: Thu, 28 Mar 2024 08:29:12 +0100 Subject: [PATCH] Make launcher semi-functional after 11.0.10 upgrade. --- Saradomin/App.axaml | 3 +- Saradomin/Resources/Styles/CheckBox.axaml | 8 ++-- Saradomin/Resources/Styles/RadioButton.axaml | 8 ++-- .../Resources/Styles/TopBarNavigation.axaml | 16 +++++--- Saradomin/Saradomin.csproj | 9 ++-- .../View/Controls/PluginManagerView.axaml | 5 +-- .../View/Controls/PluginManagerView.axaml.cs | 9 +--- Saradomin/View/Controls/SettingsView.axaml | 2 +- Saradomin/View/Controls/SettingsView.axaml.cs | 7 +--- .../View/Controls/SingleplayerView.axaml.cs | 7 +--- Saradomin/View/Windows/MainWindow.axaml | 11 +++-- Saradomin/View/Windows/MainWindow.axaml.cs | 10 +---- Saradomin/View/Windows/NotificationBox.axaml | 1 - .../View/Windows/NotificationBox.axaml.cs | 17 ++------ .../Controls/PluginManagerViewModel.cs | 23 +++++++---- .../ViewModel/Controls/SettingsViewModel.cs | 41 ++++++++++--------- .../ViewModel/Windows/MainWindowViewModel.cs | 4 +- 17 files changed, 79 insertions(+), 102 deletions(-) diff --git a/Saradomin/App.axaml b/Saradomin/App.axaml index a9fd21a..85e5d35 100644 --- a/Saradomin/App.axaml +++ b/Saradomin/App.axaml @@ -93,8 +93,7 @@ - - + diff --git a/Saradomin/Resources/Styles/CheckBox.axaml b/Saradomin/Resources/Styles/CheckBox.axaml index 7466129..0940940 100644 --- a/Saradomin/Resources/Styles/CheckBox.axaml +++ b/Saradomin/Resources/Styles/CheckBox.axaml @@ -16,8 +16,8 @@ + TextElement.FontSize="13" + TextElement.Foreground="{TemplateBinding Foreground}" /> @@ -49,8 +49,8 @@ Content="{TemplateBinding Content}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" - TextBlock.FontSize="13" - TextBlock.Foreground="{TemplateBinding Foreground}" /> + TextElement.FontSize="13" + TextElement.Foreground="{TemplateBinding Foreground}" /> diff --git a/Saradomin/Resources/Styles/TopBarNavigation.axaml b/Saradomin/Resources/Styles/TopBarNavigation.axaml index 50f3f2d..d0083af 100644 --- a/Saradomin/Resources/Styles/TopBarNavigation.axaml +++ b/Saradomin/Resources/Styles/TopBarNavigation.axaml @@ -10,7 +10,7 @@ - - - + + - - - \ No newline at end of file diff --git a/Saradomin/Saradomin.csproj b/Saradomin/Saradomin.csproj index 1c30132..857cb8b 100644 --- a/Saradomin/Saradomin.csproj +++ b/Saradomin/Saradomin.csproj @@ -24,12 +24,13 @@ - - + + - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Saradomin/View/Controls/PluginManagerView.axaml b/Saradomin/View/Controls/PluginManagerView.axaml index e49ac41..352de7b 100644 --- a/Saradomin/View/Controls/PluginManagerView.axaml +++ b/Saradomin/View/Controls/PluginManagerView.axaml @@ -29,11 +29,10 @@ ZIndex="9999" Width="425" /> + IsVisible="{Binding PluginList.Count}"> diff --git a/Saradomin/View/Controls/PluginManagerView.axaml.cs b/Saradomin/View/Controls/PluginManagerView.axaml.cs index 45e2d9f..c904949 100644 --- a/Saradomin/View/Controls/PluginManagerView.axaml.cs +++ b/Saradomin/View/Controls/PluginManagerView.axaml.cs @@ -1,21 +1,14 @@ -using Avalonia; using Avalonia.Controls; -using Avalonia.Markup.Xaml; using PropertyChanged; namespace Saradomin.View.Controls { [DoNotNotify] - public class PluginManagerView : UserControl + public partial class PluginManagerView : UserControl { public PluginManagerView() { InitializeComponent(); } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } } } \ No newline at end of file diff --git a/Saradomin/View/Controls/SettingsView.axaml b/Saradomin/View/Controls/SettingsView.axaml index e2d2998..b460169 100644 --- a/Saradomin/View/Controls/SettingsView.axaml +++ b/Saradomin/View/Controls/SettingsView.axaml @@ -70,7 +70,7 @@