1
0
Эх сурвалжийг харах

Merge pull request #6745 from jp2masa/x11-default-cursor

Changed X11 default cursor to XC_left_ptr
Dan Walmsley 4 жил өмнө
parent
commit
1e428a0084

+ 2 - 2
src/Avalonia.X11/X11CursorFactory.cs

@@ -23,7 +23,7 @@ namespace Avalonia.X11
         private static readonly Dictionary<StandardCursorType, CursorFontShape> s_mapping =
         private static readonly Dictionary<StandardCursorType, CursorFontShape> s_mapping =
             new Dictionary<StandardCursorType, CursorFontShape>
             new Dictionary<StandardCursorType, CursorFontShape>
             {
             {
-                {StandardCursorType.Arrow, CursorFontShape.XC_top_left_arrow},
+                {StandardCursorType.Arrow, CursorFontShape.XC_left_ptr},
                 {StandardCursorType.Cross, CursorFontShape.XC_cross},
                 {StandardCursorType.Cross, CursorFontShape.XC_cross},
                 {StandardCursorType.Hand, CursorFontShape.XC_hand2},
                 {StandardCursorType.Hand, CursorFontShape.XC_hand2},
                 {StandardCursorType.Help, CursorFontShape.XC_question_arrow},
                 {StandardCursorType.Help, CursorFontShape.XC_question_arrow},
@@ -67,7 +67,7 @@ namespace Avalonia.X11
             {
             {
                 handle = s_mapping.TryGetValue(cursorType, out var shape)
                 handle = s_mapping.TryGetValue(cursorType, out var shape)
                 ? _cursors[shape]
                 ? _cursors[shape]
-                : _cursors[CursorFontShape.XC_top_left_arrow];
+                : _cursors[CursorFontShape.XC_left_ptr];
             }
             }
             return new CursorImpl(handle);
             return new CursorImpl(handle);
         }
         }

+ 1 - 1
src/Avalonia.X11/X11Info.cs

@@ -42,7 +42,7 @@ namespace Avalonia.X11
             DefaultScreen = XDefaultScreen(display);
             DefaultScreen = XDefaultScreen(display);
             BlackPixel = XBlackPixel(display, DefaultScreen);
             BlackPixel = XBlackPixel(display, DefaultScreen);
             RootWindow = XRootWindow(display, DefaultScreen);
             RootWindow = XRootWindow(display, DefaultScreen);
-            DefaultCursor = XCreateFontCursor(display, CursorFontShape.XC_top_left_arrow);
+            DefaultCursor = XCreateFontCursor(display, CursorFontShape.XC_left_ptr);
             DefaultRootWindow = XDefaultRootWindow(display);
             DefaultRootWindow = XDefaultRootWindow(display);
             Atoms = new X11Atoms(display);
             Atoms = new X11Atoms(display);