Changed draw callback signature.

Author: KN4CK3R

Nodes/BaseMatrixNode.cs

@@ -5,12 +5,12 @@ namespace ReClassNET.Nodes
 {
 	public abstract class BaseMatrixNode : BaseNode
 	{
-		public BaseMatrixNode()
+		protected BaseMatrixNode()
 		{
 			levelsOpen.DefaultValue = true;
 		}
 
-		protected delegate void DrawMatrixValues(ref int x, ref int y, int defaultX);
+		protected delegate void DrawMatrixValues(int x, ref int y);
 
 		protected int DrawMatrixType(ViewInfo view, int x, int y, string type, DrawMatrixValues drawValues)
 		{
@@ -45,7 +45,7 @@ protected int DrawMatrixType(ViewInfo view, int x, int y, string type, DrawMatri
 
 			if (levelsOpen[view.Level])
 			{
-				drawValues(ref x, ref y, tx);
+				drawValues(tx, ref y);
 			}
 
 			return y + view.Font.Height;

Nodes/Matrix3x3Node.cs

@@ -34,24 +34,24 @@ struct Matrix3x3Data
 
 		/// <summary>Draws this node.</summary>
 		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
+		/// <param name="x2">The x coordinate.</param>
+		/// <param name="y2">The y coordinate.</param>
 		/// <returns>The height the node occupies.</returns>
 		public override int Draw(ViewInfo view, int x2, int y2)
 		{
-			return DrawMatrixType(view, x2, y2, "Matrix (3x3)", (ref int x, ref int y, int defaultX) =>
+			return DrawMatrixType(view, x2, y2, "Matrix (3x3)", (int defaultX, ref int y) =>
 			{
 				var value = view.Memory.ReadObject<Matrix3x3Data>(Offset);
 
 				y += view.Font.Height;
-				x = defaultX;
+				var x = defaultX;
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 				x = AddText(view, x, y, view.Settings.ValueColor, 0, $"{value._11,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
 				x = AddText(view, x, y, view.Settings.ValueColor, 1, $"{value._12,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
 				x = AddText(view, x, y, view.Settings.ValueColor, 2, $"{value._13,14:0.000}");
-				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
+				AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 
 				y += view.Font.Height;
 				x = defaultX;
@@ -61,7 +61,7 @@ public override int Draw(ViewInfo view, int x2, int y2)
 				x = AddText(view, x, y, view.Settings.ValueColor, 4, $"{value._22,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
 				x = AddText(view, x, y, view.Settings.ValueColor, 5, $"{value._23,14:0.000}");
-				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
+				AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 
 				y += view.Font.Height;
 				x = defaultX;

Nodes/Matrix3x4Node.cs

@@ -39,17 +39,17 @@ struct Matrix3x4Data
 
 		/// <summary>Draws this node.</summary>
 		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
+		/// <param name="x2">The x coordinate.</param>
+		/// <param name="y2">The y coordinate.</param>
 		/// <returns>The height the node occupies.</returns>
 		public override int Draw(ViewInfo view, int x2, int y2)
 		{
-			return DrawMatrixType(view, x2, y2, "Matrix (3x4)", (ref int x, ref int y, int defaultX) =>
+			return DrawMatrixType(view, x2, y2, "Matrix (3x4)", (int defaultX, ref int y) =>
 			{
 				var value = view.Memory.ReadObject<Matrix3x4Data>(Offset);
 
 				y += view.Font.Height;
-				x = defaultX;
+				var x = defaultX;
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 				x = AddText(view, x, y, view.Settings.ValueColor, 0, $"{value._11,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
@@ -58,7 +58,7 @@ public override int Draw(ViewInfo view, int x2, int y2)
 				x = AddText(view, x, y, view.Settings.ValueColor, 2, $"{value._13,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
 				x = AddText(view, x, y, view.Settings.ValueColor, 3, $"{value._14,14:0.000}");
-				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
+				AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 
 				y += view.Font.Height;
 				x = defaultX;
@@ -70,7 +70,7 @@ public override int Draw(ViewInfo view, int x2, int y2)
 				x = AddText(view, x, y, view.Settings.ValueColor, 6, $"{value._23,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");
 				x = AddText(view, x, y, view.Settings.ValueColor, 7, $"{value._24,14:0.000}");
-				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
+				AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 
 				y += view.Font.Height;
 				x = defaultX;

Nodes/Matrix4x4Node.cs

@@ -47,17 +47,17 @@ struct Matrix4x4Data
 
 		/// <summary>Draws this node.</summary>
 		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
+		/// <param name="x2">The x coordinate.</param>
+		/// <param name="y2">The y coordinate.</param>
 		/// <returns>The height the node occupies.</returns>
 		public override int Draw(ViewInfo view, int x2, int y2)
 		{
-			return DrawMatrixType(view, x2, y2, "Matrix (4x4)", (ref int x, ref int y, int defaultX) =>
+			return DrawMatrixType(view, x2, y2, "Matrix (4x4)", (int defaultX, ref int y) =>
 			{
 				var value = view.Memory.ReadObject<Matrix4x4Data>(Offset);
 
 				y += view.Font.Height;
-				x = defaultX;
+				var x = defaultX;
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "|");
 				x = AddText(view, x, y, view.Settings.ValueColor, 0, $"{value._11,14:0.000}");
 				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, ",");