Browse Source

Fix icons in SearchPane.

pull/1707/head
Siegfried Pammer 6 years ago
parent
commit
006c6cb4eb
  1. 4
      ILSpy/Controls/SearchBoxStyle.xaml
  2. 2
      ILSpy/Search/AbstractSearchStrategy.cs
  3. 8
      ILSpy/Search/SearchPane.cs
  4. 2
      ILSpy/TreeNodes/EventTreeNode.cs
  5. 2
      ILSpy/TreeNodes/FieldTreeNode.cs
  6. 2
      ILSpy/TreeNodes/MethodTreeNode.cs
  7. 2
      ILSpy/TreeNodes/PropertyTreeNode.cs
  8. 2
      ILSpy/TreeNodes/TypeTreeNode.cs

4
ILSpy/Controls/SearchBoxStyle.xaml

@ -43,7 +43,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
ToolTip="Search" ToolTip="Search"
Source="pack://application:,,,/ILSpy;component/images/search.png" /> Source="{local:XamlResource Images/Search}" />
</Border> </Border>
</Grid> </Grid>
</Border> </Border>
@ -57,7 +57,7 @@
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="Source" <Setter Property="Source"
TargetName="SearchIcon" TargetName="SearchIcon"
Value="pack://application:,,,/ILSpy;component/images/clearsearch.png" /> Value="{local:XamlResource Images/Close}" />
<Setter Property="ToolTip" TargetName="SearchIcon" Value="Clear"/> <Setter Property="ToolTip" TargetName="SearchIcon" Value="Clear"/>
</MultiTrigger> </MultiTrigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>

2
ILSpy/Search/AbstractSearchStrategy.cs

@ -202,7 +202,7 @@ namespace ICSharpCode.ILSpy.Search
} }
} }
internal static object GetIcon(IEntity member) internal static ImageSource GetIcon(IEntity member)
{ {
switch (member) { switch (member) {
case ITypeDefinition t: case ITypeDefinition t:

8
ILSpy/Search/SearchPane.cs

@ -373,8 +373,8 @@ namespace ICSharpCode.ILSpy
public sealed class SearchResult : IMemberTreeNode public sealed class SearchResult : IMemberTreeNode
{ {
object image; ImageSource image;
object locationImage; ImageSource locationImage;
public static readonly IComparer<SearchResult> Comparer = new SearchResultComparer(); public static readonly IComparer<SearchResult> Comparer = new SearchResultComparer();
@ -385,7 +385,7 @@ namespace ICSharpCode.ILSpy
public string Name { get; set; } public string Name { get; set; }
public object ToolTip { get; set; } public object ToolTip { get; set; }
public object Image { public ImageSource Image {
get { get {
if (image == null) { if (image == null) {
image = AbstractSearchStrategy.GetIcon(Member); image = AbstractSearchStrategy.GetIcon(Member);
@ -394,7 +394,7 @@ namespace ICSharpCode.ILSpy
} }
} }
public object LocationImage { public ImageSource LocationImage {
get { get {
if (locationImage == null) { if (locationImage == null) {
locationImage = Member.DeclaringTypeDefinition != null ? TypeTreeNode.GetIcon(Member.DeclaringTypeDefinition) : Images.Namespace; locationImage = Member.DeclaringTypeDefinition != null ? TypeTreeNode.GetIcon(Member.DeclaringTypeDefinition) : Images.Namespace;

2
ILSpy/TreeNodes/EventTreeNode.cs

@ -52,7 +52,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Icon => GetIcon(EventDefinition); public override object Icon => GetIcon(EventDefinition);
public static object GetIcon(IEvent @event) public static ImageSource GetIcon(IEvent @event)
{ {
return Images.GetIcon(MemberIcon.Event, MethodTreeNode.GetOverlayIcon(@event.Accessibility), @event.IsStatic); return Images.GetIcon(MemberIcon.Event, MethodTreeNode.GetOverlayIcon(@event.Accessibility), @event.IsStatic);
} }

2
ILSpy/TreeNodes/FieldTreeNode.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Icon => GetIcon(FieldDefinition); public override object Icon => GetIcon(FieldDefinition);
public static object GetIcon(IField field) public static ImageSource GetIcon(IField field)
{ {
if (field.DeclaringType.Kind == TypeKind.Enum && field.ReturnType.Kind == TypeKind.Enum) 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, MethodTreeNode.GetOverlayIcon(field.Accessibility), false);

2
ILSpy/TreeNodes/MethodTreeNode.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Icon => GetIcon(MethodDefinition); public override object Icon => GetIcon(MethodDefinition);
public static object GetIcon(IMethod method) public static ImageSource GetIcon(IMethod method)
{ {
if (method.IsOperator) if (method.IsOperator)
return Images.GetIcon(MemberIcon.Operator, GetOverlayIcon(method.Accessibility), false); return Images.GetIcon(MemberIcon.Operator, GetOverlayIcon(method.Accessibility), false);

2
ILSpy/TreeNodes/PropertyTreeNode.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Icon => GetIcon(PropertyDefinition); public override object Icon => GetIcon(PropertyDefinition);
public static object GetIcon(IProperty property) public static ImageSource GetIcon(IProperty property)
{ {
return Images.GetIcon(property.IsIndexer ? MemberIcon.Indexer : MemberIcon.Property, return Images.GetIcon(property.IsIndexer ? MemberIcon.Indexer : MemberIcon.Property,
MethodTreeNode.GetOverlayIcon(property.Accessibility), property.IsStatic); MethodTreeNode.GetOverlayIcon(property.Accessibility), property.IsStatic);

2
ILSpy/TreeNodes/TypeTreeNode.cs

@ -110,7 +110,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override object Icon => GetIcon(TypeDefinition); public override object Icon => GetIcon(TypeDefinition);
public static object GetIcon(ITypeDefinition type) public static ImageSource GetIcon(ITypeDefinition type)
{ {
return Images.GetIcon(GetTypeIcon(type, out bool isStatic), GetOverlayIcon(type), isStatic); return Images.GetIcon(GetTypeIcon(type, out bool isStatic), GetOverlayIcon(type), isStatic);
} }

Loading…
Cancel
Save