Browse Source
Merge branch 'master' into fixes/Warings/CS0436
pull/9037/head
workgroupengineering
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
8 deletions
-
src/Avalonia.X11/X11IconLoader.cs
-
src/Avalonia.X11/X11Platform.cs
|
|
|
@ -9,13 +9,6 @@ namespace Avalonia.X11 |
|
|
|
{ |
|
|
|
class X11IconLoader : IPlatformIconLoader |
|
|
|
{ |
|
|
|
private readonly X11Info _x11; |
|
|
|
|
|
|
|
public X11IconLoader(X11Info x11) |
|
|
|
{ |
|
|
|
_x11 = x11; |
|
|
|
} |
|
|
|
|
|
|
|
IWindowIconImpl LoadIcon(Bitmap bitmap) |
|
|
|
{ |
|
|
|
var rv = new X11IconData(bitmap); |
|
|
|
|
|
|
|
@ -81,7 +81,7 @@ namespace Avalonia.X11 |
|
|
|
.Bind<ICursorFactory>().ToConstant(new X11CursorFactory(Display)) |
|
|
|
.Bind<IClipboard>().ToConstant(new X11Clipboard(this)) |
|
|
|
.Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub()) |
|
|
|
.Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader(Info)) |
|
|
|
.Bind<IPlatformIconLoader>().ToConstant(new X11IconLoader()) |
|
|
|
.Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider()) |
|
|
|
.Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this)); |
|
|
|
|
|
|
|
|