From 7cbb50709d055a3a50755c59746cd05ca4934551 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 30 Jul 2019 18:02:55 +0200 Subject: [PATCH 1/2] Fix typo in StandardCursorType. Fixes #2784 --- samples/ControlCatalog/DecoratedWindow.xaml.cs | 2 +- src/Avalonia.Input/Cursors.cs | 2 +- src/Avalonia.X11/X11CursorFactory.cs | 2 +- src/Windows/Avalonia.Win32/CursorFactory.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/ControlCatalog/DecoratedWindow.xaml.cs b/samples/ControlCatalog/DecoratedWindow.xaml.cs index 749f83c1ab..2e7218b956 100644 --- a/samples/ControlCatalog/DecoratedWindow.xaml.cs +++ b/samples/ControlCatalog/DecoratedWindow.xaml.cs @@ -34,7 +34,7 @@ namespace ControlCatalog SetupSide("Left", StandardCursorType.LeftSide, WindowEdge.West); SetupSide("Right", StandardCursorType.RightSide, WindowEdge.East); SetupSide("Top", StandardCursorType.TopSide, WindowEdge.North); - SetupSide("Bottom", StandardCursorType.BottomSize, WindowEdge.South); + SetupSide("Bottom", StandardCursorType.BottomSide, WindowEdge.South); SetupSide("TopLeft", StandardCursorType.TopLeftCorner, WindowEdge.NorthWest); SetupSide("TopRight", StandardCursorType.TopRightCorner, WindowEdge.NorthEast); SetupSide("BottomLeft", StandardCursorType.BottomLeftCorner, WindowEdge.SouthWest); diff --git a/src/Avalonia.Input/Cursors.cs b/src/Avalonia.Input/Cursors.cs index 8139af1659..95449cedac 100644 --- a/src/Avalonia.Input/Cursors.cs +++ b/src/Avalonia.Input/Cursors.cs @@ -28,7 +28,7 @@ namespace Avalonia.Input AppStarting, Help, TopSide, - BottomSize, + BottomSide, LeftSide, RightSide, TopLeftCorner, diff --git a/src/Avalonia.X11/X11CursorFactory.cs b/src/Avalonia.X11/X11CursorFactory.cs index 0a8b1ee9c4..bed6f4693b 100644 --- a/src/Avalonia.X11/X11CursorFactory.cs +++ b/src/Avalonia.X11/X11CursorFactory.cs @@ -24,7 +24,7 @@ namespace Avalonia.X11 {StandardCursorType.No, CursorFontShape.XC_X_cursor}, {StandardCursorType.Wait, CursorFontShape.XC_watch}, {StandardCursorType.AppStarting, CursorFontShape.XC_watch}, - {StandardCursorType.BottomSize, CursorFontShape.XC_bottom_side}, + {StandardCursorType.BottomSide, CursorFontShape.XC_bottom_side}, {StandardCursorType.DragCopy, CursorFontShape.XC_center_ptr}, {StandardCursorType.DragLink, CursorFontShape.XC_fleur}, {StandardCursorType.DragMove, CursorFontShape.XC_diamond_cross}, diff --git a/src/Windows/Avalonia.Win32/CursorFactory.cs b/src/Windows/Avalonia.Win32/CursorFactory.cs index f1fd74f931..b45138c27a 100644 --- a/src/Windows/Avalonia.Win32/CursorFactory.cs +++ b/src/Windows/Avalonia.Win32/CursorFactory.cs @@ -56,7 +56,7 @@ namespace Avalonia.Win32 {StandardCursorType.Wait, 32514}, //Same as SizeNorthSouth {StandardCursorType.TopSide, 32645}, - {StandardCursorType.BottomSize, 32645}, + {StandardCursorType.BottomSide, 32645}, //Same as SizeWestEast {StandardCursorType.LeftSide, 32644}, {StandardCursorType.RightSide, 32644}, From 51eab932772ad351d02cb515356843a4eb167cf8 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 8 Aug 2019 11:25:18 +0200 Subject: [PATCH 2/2] Added obsolete alias for old typo'd value. --- src/Avalonia.Input/Cursors.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Avalonia.Input/Cursors.cs b/src/Avalonia.Input/Cursors.cs index 95449cedac..f72ccf1850 100644 --- a/src/Avalonia.Input/Cursors.cs +++ b/src/Avalonia.Input/Cursors.cs @@ -40,6 +40,9 @@ namespace Avalonia.Input DragLink, None, + [Obsolete("Use BottomSide")] + BottomSize = BottomSide + // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ // We might enable them later, preferably, by loading pixmax direclty from theme with fallback image // SizeNorthWestSouthEast,