diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs index 1af0a9de3..36a38c07f 100644 --- a/ILSpy/TreeNodes/EventTreeNode.cs +++ b/ILSpy/TreeNodes/EventTreeNode.cs @@ -65,7 +65,7 @@ namespace ICSharpCode.ILSpy.TreeNodes public static ImageSource GetIcon(IEvent @event) { - return Images.GetIcon(MemberIcon.Event, MethodTreeNode.GetOverlayIcon(@event.Accessibility), @event.IsStatic); + return Images.GetIcon(MemberIcon.Event, Images.GetOverlayIcon(@event.Accessibility), @event.IsStatic); } public override FilterResult Filter(LanguageSettings settings) diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs index 4a086ceb7..2e566d079 100644 --- a/ILSpy/TreeNodes/FieldTreeNode.cs +++ b/ILSpy/TreeNodes/FieldTreeNode.cs @@ -58,15 +58,15 @@ namespace ICSharpCode.ILSpy.TreeNodes public static ImageSource GetIcon(IField field) { if (field.DeclaringType.Kind == TypeKind.Enum && field.ReturnType.Kind == TypeKind.Enum) - return Images.GetIcon(MemberIcon.EnumValue, MethodTreeNode.GetOverlayIcon(field.Accessibility), false); + return Images.GetIcon(MemberIcon.EnumValue, Images.GetOverlayIcon(field.Accessibility), false); if (field.IsConst) - return Images.GetIcon(MemberIcon.Literal, MethodTreeNode.GetOverlayIcon(field.Accessibility), false); + return Images.GetIcon(MemberIcon.Literal, Images.GetOverlayIcon(field.Accessibility), false); if (field.IsReadOnly) - return Images.GetIcon(MemberIcon.FieldReadOnly, MethodTreeNode.GetOverlayIcon(field.Accessibility), field.IsStatic); + return Images.GetIcon(MemberIcon.FieldReadOnly, Images.GetOverlayIcon(field.Accessibility), field.IsStatic); - return Images.GetIcon(MemberIcon.Field, MethodTreeNode.GetOverlayIcon(field.Accessibility), field.IsStatic); + return Images.GetIcon(MemberIcon.Field, Images.GetOverlayIcon(field.Accessibility), field.IsStatic); } public override FilterResult Filter(LanguageSettings settings) diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs index a78c9d80b..ad3d1cfe8 100644 --- a/ILSpy/TreeNodes/MethodTreeNode.cs +++ b/ILSpy/TreeNodes/MethodTreeNode.cs @@ -58,19 +58,19 @@ namespace ICSharpCode.ILSpy.TreeNodes public static ImageSource GetIcon(IMethod method) { if (method.IsOperator) - return Images.GetIcon(MemberIcon.Operator, GetOverlayIcon(method.Accessibility), false); + return Images.GetIcon(MemberIcon.Operator, Images.GetOverlayIcon(method.Accessibility), false); if (method.IsExtensionMethod) - return Images.GetIcon(MemberIcon.ExtensionMethod, GetOverlayIcon(method.Accessibility), false); + return Images.GetIcon(MemberIcon.ExtensionMethod, Images.GetOverlayIcon(method.Accessibility), false); if (method.IsConstructor) - return Images.GetIcon(MemberIcon.Constructor, GetOverlayIcon(method.Accessibility), method.IsStatic); + return Images.GetIcon(MemberIcon.Constructor, Images.GetOverlayIcon(method.Accessibility), method.IsStatic); if (!method.HasBody && method.HasAttribute(KnownAttribute.DllImport)) - return Images.GetIcon(MemberIcon.PInvokeMethod, GetOverlayIcon(method.Accessibility), true); + return Images.GetIcon(MemberIcon.PInvokeMethod, Images.GetOverlayIcon(method.Accessibility), true); return Images.GetIcon(method.IsVirtual ? MemberIcon.VirtualMethod : MemberIcon.Method, - GetOverlayIcon(method.Accessibility), method.IsStatic); + Images.GetOverlayIcon(method.Accessibility), method.IsStatic); } public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs index fc0a0ccbc..cdc6bd2f3 100644 --- a/ILSpy/TreeNodes/PropertyTreeNode.cs +++ b/ILSpy/TreeNodes/PropertyTreeNode.cs @@ -68,7 +68,7 @@ namespace ICSharpCode.ILSpy.TreeNodes public static ImageSource GetIcon(IProperty property) { return Images.GetIcon(property.IsIndexer ? MemberIcon.Indexer : MemberIcon.Property, - MethodTreeNode.GetOverlayIcon(property.Accessibility), property.IsStatic); + Images.GetOverlayIcon(property.Accessibility), property.IsStatic); } public override FilterResult Filter(LanguageSettings settings) diff --git a/ILSpy/ViewModels/CompareViewModel.cs b/ILSpy/ViewModels/CompareViewModel.cs index 0e415407e..4dda7ac0a 100644 --- a/ILSpy/ViewModels/CompareViewModel.cs +++ b/ILSpy/ViewModels/CompareViewModel.cs @@ -423,7 +423,25 @@ namespace ICSharpCode.ILSpy.ViewModels public override object Text => entry.Signature; - public override object Icon => Images.GetIcon(; + public override object Icon { + get { + switch (entry.Entity) + { + case ITypeDefinition t: + return TypeTreeNode.GetIcon(t); + case IMethod m: + return MethodTreeNode.GetIcon(m); + case IField f: + return FieldTreeNode.GetIcon(f); + case IProperty p: + return PropertyTreeNode.GetIcon(p); + case IEvent e: + return EventTreeNode.GetIcon(e); + default: + throw new NotSupportedException(); + } + } + } public DiffKind Difference => entry.Kind;