diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 2f8aeff451..1840e90886 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -67,17 +67,17 @@ namespace Avalonia.Android
throw new NotImplementedException();
}
- public IIconImpl LoadIcon(string fileName)
+ public IWindowIconImpl LoadIcon(string fileName)
{
return null;
}
- public IIconImpl LoadIcon(Stream stream)
+ public IWindowIconImpl LoadIcon(Stream stream)
{
return null;
}
- public IIconImpl LoadIcon(IBitmapImpl bitmap)
+ public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
{
return null;
}
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs
index 421885f45f..66f6aeb757 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs
@@ -181,7 +181,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
Paint?.Invoke(new Rect(new Point(0, 0), ClientSize));
}
- public void SetIcon(IIconImpl icon)
+ public void SetIcon(IWindowIconImpl icon)
{
// No window icons for mobile platforms
}
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 5cf58d66e0..907103c0d5 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -65,7 +65,7 @@
-
+
diff --git a/src/Avalonia.Controls/Platform/IIconImpl.cs b/src/Avalonia.Controls/Platform/IIconImpl.cs
deleted file mode 100644
index a109d82673..0000000000
--- a/src/Avalonia.Controls/Platform/IIconImpl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Platform
-{
- public interface IIconImpl
- {
- }
-}
diff --git a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
index 7c604dc4a3..a84a58906e 100644
--- a/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
+++ b/src/Avalonia.Controls/Platform/IPlatformIconLoader.cs
@@ -10,8 +10,8 @@ namespace Avalonia.Platform
{
public interface IPlatformIconLoader
{
- IIconImpl LoadIcon(string fileName);
- IIconImpl LoadIcon(Stream stream);
- IIconImpl LoadIcon(IBitmapImpl bitmap);
+ IWindowIconImpl LoadIcon(string fileName);
+ IWindowIconImpl LoadIcon(Stream stream);
+ IWindowIconImpl LoadIcon(IBitmapImpl bitmap);
}
}
diff --git a/src/Avalonia.Controls/Platform/IWindowIconImpl.cs b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
new file mode 100644
index 0000000000..6262fdf488
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/IWindowIconImpl.cs
@@ -0,0 +1,9 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Platform
+{
+ public interface IWindowIconImpl
+ {
+ }
+}
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index 9000b8abfc..05a51d02aa 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -43,6 +43,6 @@ namespace Avalonia.Platform
///
/// Sets the icon of this window.
///
- void SetIcon(IIconImpl icon);
+ void SetIcon(IWindowIconImpl icon);
}
}
diff --git a/src/Avalonia.Controls/WindowIcon.cs b/src/Avalonia.Controls/WindowIcon.cs
index 7e5dc9ac86..e71555aa6e 100644
--- a/src/Avalonia.Controls/WindowIcon.cs
+++ b/src/Avalonia.Controls/WindowIcon.cs
@@ -29,6 +29,6 @@ namespace Avalonia.Controls
PlatformImpl = AvaloniaLocator.Current.GetService().LoadIcon(stream);
}
- public IIconImpl PlatformImpl { get; }
+ public IWindowIconImpl PlatformImpl { get; }
}
}
diff --git a/src/Gtk/Avalonia.Gtk/GtkPlatform.cs b/src/Gtk/Avalonia.Gtk/GtkPlatform.cs
index 9030b0138b..4169f5949d 100644
--- a/src/Gtk/Avalonia.Gtk/GtkPlatform.cs
+++ b/src/Gtk/Avalonia.Gtk/GtkPlatform.cs
@@ -115,17 +115,17 @@ namespace Avalonia.Gtk
return new PopupImpl();
}
- public IIconImpl LoadIcon(string fileName)
+ public IWindowIconImpl LoadIcon(string fileName)
{
return new IconImpl(new Gdk.Pixbuf(fileName));
}
- public IIconImpl LoadIcon(Stream stream)
+ public IWindowIconImpl LoadIcon(Stream stream)
{
return new IconImpl(new Gdk.Pixbuf(stream));
}
- public IIconImpl LoadIcon(IBitmapImpl bitmap)
+ public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
{
if (bitmap is Gdk.Pixbuf)
{
diff --git a/src/Gtk/Avalonia.Gtk/IconImpl.cs b/src/Gtk/Avalonia.Gtk/IconImpl.cs
index d505e4d236..5c8fe0eaa6 100644
--- a/src/Gtk/Avalonia.Gtk/IconImpl.cs
+++ b/src/Gtk/Avalonia.Gtk/IconImpl.cs
@@ -8,7 +8,7 @@ using Gdk;
namespace Avalonia.Gtk
{
- class IconImpl : IIconImpl
+ class IconImpl : IWindowIconImpl
{
public IconImpl(Pixbuf pixbuf)
{
diff --git a/src/Gtk/Avalonia.Gtk/WindowImpl.cs b/src/Gtk/Avalonia.Gtk/WindowImpl.cs
index fd6bbb7c61..634c2be9a8 100644
--- a/src/Gtk/Avalonia.Gtk/WindowImpl.cs
+++ b/src/Gtk/Avalonia.Gtk/WindowImpl.cs
@@ -384,7 +384,7 @@ namespace Avalonia.Gtk
return true;
}
- public void SetIcon(IIconImpl icon)
+ public void SetIcon(IWindowIconImpl icon)
{
Icon = ((IconImpl)icon).Pixbuf;
}
diff --git a/src/Windows/Avalonia.Win32/IconImpl.cs b/src/Windows/Avalonia.Win32/IconImpl.cs
index 7a5feda12a..bdbf338caf 100644
--- a/src/Windows/Avalonia.Win32/IconImpl.cs
+++ b/src/Windows/Avalonia.Win32/IconImpl.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Avalonia.Win32
{
- class IconImpl : IIconImpl
+ class IconImpl : IWindowIconImpl
{
public IconImpl(System.Drawing.Bitmap iconBitmap)
{
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 5a1cca8f07..2ad34a3af6 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -189,19 +189,19 @@ namespace Avalonia.Win32
return new PopupImpl();
}
- public IIconImpl LoadIcon(string fileName)
+ public IWindowIconImpl LoadIcon(string fileName)
{
var icon = new System.Drawing.Bitmap(fileName);
return new IconImpl(icon);
}
- public IIconImpl LoadIcon(Stream stream)
+ public IWindowIconImpl LoadIcon(Stream stream)
{
var icon = new System.Drawing.Bitmap(stream);
return new IconImpl(icon);
}
- public IIconImpl LoadIcon(IBitmapImpl bitmap)
+ public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
{
using (var memoryStream = new MemoryStream())
{
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 3c39737f9e..816b7fc790 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -681,7 +681,7 @@ namespace Avalonia.Win32
UnmanagedMethods.ShowWindow(_hwnd, command);
}
- public void SetIcon(IIconImpl icon)
+ public void SetIcon(IWindowIconImpl icon)
{
var impl = (IconImpl)icon;
var nativeIcon = impl.IconBitmap;
diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs
index 74d637899b..505a88ecd5 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaView.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs
@@ -214,7 +214,7 @@ namespace Avalonia.iOS
}
}
- public void SetIcon(IIconImpl icon)
+ public void SetIcon(IWindowIconImpl icon)
{
}
}
diff --git a/src/iOS/Avalonia.iOS/PlatformIconLoader.cs b/src/iOS/Avalonia.iOS/PlatformIconLoader.cs
index 620aa67c05..4ad2dca97f 100644
--- a/src/iOS/Avalonia.iOS/PlatformIconLoader.cs
+++ b/src/iOS/Avalonia.iOS/PlatformIconLoader.cs
@@ -8,17 +8,17 @@ namespace Avalonia.iOS
{
class PlatformIconLoader : IPlatformIconLoader
{
- public IIconImpl LoadIcon(IBitmapImpl bitmap)
+ public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
{
return null;
}
- public IIconImpl LoadIcon(Stream stream)
+ public IWindowIconImpl LoadIcon(Stream stream)
{
return null;
}
- public IIconImpl LoadIcon(string fileName)
+ public IWindowIconImpl LoadIcon(string fileName)
{
return null;
}