Added BaseNode.IsWrapped.

KN4CK3R · KN4CK3R · commit 82ead061d9b3 · 2019-01-06T01:28:39.000+01:00
diff --git a/ReClass.NET/Nodes/BaseNode.cs b/ReClass.NET/Nodes/BaseNode.cs
@@ -40,10 +40,13 @@ public abstract class BaseNode
 		/// <summary>Gets or sets the parent node.</summary>
 		public BaseContainerNode ParentNode { get; internal set; }
 
-		/// <summary>Gets or sets a value indicating whether this object is hidden.</summary>
+		/// <summary>Gets or sets a value indicating whether this node is wrapped into an other node.</summary>
+		public bool IsWrapped { get; internal set; }
+
+		/// <summary>Gets or sets a value indicating whether this node is hidden.</summary>
 		public bool IsHidden { get; set; }
 
-		/// <summary>Gets or sets a value indicating whether this object is selected.</summary>
+		/// <summary>Gets or sets a value indicating whether this node is selected.</summary>
 		public bool IsSelected { get; set; }
 
 		/// <summary>Size of the node in bytes.</summary>
@@ -273,7 +276,7 @@ protected void AddSelection(ViewInfo view, int x, int y, int height)
 			Contract.Requires(view != null);
 			Contract.Requires(view.Context != null);
 
-			if (y > view.ClientArea.Bottom || y + height < 0)
+			if (y > view.ClientArea.Bottom || y + height < 0 || IsWrapped)
 			{
 				return;
 			}
@@ -286,7 +289,7 @@ 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, -1, HotSpotType.Select);
+			AddHotSpot(view, new Rectangle(0, y, view.ClientArea.Right - (IsSelected ? 16 : 0), height), string.Empty, HotSpot.NoneId, HotSpotType.Select);
 		}
 
 		/// <summary>Draws an icon and adds a <see cref="HotSpot"/> if <paramref name="id"/> is not <see cref="HotSpot.NoneId"/>.</summary>
@@ -310,7 +313,7 @@ protected int AddIcon(ViewInfo view, int x, int y, Image icon, int id, HotSpotTy
 
 			view.Context.DrawImage(icon, x + 2, y, Icons.Dimensions, Icons.Dimensions);
 
-			if (id != -1)
+			if (id != HotSpot.NoneId)
 			{
 				AddHotSpot(view, new Rectangle(x, y, Icons.Dimensions, Icons.Dimensions), string.Empty, id, type);
 			}
@@ -344,7 +347,7 @@ protected void AddTypeDrop(ViewInfo view, int y)
 			Contract.Requires(view != null);
 			Contract.Requires(view.Context != null);
 
-			if (view.MultipleNodesSelected || (y > view.ClientArea.Bottom || y + Icons.Dimensions < 0))
+			if (view.MultipleNodesSelected || y > view.ClientArea.Bottom || y + Icons.Dimensions < 0 || IsWrapped)
 			{
 				return;
 			}
@@ -363,7 +366,7 @@ protected void AddDelete(ViewInfo view, 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 + Icons.Dimensions < 0 || IsWrapped)
 			{
 				return;
 			}
diff --git a/ReClass.NET/Nodes/BaseNumericNode.cs b/ReClass.NET/Nodes/BaseNumericNode.cs
@@ -22,7 +22,7 @@ protected Size DrawNumeric(ViewInfo view, int x, int y, Image icon, string type,
 			Contract.Requires(type != null);
 			Contract.Requires(value != null);
 
-			if (IsHidden)
+			if (IsHidden && !IsWrapped)
 			{
 				return DrawHidden(view, x, y);
 			}
@@ -39,7 +39,10 @@ protected Size DrawNumeric(ViewInfo view, int x, int y, Image icon, string type,
 			x = AddAddressOffset(view, x, y);
 
 			x = AddText(view, x, y, view.Settings.TypeColor, HotSpot.NoneId, type) + view.Font.Width;
-			x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NameId, Name) + view.Font.Width;
+			if (!IsWrapped)
+			{
+				x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NameId, Name) + view.Font.Width;
+			}
 			x = AddText(view, x, y, view.Settings.NameColor, HotSpot.NoneId, "=") + view.Font.Width;
 			x = AddText(view, x, y, view.Settings.ValueColor, 0, value) + view.Font.Width;
 			if (alternativeValue != null)
diff --git a/ReClass.NET/Nodes/BaseWrapperNode.cs b/ReClass.NET/Nodes/BaseWrapperNode.cs
@@ -26,6 +26,8 @@ public void ChangeInnerNode(BaseNode node)
 			{
 				InnerNode = node;
 
+				node.IsWrapped = true;
+
 				InnerNodeChanged?.Invoke(this);
 
 				ParentNode?.ChildHasChanged(this);

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,13 @@ public abstract class BaseNode`
`40`	`40`	`/// <summary>Gets or sets the parent node.</summary>`
`41`	`41`	`public BaseContainerNode ParentNode { get; internal set; }`
`42`	`42`
`43`		`- /// <summary>Gets or sets a value indicating whether this object is hidden.</summary>`
	`43`	`+ /// <summary>Gets or sets a value indicating whether this node is wrapped into an other node.</summary>`
	`44`	`+ public bool IsWrapped { get; internal set; }`
	`45`	`+`
	`46`	`+ /// <summary>Gets or sets a value indicating whether this node is hidden.</summary>`
`44`	`47`	`public bool IsHidden { get; set; }`
`45`	`48`
`46`		`- /// <summary>Gets or sets a value indicating whether this object is selected.</summary>`
	`49`	`+ /// <summary>Gets or sets a value indicating whether this node is selected.</summary>`
`47`	`50`	`public bool IsSelected { get; set; }`
`48`	`51`
`49`	`52`	`/// <summary>Size of the node in bytes.</summary>`
`@@ -273,7 +276,7 @@ protected void AddSelection(ViewInfo view, int x, int y, int height)`
`273`	`276`	`Contract.Requires(view != null);`
`274`	`277`	`Contract.Requires(view.Context != null);`
`275`	`278`
`276`		`- if (y > view.ClientArea.Bottom \|\| y + height < 0)`
	`279`	`+ if (y > view.ClientArea.Bottom \|\| y + height < 0 \|\| IsWrapped)`
`277`	`280`	`{`
`278`	`281`	`return;`
`279`	`282`	`}`
`@@ -286,7 +289,7 @@ protected void AddSelection(ViewInfo view, int x, int y, int height)`
`286`	`289`	`}`
`287`	`290`	`}`
`288`	`291`
`289`		`- AddHotSpot(view, new Rectangle(0, y, view.ClientArea.Right - (IsSelected ? 16 : 0), height), string.Empty, -1, HotSpotType.Select);`
	`292`	`+ AddHotSpot(view, new Rectangle(0, y, view.ClientArea.Right - (IsSelected ? 16 : 0), height), string.Empty, HotSpot.NoneId, HotSpotType.Select);`
`290`	`293`	`}`
`291`	`294`
`292`	`295`	`/// <summary>Draws an icon and adds a <see cref="HotSpot"/> if <paramref name="id"/> is not <see cref="HotSpot.NoneId"/>.</summary>`
`@@ -310,7 +313,7 @@ protected int AddIcon(ViewInfo view, int x, int y, Image icon, int id, HotSpotTy`
`310`	`313`
`311`	`314`	`view.Context.DrawImage(icon, x + 2, y, Icons.Dimensions, Icons.Dimensions);`
`312`	`315`
`313`		`- if (id != -1)`
	`316`	`+ if (id != HotSpot.NoneId)`
`314`	`317`	`{`
`315`	`318`	`AddHotSpot(view, new Rectangle(x, y, Icons.Dimensions, Icons.Dimensions), string.Empty, id, type);`
`316`	`319`	`}`
`@@ -344,7 +347,7 @@ protected void AddTypeDrop(ViewInfo view, int y)`
`344`	`347`	`Contract.Requires(view != null);`
`345`	`348`	`Contract.Requires(view.Context != null);`
`346`	`349`
`347`		`- if (view.MultipleNodesSelected \|\| (y > view.ClientArea.Bottom \|\| y + Icons.Dimensions < 0))`
	`350`	`+ if (view.MultipleNodesSelected \|\| y > view.ClientArea.Bottom \|\| y + Icons.Dimensions < 0 \|\| IsWrapped)`
`348`	`351`	`{`
`349`	`352`	`return;`
`350`	`353`	`}`
`@@ -363,7 +366,7 @@ protected void AddDelete(ViewInfo view, int y)`
`363`	`366`	`Contract.Requires(view != null);`
`364`	`367`	`Contract.Requires(view.Context != null);`
`365`	`368`
`366`		`- if (y > view.ClientArea.Bottom \|\| y + Icons.Dimensions < 0)`
	`369`	`+ if (y > view.ClientArea.Bottom \|\| y + Icons.Dimensions < 0 \|\| IsWrapped)`
`367`	`370`	`{`
`368`	`371`	`return;`
`369`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ public void ChangeInnerNode(BaseNode node)`
`26`	`26`	`{`
`27`	`27`	`InnerNode = node;`
`28`	`28`
	`29`	`+ node.IsWrapped = true;`
	`30`	`+`
`29`	`31`	`InnerNodeChanged?.Invoke(this);`
`30`	`32`
`31`	`33`	`ParentNode?.ChildHasChanged(this);`