Merge branch 'master' of https://github.com/ReClassNET/ReClass.NET

Author: KN4CK3R

ReClass.NET/Forms/MainForm.Functions.cs

@@ -410,6 +410,17 @@ private void PasteNodeFromClipboardToSelection()
 			}
 		}
 
+		private void EditSelectedNodeName()
+		{
+			var selected = memoryViewControl.GetSelectedNodes();
+			var selectedNode = selected.FirstOrDefault();
+
+			if (selected.Count == 1)
+			{
+				memoryViewControl.ShowEditBoxForName(selectedNode);
+			}
+		}
+
 		private void RemoveSelectedNodes()
 		{
 			memoryViewControl.GetSelectedNodes()

ReClass.NET/Forms/MainForm.cs

@@ -766,22 +766,24 @@ private void classesView_ClassSelected(object sender, ClassNode node)
 			CurrentClassNode = node;
 		}
 
-		private void memoryViewControl_KeyDown(object sender, KeyEventArgs e)
+		private void memoryViewControl_KeyDown(object sender, KeyEventArgs args)
 		{
-			if (e.Control)
+			switch (args.KeyCode)
 			{
-				if (e.KeyCode == Keys.C)
-				{
+				case Keys.C when args.Control:
 					CopySelectedNodesToClipboard();
-				}
-				else if (e.KeyCode == Keys.V)
-				{
+					break;
+				case Keys.V when args.Control:
 					PasteNodeFromClipboardToSelection();
-				}
-			}
-			else if (e.KeyCode == Keys.Delete)
-			{
-				RemoveSelectedNodes();
+					break;
+
+				case Keys.Delete:
+					RemoveSelectedNodes();
+					break;
+
+				case Keys.F2:
+					EditSelectedNodeName();
+					break;
 			}
 		}
 

ReClass.NET/UI/HotSpotTextBox.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Windows.Forms;
 

ReClass.NET/UI/MemoryViewControl.Designer.cs

@@ -381,6 +381,20 @@ protected override void OnMouseDoubleClick(MouseEventArgs e)
 			base.OnMouseDoubleClick(e);
 		}
 
+		public void ShowEditBoxForName(SelectedNodeInfo selection)
+		{
+			var hotSpot = hotSpots.FirstOrDefault(spot => spot.Address == selection.Address &&
+			                                                      spot.Type == HotSpotType.Edit &&
+			                                                      spot.Text == selection.Node.Name);
+			if (hotSpot != null)
+			{
+				editBox.BackColor = Program.Settings.SelectedColor;
+				editBox.HotSpot = hotSpot;
+				editBox.Visible = true;
+				editBox.ReadOnly = false;
+			}
+		}
+
 		private Point toolTipPosition;
 		protected override void OnMouseHover(EventArgs e)
 		{
@@ -631,6 +645,8 @@ private void editBox_Committed(object sender, EventArgs e)
 
 				Invalidate();
 			}
+
+			Focus();
 		}
 
 		#endregion