Added IconProvider

ReClass.NET/Controls/DrawContextRequestEventArgs.cs

@@ -1,6 +1,7 @@
 using System;
 using ReClassNET.Memory;
 using ReClassNET.Nodes;
+using ReClassNET.UI;
 
 namespace ReClassNET.Controls
 {
@@ -10,6 +11,8 @@ public class DrawContextRequestEventArgs : EventArgs
 
 		public Settings Settings { get; set; }
 
+		public IconProvider IconProvider { get; set; }
+
 		public RemoteProcess Process { get; set; }
 
 		public MemoryBuffer Memory { get; set; }

ReClass.NET/Controls/MemoryViewControl.cs

@@ -126,6 +126,7 @@ protected override void OnPaint(PaintEventArgs e)
 				Settings = args.Settings,
 				Context = e.Graphics,
 				Font = font,
+				IconProvider = args.IconProvider,
 				Process = args.Process,
 				Memory = args.Memory,
 				CurrentTime = args.CurrentTime,

ReClass.NET/Controls/ViewInfo.cs

@@ -12,6 +12,7 @@ public class ViewInfo
 
 		public Graphics Context { get; set; }
 		public FontEx Font { get; set; }
+		public IconProvider IconProvider { get; set; }
 
 		public RemoteProcess Process { get; set; }
 		public MemoryBuffer Memory { get; set; }
@@ -31,6 +32,7 @@ public ViewInfo Clone()
 				Settings = Settings,
 				Context = Context,
 				Font = Font,
+				IconProvider = IconProvider,
 				Process = Process,
 				Memory = Memory,
 				CurrentTime = CurrentTime,

ReClass.NET/Forms/MainForm.cs

@@ -27,6 +27,7 @@ namespace ReClassNET.Forms
 	public partial class MainForm : IconForm
 	{
 		private readonly PluginManager pluginManager;
+		private readonly IconProvider iconProvider = new IconProvider();
 
 		private ReClassNetProject currentProject;
 		public ReClassNetProject CurrentProject => currentProject;
@@ -1011,6 +1012,7 @@ private void memoryViewControl_DrawContextRequested(object sender, DrawContextRe
 				memoryViewBuffer.UpdateFrom(process, address);
 
 				args.Settings = Program.Settings;
+				args.IconProvider = iconProvider;
 				args.Process = process;
 				args.Memory = memoryViewBuffer;
 				args.Node = classNode;

ReClass.NET/Nodes/BaseFunctionPtrNode.cs

@@ -37,9 +37,9 @@ protected Size Draw(ViewInfo view, int x, int y, string type, string name)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
-			x = AddIcon(view, x, y, Icons.Function, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Function, HotSpot.NoneId, HotSpotType.None);
 
 			var tx = x;
 

ReClass.NET/Nodes/BaseHexNode.cs

@@ -45,7 +45,9 @@ protected Size Draw(ViewInfo view, int x, int y, string text, int length)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding + 16;
+			x = AddIconPadding(view, x);
+			x = AddIconPadding(view, x);
+
 			x = AddAddressOffset(view, x, y);
 
 			if (!string.IsNullOrEmpty(text))

ReClass.NET/Nodes/BaseMatrixNode.cs

@@ -33,9 +33,9 @@ protected Size DrawMatrixType(ViewInfo view, int x, int y, string type, DrawMatr
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
-			x = AddIcon(view, x, y, Icons.Matrix, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Matrix, HotSpot.NoneId, HotSpotType.None);
 
 			var tx = x;
 
@@ -83,9 +83,9 @@ protected Size DrawVectorType(ViewInfo view, int x, int y, string type, DrawVect
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
-			x = AddIcon(view, x, y, Icons.Vector, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Vector, HotSpot.NoneId, HotSpotType.None);
 			x = AddAddressOffset(view, x, y);
 
 			x = AddText(view, x, y, view.Settings.TypeColor, HotSpot.NoneId, type) + view.Font.Width;

ReClass.NET/Nodes/BaseNode.cs

@@ -20,7 +20,6 @@ public abstract class BaseNode
 
 		internal static readonly List<INodeInfoReader> NodeInfoReader = new List<INodeInfoReader>();
 
-		protected static readonly int TextPadding = Icons.Dimensions;
 		protected static readonly int HiddenHeight = 0;
 
 		private static int nodeIndex = 0;
@@ -383,6 +382,11 @@ protected void AddSelection(ViewInfo view, int x, int y, int height)
 			AddHotSpot(view, new Rectangle(0, y, view.ClientArea.Right - (IsSelected ? 16 : 0), height), string.Empty, HotSpot.NoneId, HotSpotType.Select);
 		}
 
+		protected int AddIconPadding(ViewInfo view, int x)
+		{
+			return x + view.IconProvider.Dimensions;
+		}
+
 		/// <summary>Draws an icon and adds a <see cref="HotSpot"/> if <paramref name="id"/> is not <see cref="HotSpot.NoneId"/>.</summary>
 		/// <param name="view">The view information.</param>
 		/// <param name="x">The x coordinate.</param>
@@ -397,19 +401,21 @@ protected int AddIcon(ViewInfo view, int x, int y, Image icon, int id, HotSpotTy
 			Contract.Requires(view.Context != null);
 			Contract.Requires(icon != null);
 
-			if (y > view.ClientArea.Bottom || y + Icons.Dimensions < 0)
+			var size = view.IconProvider.Dimensions;
+
+			if (y > view.ClientArea.Bottom || y + size < 0)
 			{
-				return x + Icons.Dimensions;
+				return x + size;
 			}
 
-			view.Context.DrawImage(icon, x + 2, y, Icons.Dimensions, Icons.Dimensions);
+			view.Context.DrawImage(icon, x + 2, y, size, size);
 
 			if (id != HotSpot.NoneId)
 			{
-				AddHotSpot(view, new Rectangle(x, y, Icons.Dimensions, Icons.Dimensions), string.Empty, id, type);
+				AddHotSpot(view, new Rectangle(x, y, size, size), string.Empty, id, type);
 			}
 
-			return x + Icons.Dimensions;
+			return x + size;
 		}
 
 		/// <summary>Adds a togglable Open/Close icon.</summary>
@@ -422,12 +428,13 @@ protected int AddOpenCloseIcon(ViewInfo view, int x, int y)
 			Contract.Requires(view != null);
 			Contract.Requires(view.Context != null);
 
-			if (y > view.ClientArea.Bottom || y + Icons.Dimensions < 0)
+			if (y > view.ClientArea.Bottom || y + view.IconProvider.Dimensions < 0)
 			{
-				return x + Icons.Dimensions;
+				return x + view.IconProvider.Dimensions;
 			}
 
-			return AddIcon(view, x, y, LevelsOpen[view.Level] ? Icons.OpenCloseOpen : Icons.OpenCloseClosed, 0, HotSpotType.OpenClose);
+			var icon = LevelsOpen[view.Level] ? view.IconProvider.OpenCloseOpen : view.IconProvider.OpenCloseClosed;
+			return AddIcon(view, x, y, icon, 0, HotSpotType.OpenClose);
 		}
 
 		/// <summary>Draws a context drop icon if the node is selected.</summary>
@@ -438,14 +445,14 @@ protected void AddContextDropDownIcon(ViewInfo view, int y)
 			Contract.Requires(view != null);
 			Contract.Requires(view.Context != null);
 
-			if (view.MultipleNodesSelected || y > view.ClientArea.Bottom || y + Icons.Dimensions < 0 || IsWrapped)
+			if (view.MultipleNodesSelected || y > view.ClientArea.Bottom || y + view.IconProvider.Dimensions < 0 || IsWrapped)
 			{
 				return;
 			}
 
 			if (IsSelected)
 			{
-				AddIcon(view, 0, y, Icons.DropArrow, 0, HotSpotType.Context);
+				AddIcon(view, 0, y, view.IconProvider.DropArrow, 0, HotSpotType.Context);
 			}
 		}
 
@@ -457,14 +464,14 @@ protected void AddDeleteIcon(ViewInfo view, int y)
 			Contract.Requires(view != null);
 			Contract.Requires(view.Context != null);
 
-			if (y > view.ClientArea.Bottom || y + Icons.Dimensions < 0 || IsWrapped)
+			if (y > view.ClientArea.Bottom || y + view.IconProvider.Dimensions < 0 || IsWrapped)
 			{
 				return;
 			}
 
 			if (IsSelected)
 			{
-				AddIcon(view, view.ClientArea.Right - Icons.Dimensions, y, Icons.Delete, 0, HotSpotType.Delete);
+				AddIcon(view, view.ClientArea.Right - view.IconProvider.Dimensions, y, view.IconProvider.Delete, 0, HotSpotType.Delete);
 			}
 		}
 

ReClass.NET/Nodes/BaseNumericNode.cs

@@ -32,7 +32,7 @@ protected Size DrawNumeric(ViewInfo view, int x, int y, Image icon, string type,
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
 			x = AddIcon(view, x, y, icon, HotSpot.NoneId, HotSpotType.None);
 			x = AddAddressOffset(view, x, y);

ReClass.NET/Nodes/BaseTextNode.cs

@@ -42,8 +42,9 @@ protected Size DrawText(ViewInfo view, int x, int y, string type)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
-			x = AddIcon(view, x, y, Icons.Text, HotSpot.NoneId, HotSpotType.None);
+			x = AddIconPadding(view, x);
+
+			x = AddIcon(view, x, y, view.IconProvider.Text, HotSpot.NoneId, HotSpotType.None);
 			x = AddAddressOffset(view, x, y);
 
 			x = AddText(view, x, y, view.Settings.TypeColor, HotSpot.NoneId, type) + view.Font.Width;

ReClass.NET/Nodes/BaseTextPtrNode.cs

@@ -39,8 +39,9 @@ public Size DrawText(ViewInfo view, int x, int y, string type)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
-			x = AddIcon(view, x, y, Icons.Text, HotSpot.NoneId, HotSpotType.None);
+			x = AddIconPadding(view, x);
+
+			x = AddIcon(view, x, y, view.IconProvider.Text, HotSpot.NoneId, HotSpotType.None);
 			x = AddAddressOffset(view, x, y);
 
 			x = AddText(view, x, y, view.Settings.TypeColor, HotSpot.NoneId, type) + view.Font.Width;

ReClass.NET/Nodes/BaseWrapperArrayNode.cs

@@ -40,7 +40,7 @@ protected Size Draw(ViewInfo view, int x, int y, string type)
 			AddSelection(view, x, y, view.Font.Height);
 
 			x = AddOpenCloseIcon(view, x, y);
-			x = AddIcon(view, x, y, Icons.Array, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Array, HotSpot.NoneId, HotSpotType.None);
 
 			var tx = x;
 			x = AddAddressOffset(view, x, y);
@@ -54,14 +54,14 @@ protected Size Draw(ViewInfo view, int x, int y, string type)
 			x = AddText(view, x, y, view.Settings.IndexColor, IsReadOnly ? HotSpot.NoneId : 0, Count.ToString());
 			x = AddText(view, x, y, view.Settings.IndexColor, HotSpot.NoneId, "]");
 
-			x = AddIcon(view, x, y, Icons.LeftArrow, 2, HotSpotType.Click);
+			x = AddIcon(view, x, y, view.IconProvider.LeftArrow, 2, HotSpotType.Click);
 			x = AddText(view, x, y, view.Settings.IndexColor, HotSpot.NoneId, "(");
 			x = AddText(view, x, y, view.Settings.IndexColor, 1, CurrentIndex.ToString());
 			x = AddText(view, x, y, view.Settings.IndexColor, HotSpot.NoneId, ")");
-			x = AddIcon(view, x, y, Icons.RightArrow, 3, HotSpotType.Click) + view.Font.Width;
+			x = AddIcon(view, x, y, view.IconProvider.RightArrow, 3, HotSpotType.Click) + view.Font.Width;
 
 			x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, $"<Size={MemorySize}>") + view.Font.Width;
-			x = AddIcon(view, x + 2, y, Icons.Change, 4, HotSpotType.ChangeWrappedType);
+			x = AddIcon(view, x + 2, y, view.IconProvider.Change, 4, HotSpotType.ChangeWrappedType);
 
 			x += view.Font.Width;
 			x = AddComment(view, x, y);

ReClass.NET/Nodes/BitFieldNode.cs

@@ -122,7 +122,8 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding + Icons.Dimensions;
+			x = AddIconPadding(view, x);
+			x = AddIconPadding(view, x);
 
 			x = AddAddressOffset(view, x, y);
 

ReClass.NET/Nodes/BoolNode.cs

@@ -25,7 +25,8 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding + Icons.Dimensions;
+			x = AddIconPadding(view, x);
+			x = AddIconPadding(view, x);
 
 			x = AddAddressOffset(view, x, y);
 

ReClass.NET/Nodes/ClassInstanceNode.cs

@@ -30,7 +30,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 			AddSelection(view, x, y, view.Font.Height);
 
 			x = AddOpenCloseIcon(view, x, y);
-			x = AddIcon(view, x, y, Icons.Class, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Class, HotSpot.NoneId, HotSpotType.None);
 
 			var tx = x;
 			x = AddAddressOffset(view, x, y);
@@ -41,7 +41,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NameId, Name) + view.Font.Width;
 			}
 			x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, $"<{InnerNode.Name}>") + view.Font.Width;
-			x = AddIcon(view, x, y, Icons.Change, 4, HotSpotType.ChangeClassType) + view.Font.Width;
+			x = AddIcon(view, x, y, view.IconProvider.Change, 4, HotSpotType.ChangeClassType) + view.Font.Width;
 
 			x = AddComment(view, x, y);
 

ReClass.NET/Nodes/ClassNode.cs

@@ -96,7 +96,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			var tx = x;
 
-			x = AddIcon(view, x, y, Icons.Class, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Class, HotSpot.NoneId, HotSpotType.None);
 			x = AddText(view, x, y, view.Settings.OffsetColor, 0, AddressFormula) + view.Font.Width;
 
 			x = AddText(view, x, y, view.Settings.TypeColor, HotSpot.NoneId, "Class") + view.Font.Width;

ReClass.NET/Nodes/DoubleNode.cs

@@ -17,7 +17,7 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return DrawNumeric(view, x, y, Icons.Double, "Double", ReadValueFromMemory(view.Memory).ToString("0.000"), null);
+			return DrawNumeric(view, x, y, view.IconProvider.Double, "Double", ReadValueFromMemory(view.Memory).ToString("0.000"), null);
 		}
 
 		public override void Update(HotSpot spot)

ReClass.NET/Nodes/EnumNode.cs

@@ -146,9 +146,9 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
-			x = AddIcon(view, x, y, Icons.Enum, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Enum, HotSpot.NoneId, HotSpotType.None);
 
 			x = AddAddressOffset(view, x, y);
 
@@ -158,7 +158,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NameId, Name) + view.Font.Width;
 			}
 			x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, $"<{Enum.Name}>") + view.Font.Width;
-			x = AddIcon(view, x, y, Icons.Change, 4, HotSpotType.ChangeEnumType) + view.Font.Width;
+			x = AddIcon(view, x, y, view.IconProvider.Change, 4, HotSpotType.ChangeEnumType) + view.Font.Width;
 
 			x = AddText(view, x, y, view.Settings.TextColor, HotSpot.NoneId, "=") + view.Font.Width;
 

ReClass.NET/Nodes/FloatNode.cs

@@ -17,7 +17,7 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return DrawNumeric(view, x, y, Icons.Float, "Float", ReadValueFromMemory(view.Memory).ToString("0.000"), null);
+			return DrawNumeric(view, x, y, view.IconProvider.Float, "Float", ReadValueFromMemory(view.Memory).ToString("0.000"), null);
 		}
 
 		public override void Update(HotSpot spot)

ReClass.NET/Nodes/FunctionNode.cs

@@ -44,9 +44,9 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			AddSelection(view, x, y, view.Font.Height);
 
-			x += TextPadding;
+			x = AddIconPadding(view, x);
 
-			x = AddIcon(view, x, y, Icons.Function, HotSpot.NoneId, HotSpotType.None);
+			x = AddIcon(view, x, y, view.IconProvider.Function, HotSpot.NoneId, HotSpotType.None);
 
 			var tx = x;
 
@@ -82,7 +82,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 				y += view.Font.Height;
 				x = AddText(view, tx, y, view.Settings.TextColor, HotSpot.NoneId, "Belongs to: ");
 				x = AddText(view, x, y, view.Settings.ValueColor, HotSpot.NoneId, BelongsToClass == null ? "<None>" : $"<{BelongsToClass.Name}>") + view.Font.Width;
-				x = AddIcon(view, x, y, Icons.Change, 1, HotSpotType.ChangeClassType);
+				x = AddIcon(view, x, y, view.IconProvider.Change, 1, HotSpotType.ChangeClassType);
 				size.Width = Math.Max(size.Width, x - origX);
 				size.Height += view.Font.Height;
 

ReClass.NET/Nodes/Int16Node.cs

@@ -20,7 +20,7 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
 			var value = ReadValueFromMemory(view.Memory);
-			return DrawNumeric(view, x, y, Icons.Signed, "Int16", value.ToString(), $"0x{value:X}");
+			return DrawNumeric(view, x, y, view.IconProvider.Signed, "Int16", value.ToString(), $"0x{value:X}");
 		}
 
 		public override void Update(HotSpot spot)

ReClass.NET/Nodes/Int32Node.cs

@@ -20,7 +20,7 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
 			var value = ReadValueFromMemory(view.Memory);
-			return DrawNumeric(view, x, y, Icons.Signed, "Int32", value.ToString(), $"0x{value:X}");
+			return DrawNumeric(view, x, y, view.IconProvider.Signed, "Int32", value.ToString(), $"0x{value:X}");
 		}
 
 		public override void Update(HotSpot spot)

ReClass.NET/Nodes/Int64Node.cs

@@ -20,7 +20,7 @@ public override void GetUserInterfaceInfo(out string name, out Image icon)
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
 			var value = ReadValueFromMemory(view.Memory);
-			return DrawNumeric(view, x, y, Icons.Signed, "Int64", value.ToString(), $"0x{value:X}");
+			return DrawNumeric(view, x, y, view.IconProvider.Signed, "Int64", value.ToString(), $"0x{value:X}");
 		}
 
 		public override void Update(HotSpot spot)