From 78f41a0ec47016fb697b1082c10b2a6d8d8330fe Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Sun, 10 May 2026 16:03:56 +0200
Subject: [PATCH] UI: Update Avalonia to 11.3.14.

- AvaloniaEdit is updated to 11.4.1.
- Avalonia.ReactiveUI is held back at 11.3.8, as later updates require
  separate adaptation work.
- Dock is updated to 11.3.12.1.
---
 UI/Debugger/Controls/HexEditor.cs           |  3 ++-
 UI/Debugger/DebuggerDockFactory.cs          |  2 ++
 UI/Debugger/Windows/DebuggerWindow.axaml.cs |  2 +-
 UI/Styles/DockStyles.xaml                   |  4 ++--
 UI/Styles/MesenStyles.xaml                  |  2 +-
 UI/UI.csproj                                | 19 ++++++++++---------
 UI/Windows/MainWindow.axaml.cs              |  2 +-
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/UI/Debugger/Controls/HexEditor.cs b/UI/Debugger/Controls/HexEditor.cs
index 209ca0dd8..2c8f0fd2a 100644
--- a/UI/Debugger/Controls/HexEditor.cs
+++ b/UI/Debugger/Controls/HexEditor.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Mesen.Config;
 using Mesen.Debugger.Utilities;
@@ -413,7 +414,7 @@ public async void PasteSelection()
 		{
 			var clipboard = ApplicationHelper.GetMainWindow()?.Clipboard;
 			if(clipboard != null) {
-				string? text = await clipboard.GetTextAsync();
+				string? text = await clipboard.TryGetTextAsync();
 				if(text != null) {
 					text = text.Replace("\n", "").Replace("\r", "");
 					if(Regex.IsMatch(text, "^[ a-f0-9]+$", RegexOptions.IgnoreCase)) {
diff --git a/UI/Debugger/DebuggerDockFactory.cs b/UI/Debugger/DebuggerDockFactory.cs
index 77835036a..7e34821ef 100644
--- a/UI/Debugger/DebuggerDockFactory.cs
+++ b/UI/Debugger/DebuggerDockFactory.cs
@@ -267,4 +267,6 @@ public class DockEntryDefinition
 public class MesenProportionalDockSplitter : DockBase, IProportionalDockSplitter
 {
 	//The regular ProportionalDockSplitter in Dock.Model.Mvvm.Controls inherits from DockableBase, which causes an exception when styles are applied
+	public bool CanResize { get; set; } = true;
+	public bool ResizePreview { get; set; }
 }
diff --git a/UI/Debugger/Windows/DebuggerWindow.axaml.cs b/UI/Debugger/Windows/DebuggerWindow.axaml.cs
index 15c922eab..779d13b81 100644
--- a/UI/Debugger/Windows/DebuggerWindow.axaml.cs
+++ b/UI/Debugger/Windows/DebuggerWindow.axaml.cs
@@ -232,7 +232,7 @@ private void OnSettingsClick(object sender, RoutedEventArgs e)
 
 		private void OnDrop(object? sender, DragEventArgs e)
 		{
-			string? filename = e.Data.GetFiles()?.FirstOrDefault()?.Path.LocalPath;
+			string? filename = e.DataTransfer.TryGetFiles()?.FirstOrDefault()?.Path.LocalPath;
 			if(filename != null && File.Exists(filename)) {
 				Activate();
 				DebugWorkspaceManager.LoadSupportedFile(filename, true);
diff --git a/UI/Styles/DockStyles.xaml b/UI/Styles/DockStyles.xaml
index 530419743..bf70d9179 100644
--- a/UI/Styles/DockStyles.xaml
+++ b/UI/Styles/DockStyles.xaml
@@ -141,9 +141,9 @@
 						and causes exceptions when trying to bind the values (including in tooltips
 						attached to a control in the dock control)
 					-->
-					<ItemsControl ItemsSource="{ReflectionBinding VisibleDockables}" Name="DockItemsControl">
+					<ItemsControl ItemsSource="{ReflectionBinding VisibleDockables}" Name="PART_ItemsControl">
 						<ItemsControl.Styles>
-							<Style Selector="ItemsControl#DockItemsControl > ContentPresenter">
+							<Style Selector="ItemsControl#PART_ItemsControl > ContentPresenter">
 								<Setter x:DataType="core:IDock" Property="(ProportionalStackPanel.Proportion)" Value="{Binding Proportion}" />
 
 								<!-- prevent error in binding -->
diff --git a/UI/Styles/MesenStyles.xaml b/UI/Styles/MesenStyles.xaml
index b56073ba5..b30636daa 100644
--- a/UI/Styles/MesenStyles.xaml
+++ b/UI/Styles/MesenStyles.xaml
@@ -8,7 +8,7 @@
 	<StyleInclude Source="/Styles/MesenStyles.Light.xaml" />
 	<StyleInclude Source="/Styles/MesenStyles.Dark.xaml" />
 
-	<StyleInclude Source="avares://Dock.Avalonia/Themes/DockFluentTheme.axaml" />
+	<StyleInclude Source="avares://Dock.Avalonia.Themes.Fluent/DockFluentTheme.axaml" />
 	<StyleInclude Source="/ThirdParty/DataBox/Themes/Fluent.axaml" />
 	<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
 	<StyleInclude Source="/Styles/DockStyles.xaml" />
diff --git a/UI/UI.csproj b/UI/UI.csproj
index e9336ac2d..6d394f3f7 100644
--- a/UI/UI.csproj
+++ b/UI/UI.csproj
@@ -108,15 +108,16 @@
 		<TrimmerRootAssembly Include="Dock.Settings" />
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.1" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.1" />
-    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.1" Condition="'$(OptimizeUi)'!='true'" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.1" />
-    <PackageReference Include="Dock.Avalonia" Version="11.3.0.2" />
-    <PackageReference Include="Dock.Model.Mvvm" Version="11.3.0.2" />
+    <PackageReference Include="Avalonia" Version="11.3.14" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.14" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.14" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.14" Condition="'$(OptimizeUi)'!='true'" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.14" />
+    <PackageReference Include="Dock.Avalonia" Version="11.3.12.1" />
+    <PackageReference Include="Dock.Avalonia.Themes.Fluent" Version="11.3.12.1" />
+    <PackageReference Include="Dock.Model.Mvvm" Version="11.3.12.1" />
     <PackageReference Include="Dotnet.Bundle" Version="*" />
     <PackageReference Include="ELFSharp" Version="2.17.3" />
     <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
diff --git a/UI/Windows/MainWindow.axaml.cs b/UI/Windows/MainWindow.axaml.cs
index 98c0e0a49..33c06d30a 100644
--- a/UI/Windows/MainWindow.axaml.cs
+++ b/UI/Windows/MainWindow.axaml.cs
@@ -196,7 +196,7 @@ private void Console_CancelKeyPress(object? sender, ConsoleCancelEventArgs e)
 
 		private void OnDrop(object? sender, DragEventArgs e)
 		{
-			string? filename = e.Data.GetFiles()?.FirstOrDefault()?.Path.LocalPath;
+			string? filename = e.DataTransfer.TryGetFiles()?.FirstOrDefault()?.Path.LocalPath;
 			if(filename != null) {
 				if(File.Exists(filename)) {
 					LoadRomHelper.LoadFile(filename);