From 7716068e1ad5cdd85c5b9983a6b1416a57d6551d Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Thu, 22 Feb 2024 11:22:11 +0200
Subject: [PATCH] LCL: Check modifier keys (Shift, Ctrl, Alt) when editing the
 name of a TreeView. From n7800.

---
 lcl/include/treeview.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 4e152fc9ec..a01c9ff745 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -6498,7 +6498,7 @@ procedure TCustomTreeView.EditorEditingDone(Sender: TObject);
 var
   WasFocused: Boolean;
 begin
-  WasFocused := (FEditor<>nil) and FEditor.Focused;
+  WasFocused := Assigned(FEditor) and FEditor.Focused;
   EndEditing;
   if WasFocused then
     SetFocus;
@@ -6509,7 +6509,7 @@ procedure TCustomTreeView.EditorKeyDown(Sender: TObject; var Key: Word;
 var
   WasFocused: Boolean;
 begin
-  if (Key = VK_ESCAPE) or (Key = VK_RETURN) then
+  if (Key in [VK_RETURN, VK_ESCAPE]) and (Shift = []) then
   begin
     WasFocused := Assigned(FEditor) and FEditor.Focused;
     EndEditing(Key = VK_ESCAPE);