dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switched to valuetuples for exhanging tokens

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-27 20:43:18 +01:00
parent cad74f31e1
commit dd913b8f20
13 changed files with 13 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.UI.Controls.Avalonia/IconElement/BitmapIcon.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class BitmapIcon : FluentAvalonia.UI.Controls.BitmapIcon public class BitmapIcon : FluentAvalonia.UI.Controls.BitmapIcon;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/BitmapIconSource.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class BitmapIconSource : FluentAvalonia.UI.Controls.BitmapIconSource public class BitmapIconSource : FluentAvalonia.UI.Controls.BitmapIconSource;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/ContentIconSource.cs
-27
View File
@@ -1,27 +0,0 @@
using Avalonia;
using Avalonia.Controls.Templates;
using Avalonia.Metadata;
namespace Toolkit.UI.Controls.Avalonia;
public class ContentIconSource : FluentAvalonia.UI.Controls.IconSource
{
public static readonly StyledProperty<object?> ContentProperty =
AvaloniaProperty.Register<ContentIconSource, object?>("Content");
public static readonly StyledProperty<IDataTemplate?> ContentTemplateProperty =
AvaloniaProperty.Register<ContentIconSource, IDataTemplate?>("ContentTemplate");
[Content]
public object? Content
{
get => GetValue(ContentProperty);
set => SetValue(ContentProperty, value);
}
public IDataTemplate? IconTemplate
{
get => GetValue(ContentTemplateProperty);
set => SetValue(ContentTemplateProperty, value);
}
}
Toolkit.UI.Controls.Avalonia/IconElement/FAIconElement.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class FAIconElement : FluentAvalonia.UI.Controls.FAIconElement public class FAIconElement : FluentAvalonia.UI.Controls.FAIconElement;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/FAPathIcon.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class FAPathIcon : FluentAvalonia.UI.Controls.FAPathIcon public class FAPathIcon : FluentAvalonia.UI.Controls.FAPathIcon;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/FontIcon.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class FontIcon : FluentAvalonia.UI.Controls.FontIcon public class FontIcon : FluentAvalonia.UI.Controls.FontIcon;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/FontIconSource.cs
+3 -6
View File
@@ -1,6 +1,3 @@
namespace Kromek.UI.Avalonia.Controls namespace Toolkit.UI.Controls.Avalonia;
{
public class FontIconSource : FluentAvalonia.UI.Controls.FontIconSource public class FontIconSource : FluentAvalonia.UI.Controls.FontIconSource;
{
}
}
Toolkit.UI.Controls.Avalonia/IconElement/IconHelper.cs
-35
View File
@@ -1,35 +0,0 @@
using System.Reflection;
namespace Toolkit.UI.Controls.Avalonia;
public class IconHelper
{
private static MethodInfo? invoker;
public static FluentAvalonia.UI.Controls.FAIconElement? CreateIconElement(FluentAvalonia.UI.Controls.IconSource source)
{
if (source is ContentIconSource contentIconSource)
{
ContentIcon contentIcon = new()
{
[!ContentIcon.ContentProperty] = contentIconSource[!ContentIconSource.ContentProperty],
[!ContentIcon.ContentTemplateProperty] = contentIconSource[!ContentIconSource.ContentTemplateProperty],
};
return contentIcon;
}
else
{
if (invoker == null)
{
Type? iconHelpersType = Type.GetType("FluentAvalonia.UI.Controls.IconHelpers,FluentAvalonia");
if (iconHelpersType?.GetMethod("CreateFromUnknown", BindingFlags.Public | BindingFlags.Static) is MethodInfo createFromUnknown)
{
invoker = createFromUnknown;
}
}
return (FluentAvalonia.UI.Controls.FAIconElement?)invoker?.Invoke(null, new object[] { source });
}
}
}
Toolkit.UI.Controls.Avalonia/IconElement/ImageIcon.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class ImageIcon : FluentAvalonia.UI.Controls.ImageIcon public class ImageIcon : FluentAvalonia.UI.Controls.ImageIcon;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/ImageIconSource.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class ImageIconSource : FluentAvalonia.UI.Controls.ImageIconSource public class ImageIconSource : FluentAvalonia.UI.Controls.ImageIconSource;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/PathIconSource.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class PathIconSource : FluentAvalonia.UI.Controls.PathIconSource public class PathIconSource : FluentAvalonia.UI.Controls.PathIconSource;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/SymbolIcon.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class SymbolIcon : FluentAvalonia.UI.Controls.SymbolIcon public class SymbolIcon : FluentAvalonia.UI.Controls.SymbolIcon;
{
}
Toolkit.UI.Controls.Avalonia/IconElement/SymbolIconSource.cs
+1 -3
View File
@@ -1,5 +1,3 @@
namespace Toolkit.UI.Controls.Avalonia; namespace Toolkit.UI.Controls.Avalonia;
public class SymbolIconSource : FluentAvalonia.UI.Controls.SymbolIconSource public class SymbolIconSource : FluentAvalonia.UI.Controls.SymbolIconSource;
{
}