From 4951eacca046ea24dd70fdba40370404a108ae8c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Thu, 12 Sep 2019 01:01:06 +0200
Subject: [PATCH] Move static overlay to the upper left corner. Add overlays
 for protected internal and private protected.

---
 ILSpy/ILSpy.csproj                        |  10 +++
 ILSpy/Images/Images.cs                    |   8 ++-
 ILSpy/Images/OverlayPrivateProtected.png  | Bin 562 -> 423 bytes
 ILSpy/Images/OverlayProtectedInternal.png | Bin 582 -> 431 bytes
 ILSpy/Images/OverlayStatic.png            | Bin 144 -> 306 bytes
 ILSpy/Images/OverlayStatic.svg            |  73 ++++++++++++++++++++++
 ILSpy/Images/OverlayStatic.xaml           | Bin 657 -> 944 bytes
 ILSpy/Images/StaticClass.png              | Bin 467 -> 0 bytes
 8 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 ILSpy/Images/OverlayStatic.svg
 delete mode 100644 ILSpy/Images/StaticClass.png

diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index b8bdfd230..c54f80f84 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -338,7 +338,9 @@
     <Page Include="Images\Operator.xaml" />
     <Page Include="Images\OverlayInternal.xaml" />
     <Page Include="Images\OverlayPrivate.xaml" />
+    <Page Include="Images\OverlayPrivateProtected.xaml" />
     <Page Include="Images\OverlayProtected.xaml" />
+    <Page Include="Images\OverlayProtectedInternal.xaml" />
     <Page Include="Images\OverlayStatic.xaml" />
     <Page Include="Images\Property.xaml" />
     <Page Include="Images\ReferenceFolder.xaml" />
@@ -513,10 +515,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\OverlayPrivateProtected.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\OverlayProtected.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\OverlayProtectedInternal.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\OverlayStatic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs
index eedb1de24..8db74138e 100644
--- a/ILSpy/Images/Images.cs
+++ b/ILSpy/Images/Images.cs
@@ -392,17 +392,19 @@ namespace ICSharpCode.ILSpy
 					baseDrawing = (DrawingGroup)baseImage;
 				}
 
-				if (overlay != null) {
+				if (overlay != null || isStatic) {
 					var nestedGroup = new DrawingGroup { Transform = new ScaleTransform(0.8, 0.8) };
 					nestedGroup.Children.Add(baseDrawing);
 					group.Children.Add(nestedGroup);
+				} else {
+					group.Children.Add(baseDrawing);
+				}
 
+				if (overlay != null) {
 					if (overlay is ImageSource overlayImage)
 						group.Children.Add(new ImageDrawing(overlayImage, iconRect));
 					else
 						group.Children.Add((DrawingGroup)overlay);
-				} else {
-					group.Children.Add(baseDrawing);
 				}
 
 				if (isStatic) {
diff --git a/ILSpy/Images/OverlayPrivateProtected.png b/ILSpy/Images/OverlayPrivateProtected.png
index 497753285b37332db45777cdd969ccacbc2349c5..aacc0f65ea7cbfde53086fa58f7ff1adbec57ba6 100644
GIT binary patch
delta 396
zcmV;70dxMc1g8U#C4X~5NmK|32nc)#WQYI&010qNS#tmY4#WTe4#WYKD-Ig~000?u
zMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs0003bNkl<ZIF0R(p=$zR7{;G>
z9EvLz<zWB8%DPqIz_74(n1%*n2>T0`E-WvZEw;g7SUWhdTz@;*7#Pe8XOMmPJ)bDt
zyEMaaYis`6`@s8q-v>Bx;=dqyW37E(tyaz$^Fi`SRXuC%9Z7Z0-Tu0)s^{zV`g1fI
zX}{msFbp-0V<ma-oO?;rR7pPnb-k4&iAGVRB(*3C9SjCaQjIa%>-BWA*(gaRxtE^;
zYwh)7v6$s~j(<v}0sz?UcJO^4<M9~V?H1K)6~o~WK@hy29s6RrTw*$%qS<UB%QD1q
zj83P6cDoJF^U&>f5d=Y2tJPXZ1>el)a}-5!m>Z1-CX)&3^*R7thzO5XaL&z)F^5b<
q;QKyA<gF~r2LO*Ea#@z;)fe%mpzwHpB4Ypm002ovP6b4+LSTZUo38u-

delta 536
zcmV+z0_Xjw1F{5=C4Xl@O+f$vv5yP<VFdsH010qNS#tmY4#NNd4#NS*Z>VGd000?u
zMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfK7U)Yh_O00056Nkl<ZI8S331vCQt>zNt1
zRWa#qC}Yap2*f+8nRE{{Ff&4>aRX&#<*=fn!v870vYVIIs(&5)eXI5EhjT@D5A`cA
zTwB8Av%3zDAt22_-0y5EwW}{%`QiVstN-tx<NRdL6wPb@A2t5p(XOy$X+EPqR5>O9
zX$Ioe?NN-A{(oEhe?pDGdo@v(=UQS6CzthdocsT{?0;7*<0PnZRA6RimSt#YI2mMs
zv#I#O<=viN{(rw(`2YXyN&oL}3;6%<O6LCqGpx>(`7?M!wV(o^0X-WwZ1}%r%N8Ks
z{J*z0{{Qm6;QtSfHvK=fBJ}&RMy;cT-VC|*p$tq=EvUfA$f*0yojd=_%gg^473TlX
zN>BP<8KeCF>6zyLmo_K<ZwO^r1H@8|VGOKLEvP_VUVpv==7NljjQ<G<3IE%(Ex`sP
zIk4R*^JdV4D#Z@?`T3`VTyXQ|&HooJT=>6l-@gA{1s-4no}8-vpJ~Ui2&xo2U}tA<
z;^E<$BPJ#`NkKtj9vd6mPFFR?=g-cy{`b;kyq0LrU<*}BJc!h1a0=ID*bAbeLRbI;
a0|3ok!4X1nuT*aU0000<MNUMnLSTZds|H8_

diff --git a/ILSpy/Images/OverlayProtectedInternal.png b/ILSpy/Images/OverlayProtectedInternal.png
index 8f655d30d8d0532bf97b332aefedbb665c9c7462..2de3f0ebe68ed44236c487ebba7a831ebe1249f5 100644
GIT binary patch
delta 405
zcmV;G0c!rn1g`^-B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01m_e01m_fl`9S#0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$REJ;K`R5*?8kg-bwaU8|p
zg$=hg+)_|~M}vbn2qp-(goDs5IJ$b%P5uK7Lh9n+)Yg^`L4U(-4b8!!IY>vH-}goM
z(YK|RP@>(>@|O1=ya(*r^H0p|@LT;q%_34GX{s8LJSF)cA|@j5BH~EiW?6Q$vp`j^
zr_-sCOi13xacuQ^-Db0yRjXC&_xmOyH{S0c$vJ=%0BE&Z==FN=eIH>M!pu-86yTgg
z5Cj+whv~tVoqx|slAzIOAWc&=n@vn66BLU@0DyB208lEG;CbHD)}vJQZZsNMrBbnO
zw`(NlS(bgY+ifeC%hu_1EYI^-RXy9fpJXx~k8QD7*kCZQ^?FSasV$ewO%z48TCJ4i
z`L6emNq&-iAsLc<BxxdYp{iFT-$-8m_`d+ZrO;Cu{|?Bo00000NkvXXu0mjfS7Nm$

delta 557
zcmV+|0@D4j1I7f9B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L^m3s900Fg0
zL_t(IPh%JbGy?nUnHjfLG3jn7W6InJ#5<~)bPqHzGeV{DgMZz%%#5pxnSA#5t1tY0
ztM%@Ob47O#^(!x2Tf*eCyN(D$7UweRZ);as^8f4V|EHF?UE4E7^V<JMjsJJFD=b->
z&!`Voh8wg;F;4pbZSDU>-F)ZNMHo(Mi7}j9*2{73|Kqa%U9pUlpvn-SH=V&3h|^)X
zK9XU|-Z|b6|9`()`2YXyN&oL}3;6%<O6LCqGpx>(`7?M!wIM)fGDGH-b@u=NKd%7e
zzfa5mA6V@2fA<`Z|BsGV{y)Da<nyvdt)qqB47v583`|gM2+$P6kn{aw(*Lu|E&l(1
zRQ&(X{eu7BZ)X3WnJ@JJ>6zyLmo_K<ZwO^r1H@8|VSfy)P;CfM9m<gZ|6$Spx5p#?
zA6sDf|Nos_Fg>qC7HmM755u`KZw5W6a!gR<!%+PHZr=ajSJVDKI}rGP|4c0~J+D+1
zY`~LKwf{5i7#2a5V}eX)hVuVFXaB#Ije@6StNed<uJwPs8N<aya|T<ea!e4S$B-DH
v#n6O~gC=zt7KQ3C+z-=Z=z=Q60vH$og&yLArYhxa00000NkvXXu0mjf#dQ>`

diff --git a/ILSpy/Images/OverlayStatic.png b/ILSpy/Images/OverlayStatic.png
index e6a140ff3235e49b1e0f61fc8ae1e35ec943a9c1..01365fae53d4fff5e06ff516dea16f43cfc59ae9 100644
GIT binary patch
delta 279
zcmV+y0qFja0kQ&+B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01m_e01m_fl`9S#0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$QuSrBfR5*=eV1R;m@7~FM
zc>m$RhYuf=7)St2FwHNXzg(G+m>}@z;ge+~8S?JkJGpCDuYVtRb#;B@<mB|<#l_|6
zrHfZi5NinIhxZ>2BqSyXeERfBA127h$9HkT`~@Eb1O*%jdg0&ye{pTC?cbT1nIAJS
zFfcGNF+FQ)Z27^!$dE*|H{QR0uW;qkl@kF00T-@Zx^m+E`}Yb&YeqKY!}|{h$kIFt
dMggS&0EyUE)DXos3>E+Y002ovPDHLkV1n}wb3*_C

delta 115
zcmdnQG=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*HyDQ%S

diff --git a/ILSpy/Images/OverlayStatic.svg b/ILSpy/Images/OverlayStatic.svg
new file mode 100644
index 000000000..1151193b2
--- /dev/null
+++ b/ILSpy/Images/OverlayStatic.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg15"
+   sodipodi:docname="OverlayStatic.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="C:\Users\sie_p\Projects\ILSpy master\ILSpy\Images\OverlayStatic.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs19" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="29.5"
+     inkscape:cx="6.3236432"
+     inkscape:cy="11.363497"
+     inkscape:window-x="-8"
+     inkscape:window-y="340"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15" />
+  <style
+     id="style2">.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}.st3{fill:#f0eff1}</style>
+  <path
+     style="opacity:0;fill:#f6f6f6"
+     inkscape:connector-curvature="0"
+     id="path4"
+     d="M 0,0 H 16 V 16 H 0 Z"
+     class="st0" />
+  <path
+     style="fill:#f0eff1;fill-opacity:1;stroke-width:0.70710683"
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="M 3.5,7 0,3.5 3.5,0 7,3.5 Z M 5.9999999,3.4999999 3.5,1 1,3.4999999 l 2.5,2.5 z"
+     class="st2" />
+  <path
+     class="st3"
+     d="M 5.9999999,3.5 3.5,5.9999999 0.99999995,3.5 3.5,1 Z"
+     id="icon_x5F_fg"
+     inkscape:connector-curvature="0"
+     style="fill:#424242;fill-opacity:1;stroke-width:0.70710683"
+     sodipodi:nodetypes="ccccc" />
+</svg>
diff --git a/ILSpy/Images/OverlayStatic.xaml b/ILSpy/Images/OverlayStatic.xaml
index 525b65af699f0d9479f62744b10b6af7cda803c4..fee145f39e38a72bfc13fb79d3fa289286929bb6 100644
GIT binary patch
literal 944
zcmb`G%}>HW5XIlw#Q&kedp{5~8uZ{t@#573w?;vlU?HtU^p976({>dK<zUQaGPASu
z-oBY_zdi@LQLaR9N|otZLw0j5wUDQkUNj?H=t3P$^~zf4Tmh@lBbhN339*k)$r!f4
zCRF<D=j4N$djemeu0qxc(F&yT2XN*v6<7u?!BUVJcV6mH2PpB>uG7~wN>Z4fN}g;D
zRUwBko02iix!xNcd%7aK<o;>d=TWIJMx(P1_cu9gBKPFO+V1cX7*7vBk>%`sM6E}k
zzuo*zSB#<<#@o_IC2O0mW9HxI*3(*p+dFT%?9A;)#MVzA+}XyeYI-|z#vj#YJk6RJ
zXWd$d^B?~>iyrLG_PtSCPp04XzpEzPn#DT8A#DQNFFfGA+y1P!FLocM`gXnnC4q$)

literal 657
zcmbu7+iJrw42G}Qrx4k#sjW24VI;ZOA-zc-B4p_jh~r?pEbG%xPFC1D#tN0-2ifA2
z_2cweSMS~Mw$ti3!X*2_WL|6S_`tcT+eTJqExTGPqYidmE6J(*FmYdqkWZED`KTMy
z47ReJ8oYdUmwqR%pW3c})y<HvfFj*BN;X!1eD%PiKAJZ3?u97k@Zj8$c?Iq<WEhr$
z1OyX6r8s%O|A7%Hba?@b9BU>zPy`W+u7U;V@&bkdOUi^LkT48@Dhy7r$1THc8IwTF
zVxTg<VT8}nFOifsCl3}yKxDY6Kc6qU0o*WL)W2$IAzq5&*IqXarTv``WD8m1ym2O-
NpOW%F{>9IW{1YqZw6FjG

diff --git a/ILSpy/Images/StaticClass.png b/ILSpy/Images/StaticClass.png
deleted file mode 100644
index 4f200b2a0f99bf4bf50f5f6d56adf32584f6ce52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003(Nkl<ZI8S33JU}XUhqQFw&e=eG21JAS
zP$}YoNXq)z-plU1@IUqUzw_cdFF<^#6mftzdf6G<<NyCNZu<XUbN~PUAU;$I3=YN4
zR9;|R{vSj`g-`)U$o$z#ldirH-TD8&Xy4TrAU;$Itoc~t-2eX<-u;i$5ElPg(#(D{
zX9MvW5S?FM|G%cD=6@@Y-X7HV|IhTxU<@*3p-shqs5blnWWZv(s{hxE)`2x&&RYd?
z!C9Q%KnEZLK#D;&9#5M0f4)`OIifX#0LTCk4blX%xvqMHBX7;B|N8UJ5bpvglL4g3
zc+rLb#gBk7M64ko13<X2q3yrQ<b(e+Z~O;ikRg1vtBDIp5D=(e``=~rL$GFt^>;xo
zI7_rQKmeo|WTVOAi~o75SDqtDGYo(<fov{n*y0Ekq6T1K0018P$c)K^&eQ+^002ov
JPDHLkV1lzV$}Ru^