Browse Source

Move static overlay to the upper left corner.

Add overlays for protected internal and private protected.
pull/1704/head
Siegfried Pammer 6 years ago
parent
commit
4951eacca0
  1. 10
      ILSpy/ILSpy.csproj
  2. 8
      ILSpy/Images/Images.cs
  3. BIN
      ILSpy/Images/OverlayPrivateProtected.png
  4. BIN
      ILSpy/Images/OverlayProtectedInternal.png
  5. BIN
      ILSpy/Images/OverlayStatic.png
  6. 73
      ILSpy/Images/OverlayStatic.svg
  7. BIN
      ILSpy/Images/OverlayStatic.xaml
  8. BIN
      ILSpy/Images/StaticClass.png

10
ILSpy/ILSpy.csproj

@ -338,7 +338,9 @@ @@ -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 @@ @@ -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>

8
ILSpy/Images/Images.cs

@ -392,17 +392,19 @@ namespace ICSharpCode.ILSpy @@ -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) {

BIN
ILSpy/Images/OverlayPrivateProtected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 423 B

BIN
ILSpy/Images/OverlayProtectedInternal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 431 B

BIN
ILSpy/Images/OverlayStatic.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 306 B

73
ILSpy/Images/OverlayStatic.svg

@ -0,0 +1,73 @@ @@ -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>

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
ILSpy/Images/OverlayStatic.xaml

Binary file not shown.

BIN
ILSpy/Images/StaticClass.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

Loading…
Cancel
Save