Fixed #130.

Author: KN4CK3R

ReClass.NET/Nodes/BitFieldNode.cs

@@ -109,6 +109,8 @@ private string ConvertValueToBitString(MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
+			const int BitsPerBlock = 4;
+
 			if (IsHidden && !IsWrapped)
 			{
 				return DrawHidden(view, x, y);
@@ -135,7 +137,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			for (var i = 0; i < bits; ++i)
 			{
-				var rect = new Rectangle(x + i * view.Font.Width, y, view.Font.Width, view.Font.Height);
+				var rect = new Rectangle(x + (i + i / BitsPerBlock) * view.Font.Width, y, view.Font.Width, view.Font.Height);
 				AddHotSpot(view, rect, string.Empty, i, HotSpotType.Edit);
 			}
 

ReClass.NET/Util/BitString.cs

@@ -51,15 +51,17 @@ public static string ToString(long value)
 
 		private static string AddPaddingAndBuildBlocks(int bits, string value)
 		{
+			const int BitsPerBlock = 4;
+
 			var sb = new StringBuilder(bits);
 
 			var padding = bits - value.Length;
 
 			// Add full padding blocks.
-			while (padding > 4)
+			while (padding > BitsPerBlock)
 			{
 				sb.Append("0000 ");
-				padding -= 4;
+				padding -= BitsPerBlock;
 			}
 
 			// Add only a part of a block.
@@ -72,7 +74,7 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)
 				}
 
 				// and {4 - padding} bits of the value.
-				sb.Append(value, 0, 4 - padding);
+				sb.Append(value, 0, BitsPerBlock - padding);
 
 				if (value.Length > padding)
 				{
@@ -81,10 +83,10 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)
 			}
 
 			// Add all remaining blocks.
-			for (var i = padding == 0 ? 0 : 4 - padding; i < value.Length; i += 4)
+			for (var i = padding == 0 ? 0 : BitsPerBlock - padding; i < value.Length; i += BitsPerBlock)
 			{
-				sb.Append(value, i, 4);
-				if (i < value.Length - 4)
+				sb.Append(value, i, BitsPerBlock);
+				if (i < value.Length - BitsPerBlock)
 				{
 					sb.Append(' ');
 				}