From c66423fb9fb4d6b3e6408d69dc8ef937b4bbf56c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 10 Sep 2019 02:43:00 +0200
Subject: [PATCH] Add static overlay icon.

---
 ILSpy/ILSpy.csproj              |  10 ++++++++++
 ILSpy/Images/Images.cs          |   4 ----
 ILSpy/Images/OverlayStatic.png  | Bin 347 -> 144 bytes
 ILSpy/Images/OverlayStatic.xaml |   9 +++++++++
 ILSpy/Images/TypeIcon.cs        |   3 +--
 ILSpy/TreeNodes/TypeTreeNode.cs |   8 ++++----
 6 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 ILSpy/Images/OverlayStatic.xaml

diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 319e94081..a7d106eed 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -322,6 +322,8 @@
     <Page Include="Images\Open.xaml" />
     <Page Include="Images\OverlayInternal.xaml" />
     <Page Include="Images\OverlayPrivate.xaml" />
+    <Page Include="Images\OverlayProtected.xaml" />
+    <Page Include="Images\OverlayStatic.xaml" />
     <Page Include="Images\Refresh.xaml" />
     <Page Include="Images\Search.xaml" />
     <Page Include="Images\Sort.xaml" />
@@ -450,6 +452,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\OverlayProtected.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Images\OverlayStatic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\Refresh.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs
index 70c3928b9..f4d089535 100644
--- a/ILSpy/Images/Images.cs
+++ b/ILSpy/Images/Images.cs
@@ -215,7 +215,6 @@ namespace ICSharpCode.ILSpy
 				PreloadPublicIconToCache(TypeIcon.Struct, Images.Struct);
 				PreloadPublicIconToCache(TypeIcon.Interface, Images.Interface);
 				PreloadPublicIconToCache(TypeIcon.Delegate, Images.Delegate);
-				PreloadPublicIconToCache(TypeIcon.StaticClass, Images.StaticClass);
 			}
 
 			protected override object GetBaseImage(TypeIcon icon)
@@ -237,9 +236,6 @@ namespace ICSharpCode.ILSpy
 					case TypeIcon.Delegate:
 						baseImage = Images.Delegate;
 						break;
-					case TypeIcon.StaticClass:
-						baseImage = Images.StaticClass;
-						break;
 					default:
 						throw new ArgumentOutOfRangeException(nameof(icon), $"TypeIcon.{icon} is not supported!");
 				}
diff --git a/ILSpy/Images/OverlayStatic.png b/ILSpy/Images/OverlayStatic.png
index 1a0e5e9d44f576b710ac23ea83820b3b25972871..e6a140ff3235e49b1e0f61fc8ae1e35ec943a9c1 100644
GIT binary patch
delta 115
zcmcc3G=Xt~N)Bg%M`SSr1K(i~W;~w1B87p0!O7FbF{C2y?L<Q^1_d7G+US4(r@xvM
zs;<c)wDo}kTi%Nc*_oHmf1a?0OOwGMId;O@o*eF9SDYKokD7n5s%!R+4={Nr{&Py(
S2LoQ9X$+pOelF{r5}E*aCM*a5

delta 320
zcmV-G0l)r`0owwQB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m<c01m<d6(~x80000O
zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@RY%_jN0002lNkl<ZI8S4s8sLjtXT}q=
zriLSCO+Rnk+Csj#ZOTw7!hj`WnYmio?g{pNr|<a9x%R=L?SI$>`Mm8_3_(j(p-S)r
zrl18i)}2Rh7oGn1zy8Ai|1LZK{g*4<eSyh;UN}?<0pK;W-)+K~4<OCXK+QfU|Nj>$
z-}ju!ZAvOs1p(kbwMeUE+Xa|r@fmkNa;I%L#OyRF0IGrjaGasc7rCH{KXuIoww&$H
z*%DSBW(u8`#5rI-K^&@r2w>N#%3#wS!C={*#$eMKz+hT00hJjAqksTlU;qFf-c;gX
SbfU)q0000<MNUMnLSTZusfo7$

diff --git a/ILSpy/Images/OverlayStatic.xaml b/ILSpy/Images/OverlayStatic.xaml
new file mode 100644
index 000000000..a0a893f2c
--- /dev/null
+++ b/ILSpy/Images/OverlayStatic.xaml
@@ -0,0 +1,9 @@
+<DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+  <DrawingGroup.Children>
+    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M7,16L16,16 16,7 7,7z" />
+    <GeometryDrawing Brush="#FF414141" Geometry="F1M14,9L9,9 9,14 14,14z M15,15L8,15 8,8 15,8z" />
+    <GeometryDrawing Brush="#FF414141" Geometry="F1M12,12L12,10 10,10 10,11 11,11 11,12 10,12 10,13 13,13 13,12z" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M12,12L12,10 10,10 10,11 11,11 11,12 10,12 10,13 13,13 13,12z M14,14L9,14 9,9 14,9z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
\ No newline at end of file
diff --git a/ILSpy/Images/TypeIcon.cs b/ILSpy/Images/TypeIcon.cs
index a3e6b4b91..ec4b8fd58 100644
--- a/ILSpy/Images/TypeIcon.cs
+++ b/ILSpy/Images/TypeIcon.cs
@@ -25,7 +25,6 @@ namespace ICSharpCode.ILSpy
 		Enum,
 		Struct,
 		Interface,
-		Delegate,
-		StaticClass
+		Delegate
 	}
 }
diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs
index 8772874fe..cb40b06b2 100644
--- a/ILSpy/TreeNodes/TypeTreeNode.cs
+++ b/ILSpy/TreeNodes/TypeTreeNode.cs
@@ -112,11 +112,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public static object GetIcon(ITypeDefinition type)
 		{
-			return Images.GetIcon(GetTypeIcon(type), GetOverlayIcon(type));
+			return Images.GetIcon(GetTypeIcon(type, out bool isStatic), GetOverlayIcon(type), isStatic);
 		}
 
-		internal static TypeIcon GetTypeIcon(IType type)
+		internal static TypeIcon GetTypeIcon(IType type, out bool isStatic)
 		{
+			isStatic = false;
 			switch (type.Kind) {
 				case TypeKind.Interface:
 					return TypeIcon.Interface;
@@ -127,8 +128,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				case TypeKind.Enum:
 					return TypeIcon.Enum;
 				default:
-					if (type.GetDefinition()?.IsStatic == true)
-						return TypeIcon.StaticClass;
+					isStatic = type.GetDefinition()?.IsStatic == true;
 					return TypeIcon.Class;
 			}
 		}