Changed: Move CursorFactory Back to its Place

AvaloniaUI · Jun 14, 2024 · cf30995 · cf30995
1 parent 8038127
commit cf30995
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
@@ -88,6 +88,7 @@ public void Initialize(X11PlatformOptions options)
                 .Bind<PlatformHotkeyConfiguration>().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control))
                 .Bind<KeyGestureFormatInfo>().ToConstant(new KeyGestureFormatInfo(new Dictionary<Key, string>() { }, meta: "Super"))
                 .Bind<IKeyboardDevice>().ToFunc(() => KeyboardDevice)
+                .Bind<ICursorFactory>().ToConstant(new X11CursorFactory(Display))
                 .Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 .Bind<IPlatformSettings>().ToSingleton<DBusPlatformSettings>()
                 .Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader())
@@ -101,8 +102,6 @@ public void Initialize(X11PlatformOptions options)
                 if (xi2.Init(this))
                     XI2 = xi2;
             }
-
-            AvaloniaLocator.CurrentMutable.Bind<ICursorFactory>().ToConstant(new X11CursorFactory(Display));
 
             var graphics = graphicsTask.Result;
             if (graphics is not null)