From f3f44613a4de36a87e49b0624bf7f71228f75cbe Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Sun, 28 Jul 2024 11:05:14 +0900
Subject: [PATCH] UI: Update to Avalonia 11.1.1

---
 UI/Controls/PaletteConfig.axaml         |  2 +-
 UI/Styles/AvaloniaMenuItemStyles.xaml   |  2 +-
 UI/UI.csproj                            | 21 ++++++++-------------
 UI/Views/GameboyConfigView.axaml        |  2 +-
 UI/Views/VideoConfigView.axaml          |  2 +-
 UI/Windows/AboutWindow.axaml.cs         |  2 ++
 UI/Windows/ControllerConfigWindow.axaml |  2 +-
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/UI/Controls/PaletteConfig.axaml b/UI/Controls/PaletteConfig.axaml
index 8b0e0228..19fafdfb 100644
--- a/UI/Controls/PaletteConfig.axaml
+++ b/UI/Controls/PaletteConfig.axaml
@@ -33,7 +33,7 @@
 				Click="btnSelectPalette_OnClick"
 			>
 				<Button.ContextMenu>
-					<ContextMenu Name="Preset" PlacementMode="Bottom" ItemsSource="{Binding PalettePresets, ElementName=root}">
+					<ContextMenu Name="Preset" Placement="BottomEdgeAlignedLeft" ItemsSource="{Binding PalettePresets, ElementName=root}">
 						<ContextMenu.Styles>
 							<Style Selector="MenuItem">
 								<Setter Property="Header" Value="{Binding Name, DataType={x:Type c:PalettePreset}}" />
diff --git a/UI/Styles/AvaloniaMenuItemStyles.xaml b/UI/Styles/AvaloniaMenuItemStyles.xaml
index 68f9c56c..1a415155 100644
--- a/UI/Styles/AvaloniaMenuItemStyles.xaml
+++ b/UI/Styles/AvaloniaMenuItemStyles.xaml
@@ -75,7 +75,7 @@
 					</Border>
 					<Popup Name="PART_Popup"
 							 WindowManagerAddShadowHint="False"
-							 PlacementMode="RightEdgeAlignedTop"
+							 Placement="RightEdgeAlignedTop"
 							 HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
 							 IsLightDismissEnabled="False"
 							 IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
diff --git a/UI/UI.csproj b/UI/UI.csproj
index 9a1f8011..7194d114 100644
--- a/UI/UI.csproj
+++ b/UI/UI.csproj
@@ -89,11 +89,6 @@
 	  <None Remove="Styles\StartupStyles.xaml" />
 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
 	</ItemGroup>
-	<PropertyGroup>
-		<RestoreSources>
-			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
-		</RestoreSources>
-	</PropertyGroup>
 	<ItemGroup>
 		<TrimmerRootAssembly Include="Mesen" />
 		<TrimmerRootAssembly Include="AvaloniaEdit" />
@@ -103,15 +98,15 @@
 		<TrimmerRootAssembly Include="Dock.Settings" />
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.999-cibuild0045373-beta" />
+    <PackageReference Include="Avalonia" Version="11.1.1" />
     <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.Desktop" Version="11.1.1" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.1.1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.1.1" Condition="'$(OptimizeUi)'!='true'" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.1" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.1" />
+    <PackageReference Include="Dock.Avalonia" Version="11.1.0.1" />
+    <PackageReference Include="Dock.Model.Mvvm" Version="11.1.0.1" />
     <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" />
diff --git a/UI/Views/GameboyConfigView.axaml b/UI/Views/GameboyConfigView.axaml
index a3dcdb78..3e71e12f 100644
--- a/UI/Views/GameboyConfigView.axaml
+++ b/UI/Views/GameboyConfigView.axaml
@@ -105,7 +105,7 @@
 								Click="btnSelectPreset_OnClick"
 							>
 								<Button.ContextMenu>
-									<ContextMenu PlacementMode="Bottom">
+									<ContextMenu Placement="BottomEdgeAlignedLeft">
 										<MenuItem Header="{l:Translate lblGrayscale}" Click="mnuGrayscalePreset_Click" />
 										<MenuItem Header="{l:Translate lblGrayscaleHighContrast}" Click="mnuGrayscaleHighContrastPreset_Click" />
 										<MenuItem Header="{l:Translate lblGreen}" Click="mnuGreenPreset_Click" />
diff --git a/UI/Views/VideoConfigView.axaml b/UI/Views/VideoConfigView.axaml
index f4238e01..9768129c 100644
--- a/UI/Views/VideoConfigView.axaml
+++ b/UI/Views/VideoConfigView.axaml
@@ -116,7 +116,7 @@
 					<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="1" VerticalAlignment="Top">
 						<Button Content="{l:Translate btnSelectPreset}" Click="btnPreset_OnClick">
 							<Button.ContextMenu>
-								<ContextMenu PlacementMode="Bottom">
+								<ContextMenu Placement="BottomEdgeAlignedLeft">
 									<MenuItem Header="{l:Translate mnuPresetComposite}" Command="{Binding PresetCompositeCommand}" />
 									<MenuItem Header="{l:Translate mnuPresetSVideo}" Command="{Binding PresetSVideoCommand}" />
 									<MenuItem Header="{l:Translate mnuPresetRgb}" Command="{Binding PresetRgbCommand}" />
diff --git a/UI/Windows/AboutWindow.axaml.cs b/UI/Windows/AboutWindow.axaml.cs
index e601213a..a5533db1 100644
--- a/UI/Windows/AboutWindow.axaml.cs
+++ b/UI/Windows/AboutWindow.axaml.cs
@@ -10,6 +10,7 @@ using Mesen.Interop;
 using System.Collections.Generic;
 using Avalonia.Input;
 using Mesen.Utilities;
+using System.Runtime.CompilerServices;
 
 namespace Mesen.Windows
 {
@@ -26,6 +27,7 @@ namespace Mesen.Windows
 			Version = EmuApi.GetMesenVersion().ToString();
 			BuildDate = EmuApi.GetMesenBuildDate();
 			RuntimeVersion = ".NET " + Environment.Version;
+			RuntimeVersion += RuntimeFeature.IsDynamicCodeSupported ? " (JIT)" : " (AOT)";
 
 			LibraryList = new List<AboutListEntry>() {
 				new("Avalonia", "", "MIT", "https://github.com/AvaloniaUI/Avalonia"),
diff --git a/UI/Windows/ControllerConfigWindow.axaml b/UI/Windows/ControllerConfigWindow.axaml
index 99022473..7dafb6b8 100644
--- a/UI/Windows/ControllerConfigWindow.axaml
+++ b/UI/Windows/ControllerConfigWindow.axaml
@@ -49,7 +49,7 @@
 				IsVisible="{Binding ShowPresets}"
 			>
 				<Button.ContextMenu>
-					<ContextMenu Name="Preset" PlacementMode="Bottom">
+					<ContextMenu Name="Preset" Placement="BottomEdgeAlignedLeft">
 						<MenuItem Header="{l:Translate mnuKeyboard}">
 							<MenuItem Header="{l:Translate mnuWasdLayout}" Click="mnuWasdLayout_OnClick" />
 							<MenuItem Header="{l:Translate mnuArrowLayout}" Click="mnuArrowLayout_OnClick" />