Merge pull request #335 from AvaloniaUI/updateToRc

maxkatz6 · web-flow · commit 33d7342e00f5 · 2023-06-01T01:50:42.000-04:00
Update to Avalonia 11 RC
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AvaloniaVersion>11.0.0-preview8</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
     <TextMateSharpVersion>1.0.55</TextMateSharpVersion>
     <VersionSuffix>beta</VersionSuffix>
   </PropertyGroup>
diff --git a/src/AvaloniaEdit.Demo/MainWindow.xaml.cs b/src/AvaloniaEdit.Demo/MainWindow.xaml.cs
@@ -347,7 +347,7 @@ public MyCompletionData(string text)
                 Text = text;
             }
 
-            public IBitmap Image => null;
+            public Bitmap Image => null;
 
             public string Text { get; }
 
diff --git a/src/AvaloniaEdit/CodeCompletion/CompletionWindow.cs b/src/AvaloniaEdit/CodeCompletion/CompletionWindow.cs
@@ -174,7 +174,7 @@ protected override void OnKeyDown(KeyEventArgs e)
         private void TextArea_PreviewTextInput(object sender, TextInputEventArgs e)
         {
             e.Handled = RaiseEventPair(this, null, TextInputEvent,
-                                       new TextInputEventArgs { Device = e.Device, Text = e.Text });
+                                       new TextInputEventArgs { Text = e.Text });
         }
 
         private void TextArea_MouseWheel(object sender, PointerWheelEventArgs e)
diff --git a/src/AvaloniaEdit/CodeCompletion/CompletionWindowBase.cs b/src/AvaloniaEdit/CodeCompletion/CompletionWindowBase.cs
@@ -218,15 +218,15 @@ public override void OnPreviewKeyDown(KeyEventArgs e)
                 if (e.Key == Key.DeadCharProcessed)
                     return;
                 e.Handled = RaiseEventPair(Window, null, KeyDownEvent,
-                                           new KeyEventArgs { Device = e.Device, Key = e.Key });
+                                           new KeyEventArgs { Key = e.Key });
             }
 
             public override void OnPreviewKeyUp(KeyEventArgs e)
             {
                 if (e.Key == Key.DeadCharProcessed)
                     return;
                 e.Handled = RaiseEventPair(Window, null, KeyUpEvent,
-                    new KeyEventArgs { Device = e.Device, Key = e.Key });
+                    new KeyEventArgs { Key = e.Key });
             }
         }
         #endregion
diff --git a/src/AvaloniaEdit/CodeCompletion/ICompletionData.cs b/src/AvaloniaEdit/CodeCompletion/ICompletionData.cs
@@ -35,7 +35,7 @@ public interface ICompletionData
         /// <summary>
         /// Gets the image.
         /// </summary>
-        IBitmap Image { get; }
+        Bitmap Image { get; }
 		
 		/// <summary>
 		/// Gets the text. This property is used to filter the list of visible elements.
diff --git a/src/AvaloniaEdit/Editing/CaretNavigationCommandHandler.cs b/src/AvaloniaEdit/Editing/CaretNavigationCommandHandler.cs
@@ -82,7 +82,7 @@ private static void AddBinding(RoutedCommand command, KeyGesture gesture, EventH
 
         static CaretNavigationCommandHandler()
         {
-            var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
+            var keymap = Application.Current.PlatformSettings.HotkeyConfiguration;
 
             AddBinding(EditingCommands.MoveLeftByCharacter, KeyModifiers.None, Key.Left, OnMoveCaret(CaretMovementType.CharLeft));
             AddBinding(EditingCommands.SelectLeftByCharacter, keymap.SelectionModifiers, Key.Left, OnMoveCaretExtendSelection(CaretMovementType.CharLeft));
diff --git a/src/AvaloniaEdit/RoutedCommand.cs b/src/AvaloniaEdit/RoutedCommand.cs
@@ -2,14 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Input;
-using Avalonia;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace AvaloniaEdit
 {
     public class RoutedCommand : ICommand
     {
+        private static IInputElement _inputElement;
+
         public string Name { get; }
         public KeyGesture Gesture { get; }
 
@@ -23,6 +24,7 @@ static RoutedCommand()
         {
             CanExecuteEvent.AddClassHandler<Interactive>(CanExecuteEventHandler);
             ExecutedEvent.AddClassHandler<Interactive>(ExecutedEventHandler);
+            InputElement.GotFocusEvent.AddClassHandler<Interactive>(GotFocusEventHandler);
         }
 
         private static void CanExecuteEventHandler(Interactive control, CanExecuteRoutedEventArgs args)
@@ -46,6 +48,11 @@ private static void ExecutedEventHandler(Interactive control, ExecutedRoutedEven
             }
         }
 
+        private static void GotFocusEventHandler(Interactive control, GotFocusEventArgs args)
+        {
+            _inputElement = control as IInputElement;
+        }
+
         public static RoutedEvent<CanExecuteRoutedEventArgs> CanExecuteEvent { get; } = RoutedEvent.Register<CanExecuteRoutedEventArgs>(nameof(CanExecuteEvent), RoutingStrategies.Bubble, typeof(RoutedCommand));
 
         public bool CanExecute(object parameter, IInputElement target)
@@ -60,7 +67,7 @@ public bool CanExecute(object parameter, IInputElement target)
 
         bool ICommand.CanExecute(object parameter)
         {
-            return CanExecute(parameter, Application.Current.FocusManager.Current);
+            return CanExecute(parameter, _inputElement);
         }
 
         public static RoutedEvent<ExecutedRoutedEventArgs> ExecutedEvent { get; } = RoutedEvent.Register<ExecutedRoutedEventArgs>(nameof(ExecutedEvent), RoutingStrategies.Bubble, typeof(RoutedCommand));
@@ -75,7 +82,7 @@ public void Execute(object parameter, IInputElement target)
 
         void ICommand.Execute(object parameter)
         {
-            Execute(parameter, Application.Current.FocusManager.Current);
+            Execute(parameter, _inputElement);
         }
 
         // TODO
diff --git a/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj b/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.999-cibuild0034510-beta" />
-	<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0034510-beta" />
-	<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0034510-beta" />
-    <PackageReference Include="Avalonia.Headless.NUnit" Version="11.0.999-cibuild0034510-beta" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+	<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+	<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="NUnit" Version="3.13.2" />

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public MyCompletionData(string text)`
`347`	`347`	`Text = text;`
`348`	`348`	`}`
`349`	`349`
`350`		`- public IBitmap Image => null;`
	`350`	`+ public Bitmap Image => null;`
`351`	`351`
`352`	`352`	`public string Text { get; }`
`353`	`353`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ protected override void OnKeyDown(KeyEventArgs e)`
`174`	`174`	`private void TextArea_PreviewTextInput(object sender, TextInputEventArgs e)`
`175`	`175`	`{`
`176`	`176`	`e.Handled = RaiseEventPair(this, null, TextInputEvent,`
`177`		`- new TextInputEventArgs { Device = e.Device, Text = e.Text });`
	`177`	`+ new TextInputEventArgs { Text = e.Text });`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`private void TextArea_MouseWheel(object sender, PointerWheelEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -218,15 +218,15 @@ public override void OnPreviewKeyDown(KeyEventArgs e)`
`218`	`218`	`if (e.Key == Key.DeadCharProcessed)`
`219`	`219`	`return;`
`220`	`220`	`e.Handled = RaiseEventPair(Window, null, KeyDownEvent,`
`221`		`- new KeyEventArgs { Device = e.Device, Key = e.Key });`
	`221`	`+ new KeyEventArgs { Key = e.Key });`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`public override void OnPreviewKeyUp(KeyEventArgs e)`
`225`	`225`	`{`
`226`	`226`	`if (e.Key == Key.DeadCharProcessed)`
`227`	`227`	`return;`
`228`	`228`	`e.Handled = RaiseEventPair(Window, null, KeyUpEvent,`
`229`		`- new KeyEventArgs { Device = e.Device, Key = e.Key });`
	`229`	`+ new KeyEventArgs { Key = e.Key });`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private static void AddBinding(RoutedCommand command, KeyGesture gesture, EventH`
`82`	`82`
`83`	`83`	`static CaretNavigationCommandHandler()`
`84`	`84`	`{`
`85`		`- var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();`
	`85`	`+ var keymap = Application.Current.PlatformSettings.HotkeyConfiguration;`
`86`	`86`
`87`	`87`	`AddBinding(EditingCommands.MoveLeftByCharacter, KeyModifiers.None, Key.Left, OnMoveCaret(CaretMovementType.CharLeft));`
`88`	`88`	`AddBinding(EditingCommands.SelectLeftByCharacter, keymap.SelectionModifiers, Key.Left, OnMoveCaretExtendSelection(CaretMovementType.CharLeft));`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,15 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Windows.Input;`
`5`		`-using Avalonia;`
`6`	`5`	`using Avalonia.Input;`
`7`	`6`	`using Avalonia.Interactivity;`
`8`	`7`
`9`	`8`	`namespace AvaloniaEdit`
`10`	`9`	`{`
`11`	`10`	`public class RoutedCommand : ICommand`
`12`	`11`	`{`
	`12`	`+ private static IInputElement _inputElement;`
	`13`	`+`
`13`	`14`	`public string Name { get; }`
`14`	`15`	`public KeyGesture Gesture { get; }`
`15`	`16`
`@@ -23,6 +24,7 @@ static RoutedCommand()`
`23`	`24`	`{`
`24`	`25`	`CanExecuteEvent.AddClassHandler<Interactive>(CanExecuteEventHandler);`
`25`	`26`	`ExecutedEvent.AddClassHandler<Interactive>(ExecutedEventHandler);`
	`27`	`+ InputElement.GotFocusEvent.AddClassHandler<Interactive>(GotFocusEventHandler);`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`private static void CanExecuteEventHandler(Interactive control, CanExecuteRoutedEventArgs args)`
`@@ -46,6 +48,11 @@ private static void ExecutedEventHandler(Interactive control, ExecutedRoutedEven`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
	`51`	`+ private static void GotFocusEventHandler(Interactive control, GotFocusEventArgs args)`
	`52`	`+ {`
	`53`	`+ _inputElement = control as IInputElement;`
	`54`	`+ }`
	`55`	`+`
`49`	`56`	`public static RoutedEvent<CanExecuteRoutedEventArgs> CanExecuteEvent { get; } = RoutedEvent.Register<CanExecuteRoutedEventArgs>(nameof(CanExecuteEvent), RoutingStrategies.Bubble, typeof(RoutedCommand));`
`50`	`57`
`51`	`58`	`public bool CanExecute(object parameter, IInputElement target)`
`@@ -60,7 +67,7 @@ public bool CanExecute(object parameter, IInputElement target)`
`60`	`67`
`61`	`68`	`bool ICommand.CanExecute(object parameter)`
`62`	`69`	`{`
`63`		`- return CanExecute(parameter, Application.Current.FocusManager.Current);`
	`70`	`+ return CanExecute(parameter, _inputElement);`
`64`	`71`	`}`
`65`	`72`
`66`	`73`	`public static RoutedEvent<ExecutedRoutedEventArgs> ExecutedEvent { get; } = RoutedEvent.Register<ExecutedRoutedEventArgs>(nameof(ExecutedEvent), RoutingStrategies.Bubble, typeof(RoutedCommand));`
`@@ -75,7 +82,7 @@ public void Execute(object parameter, IInputElement target)`
`75`	`82`
`76`	`83`	`void ICommand.Execute(object parameter)`
`77`	`84`	`{`
`78`		`- Execute(parameter, Application.Current.FocusManager.Current);`
	`85`	`+ Execute(parameter, _inputElement);`
`79`	`86`	`}`
`80`	`87`
`81`	`88`	`// TODO`