From 666fca62066e0ca03af99edc980dedad57804701 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 27 Nov 2008 19:37:44 +0000
Subject: [PATCH] Enhance inplace editor, implement tabbing through cells with
 enabled editor. (sergey_p)

---
 source/childwin.pas      |  6 ++--
 source/grideditlinks.pas | 62 +++++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/source/childwin.pas b/source/childwin.pas
index 125f8a96..33dd96ca 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -6262,8 +6262,10 @@ procedure TMDIChild.DataGridEdited(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Column: TColumnIndex);
 begin
   // Reassign Esc to "Cancel row editing" action
-  Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
-  Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
+  if ([tsEditing, tsEditPending] * Sender.TreeStates) = [] then begin
+    Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
+    Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
+  end;
   AutoCalcColWidths(DataGrid, PrevTableColWidths);
 end;
 
diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index d2bae7c5..3966705e 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -103,13 +103,6 @@ type
     procedure SetBounds(R: TRect); virtual; stdcall;
   end;
 
-  // TntEdit, but without TAB behaviour
-  TInplaceTntEdit = class(TTntEdit)
-  private
-    procedure WMChar(var Message: TWMChar); message WM_CHAR;
-    procedure WMGetDlgCode(var Message: TWMGetDlgCode); message WM_GETDLGCODE;
-  end;
-
   // Handler for custom button click processing
   TButtonClickEvent = procedure (Sender: TObject; Tree: TBaseVirtualTree;
     Node: PVirtualNode; Column: TColumnIndex);
@@ -129,10 +122,13 @@ type
     FStopping: Boolean;
     FButtonVisible: boolean;
     FOnButtonClick: TButtonClickEvent;
+    FFinalAction: integer;
     FMaxLength: integer;
+    FOldWndProc: TWndMethod;
     procedure EditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure ButtonClick(Sender: TObject);
     procedure SetButtonVisible(const Value: boolean);
+    procedure EditWndProc(var Message: TMessage);
   protected
     procedure DoButtonClick;
     procedure CalcEditorPosition;
@@ -677,12 +673,14 @@ begin
   FPanel.ParentColor := false;
   FPanel.Color := clWindow;
 
-  FEdit := TInplaceTntEdit.Create(FPanel);
+  FEdit := TTntEdit.Create(FPanel);
   FEdit.Hide;
   FEdit.Parent := FPanel;
   FEdit.BorderStyle := bsNone;
   FEdit.Color := clWindow;
   FEdit.OnKeyDown := EditKeyDown;
+  FOldWndProc := FEdit.WindowProc;
+  FEdit.WindowProc := EditWndProc;
 
   FButton := TPNGSpeedButton.Create(FPanel);
   FButton.PNGImage := Mainform.PngImageListMain.PngImages[33].PngImage;
@@ -699,6 +697,12 @@ begin
   if Assigned(FTextEditor) then
     FTextEditor.Release;
   FPanel.Free;
+  case FFinalAction of
+    VK_TAB: begin
+      SendMessage(FTree.Handle, WM_KEYDOWN, VK_TAB, 0);
+      SendMessage(FTree.Handle, WM_KEYDOWN, VK_RETURN, 0);
+    end;
+  end;
   inherited;
 end;
 
@@ -712,9 +716,10 @@ begin
     FEdit.Show;
     FPanel.Show;
     FEdit.SetFocus;
-    SendMessage(FTree.Handle, WM_SETREDRAW, 1, 0); // See
-    FPanel.Invalidate;
-    FEdit.Invalidate;
+    SendMessage(FTree.Handle, WM_SETREDRAW, 1, 0);
+    FTree.Repaint;
+    FPanel.Repaint;
+    FEdit.Repaint;
   end;
 end;
 
@@ -726,7 +731,6 @@ begin
     if Assigned(FTextEditor) then
       FTextEditor.Close;
     FPanel.Hide;
-    FTree.CancelEditNode;
     FTree.SetFocus;
   end;
 end;
@@ -763,6 +767,11 @@ begin
         end else
           FTree.EndEditNode;
       end;
+    VK_TAB:
+      begin
+        FFinalAction := VK_TAB;
+        FTree.EndEditNode;
+      end;
   end;
 end;
 
@@ -784,11 +793,26 @@ begin
   FTextEditor.ShowModal;
 end;
 
+procedure TInplaceEditorLink.EditWndProc(var Message: TMessage);
+begin
+  case Message.Msg of
+    WM_CHAR:
+      if not (TWMChar(Message).CharCode in [VK_ESCAPE, VK_TAB]) then
+        FOldWndProc(Message);
+    WM_GETDLGCODE:
+      Message.Result := Message.Result or DLGC_WANTARROWS or DLGC_WANTALLKEYS or DLGC_WANTTAB;
+  else
+    FOldWndProc(Message);
+  end;
+end;
+
 function TInplaceEditorLink.PrepareEdit(Tree: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex): Boolean;
 var
   NodeText: widestring;
 begin
+  Result := not FStopping;
+  if not Result then Exit; 
   FNode := Node;
   FColumn := Column;
 
@@ -878,18 +902,4 @@ begin
   CalcEditorPosition;
 end;
 
-{ TInplaceTntEdit }
-
-procedure TInplaceTntEdit.WMChar(var Message: TWMChar);
-begin
-  if not (Message.CharCode in [VK_ESCAPE, VK_TAB]) then
-    inherited;
-end;
-
-procedure TInplaceTntEdit.WMGetDlgCode(var Message: TWMGetDlgCode);
-begin
-  inherited;
-  Message.Result := Message.Result or DLGC_WANTALLKEYS or DLGC_WANTTAB or DLGC_WANTARROWS;
-end;
-
 end.