Update Avalonia to 0.10 RC (#25)

maxkatz6 · web-flow · commit e6900eef74d2 · 2020-12-11T10:57:16.000+03:00
* Update Avalonia to Release Candidate
* Fix Obsolote warnings
diff --git a/Source/Examples/Avalonia/AvaloniaExamples/App.xaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/App.xaml.cs
@@ -34,7 +34,7 @@ static void Main(string[] args)
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
 #if DEBUG
-                .LogToDebug()
+                .LogToTrace()
 #endif
                 .StartWithClassicDesktopLifetime(args);
         }
diff --git a/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj b/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
   </ItemGroup>
 </Project>
diff --git a/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.xaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.xaml.cs
@@ -67,8 +67,7 @@ private void ListBoxMouseDoubleClick(object sender, RoutedEventArgs e)
             {
                 var window = example.Create();
                 window.Icon = this.Icon;
-                window.Show();
-                
+                window.Show(this);                
             }
         }
 
diff --git a/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj b/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj
@@ -12,8 +12,8 @@
     </AvaloniaResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
     <PackageReference Include="OxyPlot.Core" Version="2.0.0" />
     <PackageReference Include="OxyPlot.ExampleLibrary" Version="2.0.0" />
   </ItemGroup>
diff --git a/Source/Examples/Avalonia/ExampleBrowser/Program.cs b/Source/Examples/Avalonia/ExampleBrowser/Program.cs
@@ -14,6 +14,6 @@ public static void Main(string[] args) => BuildAvaloniaApp()
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .LogToDebug();
+                .LogToTrace();
     }
 }
diff --git a/Source/Examples/Avalonia/MemoryTest/App.xaml.cs b/Source/Examples/Avalonia/MemoryTest/App.xaml.cs
@@ -34,7 +34,7 @@ static void Main(string[] args)
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
 #if DEBUG
-                .LogToDebug()
+                .LogToTrace()
 #endif
                 .StartWithClassicDesktopLifetime(args);
         }
diff --git a/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj b/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
   </ItemGroup>
 </Project>
diff --git a/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj b/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
   </ItemGroup>
 </Project>
diff --git a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
-    <PackageReference Include="Avalonia" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia" Version="0.10.0-rc1" />
     <PackageReference Include="OxyPlot.Core" Version="2.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/OxyPlot.Avalonia/PlotBase.Events.cs b/Source/OxyPlot.Avalonia/PlotBase.Events.cs
@@ -110,7 +110,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             }
 
             Focus();
-            ((TopLevel)this.VisualRoot).PlatformImpl.MouseDevice.Capture(this);
+            e.Pointer.Capture(this);
 
             // store the mouse down point, check it when mouse button is released to determine if the context menu should be shown
             mouseDownPoint = e.GetPosition(this).ToScreenPoint();
@@ -147,7 +147,7 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e)
 
             var releasedArgs = (PointerReleasedEventArgs)e;
 
-            ((TopLevel)this.VisualRoot).PlatformImpl.MouseDevice.Capture(null);
+            e.Pointer.Capture(null);
 
             e.Handled = ActualController.HandleMouseUp(this, releasedArgs.ToMouseReleasedEventArgs(this));
 
diff --git a/Source/OxyPlot.Avalonia/Utilities/ConverterExtensions.cs b/Source/OxyPlot.Avalonia/Utilities/ConverterExtensions.cs
@@ -357,6 +357,7 @@ public static OxyKey Convert(this Key k)
         /// </summary>
         /// <param name="button">The button to convert.</param>
         /// <returns>The converted mouse button.</returns>
+        [Obsolete]
         public static OxyMouseButton Convert(this MouseButton button)
         {
             switch (button)
@@ -372,6 +373,25 @@ public static OxyMouseButton Convert(this MouseButton button)
             }
         }
 
+        public static OxyMouseButton Convert(this PointerUpdateKind pointerUpdateKind)
+        {
+            switch (pointerUpdateKind)
+            {
+                case PointerUpdateKind.LeftButtonPressed:
+                    return OxyMouseButton.Left;
+                case PointerUpdateKind.MiddleButtonPressed:
+                    return OxyMouseButton.Middle;
+                case PointerUpdateKind.RightButtonPressed:
+                    return OxyMouseButton.Right;
+                case PointerUpdateKind.XButton1Pressed:
+                    return OxyMouseButton.XButton1;
+                case PointerUpdateKind.XButton2Pressed:
+                    return OxyMouseButton.XButton2;
+                default:
+                    return OxyMouseButton.None;
+            }
+        }
+
         public static OxyModifierKeys ToModifierKeys(this KeyModifiers modifiers)
         {
             var modifierKeys = OxyModifierKeys.None;
@@ -422,10 +442,14 @@ public static OxyMouseWheelEventArgs ToMouseWheelEventArgs(this PointerWheelEven
         /// <returns>A <see cref="OxyMouseEventArgs" /> containing the converted event arguments.</returns>
         public static OxyMouseDownEventArgs ToMouseDownEventArgs(this PointerPressedEventArgs e, IInputElement relativeTo)
         {
+            var point = e.GetCurrentPoint(relativeTo);
+            
             return new OxyMouseDownEventArgs
             {
-                ChangedButton = e.MouseButton.Convert(),
+                ChangedButton = point.Properties.PointerUpdateKind.Convert(),
+#pragma warning disable CS0618 // Type or member is obsolete
                 ClickCount = e.ClickCount,
+#pragma warning restore CS0618 // Type or member is obsolete
                 Position = e.GetPosition(relativeTo).ToScreenPoint(),
                 ModifierKeys = e.KeyModifiers.ToModifierKeys()
             };

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ static void Main(string[] args)`
`34`	`34`	`AppBuilder.Configure<App>()`
`35`	`35`	`.UsePlatformDetect()`
`36`	`36`	`#if DEBUG`
`37`		`- .LogToDebug()`
	`37`	`+ .LogToTrace()`
`38`	`38`	`#endif`
`39`	`39`	`.StartWithClassicDesktopLifetime(args);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ private void ListBoxMouseDoubleClick(object sender, RoutedEventArgs e)`
`67`	`67`	`{`
`68`	`68`	`var window = example.Create();`
`69`	`69`	`window.Icon = this.Icon;`
`70`		`- window.Show();`
`71`		`-`
	`70`	`+ window.Show(this);`
`72`	`71`	`}`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public static void Main(string[] args) => BuildAvaloniaApp()`
`14`	`14`	`public static AppBuilder BuildAvaloniaApp()`
`15`	`15`	`=> AppBuilder.Configure<App>()`
`16`	`16`	`.UsePlatformDetect()`
`17`		`- .LogToDebug();`
	`17`	`+ .LogToTrace();`
`18`	`18`	`}`
`19`	`19`	`}`