diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index 01d7a6caf..b8bdfd230 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -341,6 +341,7 @@ + @@ -376,8 +377,7 @@ - - + @@ -524,6 +524,10 @@ MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs index 6fe4bb002..eedb1de24 100644 --- a/ILSpy/Images/Images.cs +++ b/ILSpy/Images/Images.cs @@ -66,8 +66,7 @@ namespace ICSharpCode.ILSpy public static readonly object Library = Load("Library"); public static readonly object Namespace = Load("Namespace"); - public static readonly BitmapImage ReferenceFolderOpen = LoadBitmap("ReferenceFolder.Open"); - public static readonly BitmapImage ReferenceFolderClosed = LoadBitmap("ReferenceFolder.Closed"); + public static readonly object ReferenceFolder = Load("ReferenceFolder"); public static readonly BitmapImage SubTypes = LoadBitmap("SubTypes"); public static readonly BitmapImage SuperTypes = LoadBitmap("SuperTypes"); @@ -386,16 +385,24 @@ namespace ICSharpCode.ILSpy { var group = new DrawingGroup(); - if (baseImage is ImageSource img) - group.Children.Add(new ImageDrawing(img, iconRect)); - else - group.Children.Add((DrawingGroup)baseImage); + Drawing baseDrawing; + if (baseImage is ImageSource img) { + baseDrawing = new ImageDrawing(img, iconRect); + } else { + baseDrawing = (DrawingGroup)baseImage; + } if (overlay != null) { + var nestedGroup = new DrawingGroup { Transform = new ScaleTransform(0.8, 0.8) }; + nestedGroup.Children.Add(baseDrawing); + group.Children.Add(nestedGroup); + 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/OverlayInternal.png b/ILSpy/Images/OverlayInternal.png index e6bbf2ef5..f364dbf57 100644 Binary files a/ILSpy/Images/OverlayInternal.png and b/ILSpy/Images/OverlayInternal.png differ diff --git a/ILSpy/Images/OverlayInternal.svg b/ILSpy/Images/OverlayInternal.svg new file mode 100644 index 000000000..512d30498 --- /dev/null +++ b/ILSpy/Images/OverlayInternal.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ILSpy/Images/OverlayInternal.xaml b/ILSpy/Images/OverlayInternal.xaml index 0547b6dca..5daa63ca0 100644 Binary files a/ILSpy/Images/OverlayInternal.xaml and b/ILSpy/Images/OverlayInternal.xaml differ diff --git a/ILSpy/Images/OverlayPrivate.png b/ILSpy/Images/OverlayPrivate.png index 605b509b2..089c046f4 100644 Binary files a/ILSpy/Images/OverlayPrivate.png and b/ILSpy/Images/OverlayPrivate.png differ diff --git a/ILSpy/Images/OverlayPrivate.svg b/ILSpy/Images/OverlayPrivate.svg new file mode 100644 index 000000000..1d2c52d96 --- /dev/null +++ b/ILSpy/Images/OverlayPrivate.svg @@ -0,0 +1,80 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ILSpy/Images/OverlayPrivate.xaml b/ILSpy/Images/OverlayPrivate.xaml index 8c3064fea..c05c10fde 100644 Binary files a/ILSpy/Images/OverlayPrivate.xaml and b/ILSpy/Images/OverlayPrivate.xaml differ diff --git a/ILSpy/Images/OverlayProtected.png b/ILSpy/Images/OverlayProtected.png index 823c0b9b0..60ca955b9 100644 Binary files a/ILSpy/Images/OverlayProtected.png and b/ILSpy/Images/OverlayProtected.png differ diff --git a/ILSpy/Images/OverlayProtected.svg b/ILSpy/Images/OverlayProtected.svg new file mode 100644 index 000000000..931b970ee --- /dev/null +++ b/ILSpy/Images/OverlayProtected.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ILSpy/Images/OverlayProtected.xaml b/ILSpy/Images/OverlayProtected.xaml index d5cb089b5..399719a34 100644 Binary files a/ILSpy/Images/OverlayProtected.xaml and b/ILSpy/Images/OverlayProtected.xaml differ diff --git a/ILSpy/Images/OverlayStatic.xaml b/ILSpy/Images/OverlayStatic.xaml index a0a893f2c..525b65af6 100644 --- a/ILSpy/Images/OverlayStatic.xaml +++ b/ILSpy/Images/OverlayStatic.xaml @@ -1,5 +1,5 @@ - + diff --git a/ILSpy/Images/ReferenceFolder.Closed.png b/ILSpy/Images/ReferenceFolder.Closed.png deleted file mode 100644 index e99252016..000000000 Binary files a/ILSpy/Images/ReferenceFolder.Closed.png and /dev/null differ diff --git a/ILSpy/Images/ReferenceFolder.Open.png b/ILSpy/Images/ReferenceFolder.Open.png deleted file mode 100644 index c986addc0..000000000 Binary files a/ILSpy/Images/ReferenceFolder.Open.png and /dev/null differ diff --git a/ILSpy/Images/ReferenceFolder.png b/ILSpy/Images/ReferenceFolder.png new file mode 100644 index 000000000..71b589473 Binary files /dev/null and b/ILSpy/Images/ReferenceFolder.png differ diff --git a/ILSpy/Images/ReferenceFolder.svg b/ILSpy/Images/ReferenceFolder.svg new file mode 100644 index 000000000..469268e6c --- /dev/null +++ b/ILSpy/Images/ReferenceFolder.svg @@ -0,0 +1,90 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/ILSpy/Images/ReferenceFolder.xaml b/ILSpy/Images/ReferenceFolder.xaml new file mode 100644 index 000000000..de230e5ad Binary files /dev/null and b/ILSpy/Images/ReferenceFolder.xaml differ diff --git a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs index fde4630f1..e59a409f0 100644 --- a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs +++ b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs @@ -46,11 +46,7 @@ namespace ICSharpCode.ILSpy.TreeNodes } public override object Icon { - get { return Images.ReferenceFolderClosed; } - } - - public override object ExpandedIcon { - get { return Images.ReferenceFolderOpen; } + get { return Images.GetIcon(Images.ReferenceFolder); } } protected override void LoadChildren() diff --git a/ILSpy/TreeNodes/ResourceListTreeNode.cs b/ILSpy/TreeNodes/ResourceListTreeNode.cs index c67c9d4b1..8f9b21f91 100644 --- a/ILSpy/TreeNodes/ResourceListTreeNode.cs +++ b/ILSpy/TreeNodes/ResourceListTreeNode.cs @@ -43,11 +43,11 @@ namespace ICSharpCode.ILSpy.TreeNodes } public override object Icon { - get { return Images.FolderClosed; } + get { return Images.GetIcon(Images.FolderClosed); } } public override object ExpandedIcon { - get { return Images.FolderOpen; } + get { return Images.GetIcon(Images.FolderOpen); } } protected override void LoadChildren()