Browse Source

fix formatting of pull request changes

pull/512/head
Siegfried Pammer 11 years ago
parent
commit
0d82186161
  1. 19
      ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs
  2. 3
      ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs

19
ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs

@ -32,8 +32,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -32,8 +32,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public ILSpyTreeNode CreateNode(Resource resource)
{
EmbeddedResource er = resource as EmbeddedResource;
if (er != null)
{
if (er != null) {
return CreateNode(er.Name, er.GetResourceStream());
}
return null;
@ -41,8 +40,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -41,8 +40,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public ILSpyTreeNode CreateNode(string key, object data)
{
if (data is System.Drawing.Icon)
{
if (data is System.Drawing.Icon) {
MemoryStream s = new MemoryStream();
((System.Drawing.Icon)data).Save(s);
return new IconResourceEntryNode(key, s);
@ -67,26 +65,21 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -67,26 +65,21 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override bool View(DecompilerTextView textView)
{
try
{
try {
AvalonEditTextOutput output = new AvalonEditTextOutput();
Data.Position = 0;
IconBitmapDecoder decoder = new IconBitmapDecoder(Data, BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.None);
foreach (var frame in decoder.Frames)
{
foreach (var frame in decoder.Frames) {
output.Write(String.Format("{0}x{1}, {2} bit: ", frame.PixelHeight, frame.PixelWidth, frame.Thumbnail.Format.BitsPerPixel));
AddIcon(output, frame);
output.WriteLine();
}
output.AddButton(Images.Save, "Save", delegate
{
output.AddButton(Images.Save, "Save", delegate {
Save(null);
});
textView.ShowNode(output, this);
return true;
}
catch (Exception)
{
} catch (Exception) {
return false;
}
}

3
ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs

@ -73,8 +73,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -73,8 +73,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
protected override void LoadChildren()
{
int i = 0;
foreach (Image image in this.data.Images)
{
foreach (Image image in this.data.Images) {
var node = ResourceEntryNode.Create("Image" + i.ToString(), image);
if (node != null)
Children.Add(node);

Loading…
Cancel
Save