UI: Update to Avalonia 11.2.0

SourMesen · Nov 11, 2024 · e18db92 · e18db92
1 parent 2973c43
commit e18db92
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/UI/App.axaml.cs b/UI/App.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Controls.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Avalonia.Threading;
 using Mesen.Config;
 using Mesen.Interop;
 using Mesen.Localization;
@@ -26,6 +27,11 @@ public override void Initialize()
 			} else {
 				RequestedThemeVariant = ConfigManager.Config.Preferences.Theme == MesenTheme.Dark ? ThemeVariant.Dark : ThemeVariant.Light;
 			}
+
+			Dispatcher.UIThread.UnhandledException += (s, e) => {
+				MesenMsgBox.ShowException(e.Exception);
+				e.Handled = true;
+			};
 
 			AvaloniaXamlLoader.Load(this);
 			ResourceHelper.LoadResources();

diff --git a/UI/Program.cs b/UI/Program.cs
@@ -161,7 +161,7 @@ public static AppBuilder BuildAvaloniaApp()
 					.With(new X11PlatformOptions {
 						EnableInputFocusProxy = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP") == "gamescope",
 					 })
-					.With(new AvaloniaNativePlatformOptions { })
+					.With(new AvaloniaNativePlatformOptions { RenderingMode = new AvaloniaNativeRenderingMode[] { AvaloniaNativeRenderingMode.OpenGl, AvaloniaNativeRenderingMode.Software } })
 					.LogToTrace();
 	}
 }
diff --git a/UI/UI.csproj b/UI/UI.csproj
@@ -104,19 +104,18 @@
 		<TrimmerRootAssembly Include="Dock.Settings" />
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.999-cibuild0045373-beta" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0045373-beta" />
-    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.999-cibuild0045373-beta" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0045373-beta" Condition="'$(OptimizeUi)'!='true'" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0045373-beta" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0045373-beta" />
-    <PackageReference Include="Dock.Avalonia" Version="11.0.10" />
-    <PackageReference Include="Dock.Model.Mvvm" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.2.0" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.0" Condition="'$(OptimizeUi)'!='true'" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
+    <PackageReference Include="Dock.Avalonia" Version="11.2.0" />
+    <PackageReference Include="Dock.Model.Mvvm" Version="11.2.0" />
     <PackageReference Include="Dotnet.Bundle" Version="*" />
     <PackageReference Include="ELFSharp" Version="2.17.3" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
    </ItemGroup>
   <ItemGroup>
     <Compile Update="Controls\ButtonWithIcon.axaml.cs">

diff --git a/UI/Views/OtherConsolesConfigView.axaml b/UI/Views/OtherConsolesConfigView.axaml
@@ -24,7 +24,7 @@
 			<ScrollViewer AllowAutoHide="False" HorizontalScrollBarVisibility="Auto" Padding="0 0 2 0">
 				<StackPanel>
 					<Grid ColumnDefinitions="Auto,Auto,*" RowDefinitions="Auto,Auto,Auto">
-						<v:CvConfigView DataContext="{Binding}" />
+						<v:CvConfigView />
 					</Grid>
 				</StackPanel>
 			</ScrollViewer>