Skip to content

Commit 51412d9

Browse files
authored
Update TreeView's TvnEndLabelEdit method to set label to null when no text has changed (#13588)
* Update TreeView's TvnEndLabelEdit method to set label to null when no text has changed
1 parent b9061cd commit 51412d9

File tree

1 file changed

+4
-5
lines changed
  • src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView

1 file changed

+4
-5
lines changed

src/System.Windows.Forms/System/Windows/Forms/Controls/TreeView/TreeView.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2575,10 +2575,6 @@ private LRESULT TvnBeginLabelEdit(NMTVDISPINFOW nmtvdi)
25752575
if (!e.CancelEdit)
25762576
{
25772577
_editNode = editingNode;
2578-
}
2579-
2580-
if (!e.CancelEdit)
2581-
{
25822578
_labelEdit = new TreeViewLabelEditNativeWindow(this);
25832579
_labelEdit.AssignHandle(PInvokeCore.SendMessage(this, PInvoke.TVM_GETEDITCONTROL));
25842580
}
@@ -2604,7 +2600,10 @@ private LRESULT TvnEndLabelEdit(NMTVDISPINFOW nmtvdi)
26042600

26052601
TreeNode? node = NodeFromHandle(nmtvdi.item.hItem);
26062602
string newText = nmtvdi.item.pszText.ToString();
2607-
NodeLabelEditEventArgs e = new(node, newText);
2603+
string? editedText = null;
2604+
if (node is not null && newText != node.Text)
2605+
editedText = newText;
2606+
NodeLabelEditEventArgs e = new(node, editedText);
26082607
OnAfterLabelEdit(e);
26092608
if (newText is not null && !e.CancelEdit && node is not null)
26102609
{

0 commit comments

Comments
 (0)