Browse Source

Merge pull request #2797 from AvaloniaUI/fixes/2784-standardcursortype-typo

Fix typo in StandardCursorType.
pull/2827/head
Nikita Tsukanov 7 years ago
committed by GitHub
parent
commit
b002de40f2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      samples/ControlCatalog/DecoratedWindow.xaml.cs
  2. 5
      src/Avalonia.Input/Cursors.cs
  3. 2
      src/Avalonia.X11/X11CursorFactory.cs
  4. 2
      src/Windows/Avalonia.Win32/CursorFactory.cs

2
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);

5
src/Avalonia.Input/Cursors.cs

@ -28,7 +28,7 @@ namespace Avalonia.Input
AppStarting,
Help,
TopSide,
BottomSize,
BottomSide,
LeftSide,
RightSide,
TopLeftCorner,
@ -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,

2
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},

2
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},

Loading…
Cancel
Save