opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #937 and #1107:

Browse Source 
* be sure ActiveGridEditor is nil before and after editing, and check for that nil value
* in TBaseGridEditorLink.Destroy constructor, call its parent at the end, not at the beginning, so some members stay accessible until the end
* prefer to check with Tree.CanEdit
* change the way how editing starts in a tabbed cell
This commit is contained in:
Ansgar Becker
2020-08-05 08:42:37 +02:00
parent 76aaf87216
commit 983efa2b3b
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/grideditlinks.pas
View File

@@ -217,7 +217,7 @@ type
var
ActiveGridEditor: TBaseGridEditorLink;
ActiveGridEditor: TBaseGridEditorLink=nil;
implementation
@@ -272,8 +272,9 @@ var
NewNode: PVirtualNode;
DoPrev: Boolean;
begin
inherited;
ActiveGridEditor := nil;
FMainControl.WindowProc := FOldWindowProc;
FMainControl := nil;
if FLastKeyDown = VK_TAB then begin
DoPrev := ssShift in FLastShiftState;
// Advance to next/previous visible column/node.
@@ -288,23 +289,25 @@ begin
NewColumn := LastCol;
NewNode := FTree.GetPreviousVisible(NewNode);
end else
NewColumn := FTree.Header.Columns.GetPreviousColumn(NewColumn);
NewColumn := FTree.Header.Columns.GetPreviousVisibleColumn(NewColumn);
end else begin
if NewColumn = LastCol then begin
NewColumn := FirstCol;
NewNode := FTree.GetNextVisible(NewNode);
end else
NewColumn := FTree.Header.Columns.GetNextColumn(NewColumn);
NewColumn := FTree.Header.Columns.GetNextVisibleColumn(NewColumn);
end;
if not Assigned(NewNode) then
Break;
FTree.FocusedNode := NewNode;
FTree.FocusedColumn := NewColumn;
if not FTree.EditNode(FTree.FocusedNode, FTree.FocusedColumn) then
FTree.SetFocus;
if not FTree.CanEdit(NewNode, NewColumn) then
Continue;
FTree.ClearSelection;
FTree.Selected[NewNode] := True;
FTree.EditNode(NewNode, NewColumn);
Break;
end;
end;
inherited;
end;
function TBaseGridEditorLink.PrepareEdit(Tree: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex): Boolean;
@@ -384,7 +387,7 @@ end;
procedure TBaseGridEditorLink.ProcessMessage(var Message: TMessage);
begin
if Assigned(FMainControl) then
if (FMainControl <> nil) and FMainControl.HandleAllocated then
FMainControl.WindowProc(Message);
end;

2
source/main.pas
View File

@@ -5834,7 +5834,7 @@ end;
procedure TMainForm.PageControlMainChanging(Sender: TObject; var AllowChange: Boolean);
begin
// Leave editing mode on tab changes so the editor does not stay somewhere
if Assigned(ActiveGridEditor)
if (ActiveGridEditor <> nil)
and Assigned(ActiveGridEditor.Tree)
and ActiveGridEditor.Tree.IsEditing then begin
LogSQL('Cancelling tree edit mode on '+ActiveGridEditor.Tree.Name, lcDebug);