Skip to content

New option to set the way of selecting next cell for editing, minor fix to prevent AV #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 31, 2016
Merged

New option to set the way of selecting next cell for editing, minor fix to prevent AV #647

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c1627d
Fix for AV
maciej-izak Aug 29, 2016
795f982
New feature to set the way of selecting next cells for editing
maciej-izak Aug 29, 2016
06b7d58
Add comments for latest changes (new TVTEditOptions and for small fix).
maciej-izak Aug 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 87 additions & 4 deletions Source/VirtualTrees.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,12 @@ TCheckStateHelper = record helper for TCheckState
);
TVTSelectionOptions = set of TVTSelectionOption;

TVTEditOptions = (
toDefaultEdit, // Standard behaviour for end of editing (after VK_RETURN stay on edited cell).
toVerticalEdit, // After VK_RETURN switch to next column.
toHorizontalEdit // After VK_RETURN switch to next row.
);

// Options which do not fit into any of the other groups:
TVTMiscOption = (
toAcceptOLEDrop, // Register tree as OLE accepting drop target
Expand Down Expand Up @@ -599,6 +605,7 @@ TCustomVirtualTreeOptions = class(TPersistent)
FSelectionOptions: TVTSelectionOptions;
FMiscOptions: TVTMiscOptions;
FExportMode: TVTExportMode;
FEditOptions: TVTEditOptions;
procedure SetAnimationOptions(const Value: TVTAnimationOptions);
procedure SetAutoOptions(const Value: TVTAutoOptions);
procedure SetMiscOptions(const Value: TVTMiscOptions);
Expand All @@ -614,6 +621,7 @@ TCustomVirtualTreeOptions = class(TPersistent)
property MiscOptions: TVTMiscOptions read FMiscOptions write SetMiscOptions default DefaultMiscOptions;
property PaintOptions: TVTPaintOptions read FPaintOptions write SetPaintOptions default DefaultPaintOptions;
property SelectionOptions: TVTSelectionOptions read FSelectionOptions write SetSelectionOptions default DefaultSelectionOptions;
property EditOptions: TVTEditOptions read FEditOptions write FEditOptions;

property Owner: TBaseVirtualTree read FOwner;
end;
Expand Down Expand Up @@ -966,6 +974,8 @@ TVirtualTreeColumn = class(TCollectionItem)
FMargin,
FSpacing: Integer;
FOptions: TVTColumnOptions;
FEditOptions: TVTEditOptions;
FEditNextColumn: Integer;
FTag: NativeInt;
FAlignment: TAlignment;
FCaptionAlignment: TAlignment; // Alignment of the caption.
Expand Down Expand Up @@ -1052,6 +1062,8 @@ TVirtualTreeColumn = class(TCollectionItem)
property MaxWidth: Integer read FMaxWidth write SetMaxWidth default 10000;
property MinWidth: Integer read FMinWidth write SetMinWidth default 10;
property Options: TVTColumnOptions read FOptions write SetOptions default DefaultColumnOptions;
property EditOptions: TVTEditOptions read FEditOptions write FEditOptions default toDefaultEdit;
property EditNextColumn: Integer read FEditNextColumn write FEditNextColumn default -1;
property Position: TColumnPosition read FPosition write SetPosition;
property Spacing: Integer read FSpacing write SetSpacing default 3;
property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText;
Expand Down Expand Up @@ -3199,6 +3211,7 @@ TStringTreeOptions = class(TCustomStringTreeOptions)
property PaintOptions;
property SelectionOptions;
property StringOptions;
property EditOptions;
end;

TCustomVirtualStringTree = class;
Expand Down Expand Up @@ -6710,6 +6723,7 @@ constructor TVirtualTreeColumn.Create(Collection: TCollection);
FCheckBox := False;
FHasImage := False;
FDefaultSortDirection := sdAscending;
fEditNextColumn := -1;

inherited Create(Collection);

Expand Down Expand Up @@ -7651,6 +7665,8 @@ procedure TVirtualTreeColumn.Assign(Source: TPersistent);
CaptionAlignment := TVirtualTreeColumn(Source).CaptionAlignment;
Color := TVirtualTreeColumn(Source).Color;
Tag := TVirtualTreeColumn(Source).Tag;
EditOptions := TVirtualTreeColumn(Source).EditOptions;
EditNextColumn := TVirtualTreeColumn(Source).EditNextColumn;

// Order is important. Assign options last.
FOptions := OldOptions;
Expand Down Expand Up @@ -32682,7 +32698,10 @@ procedure TCustomStringTreeOptions.AssignTo(Dest: TPersistent);
if Dest is TCustomStringTreeOptions then
begin
with Dest as TCustomStringTreeOptions do
begin
StringOptions := Self.StringOptions;
EditOptions := Self.EditOptions;
end;
end;

// Let ancestors assign their options to the destination class.
Expand Down Expand Up @@ -32801,6 +32820,9 @@ procedure TVTEdit.WMKeyDown(var Message: TWMKeyDown);
EndEdit: Boolean;
Tree: TBaseVirtualTree;
NextNode: PVirtualNode;
ColumnCandidate: Integer;
EditOptions: TVTEditOptions;
Column: TVirtualTreeColumn;
begin
Tree := FLink.FTree;
case Message.CharCode of
Expand All @@ -32823,8 +32845,65 @@ procedure TVTEdit.WMKeyDown(var Message: TWMKeyDown);
begin
Tree := FLink.FTree;
FLink.FTree.InvalidateNode(FLink.FNode);
NextNode := Tree.GetNextVisible(FLink.FNode, True);
FLink.FTree.DoEndEdit;
Tree.SetFocus;

// get edit options for column as priority. If column has toDefaultEdit
// use global edit options for tree
Column := Tree.Header.Columns[Tree.FocusedColumn];
if Column.EditOptions <> toDefaultEdit then
EditOptions := Column.EditOptions
else
EditOptions := Tree.TreeOptions.EditOptions;

// next column candidate for toVerticalEdit and toHorizontalEdit
if Column.EditNextColumn <> -1 then
ColumnCandidate := Column.EditNextColumn
else
ColumnCandidate := -1;

case EditOptions of
toDefaultEdit: Tree.SetFocus;
toVerticalEdit:
if NextNode <> nil then
begin
Tree.FocusedNode := NextNode;

// for toVerticalEdit ColumnCandidate is also proper,
// select ColumnCandidate column in row below
if ColumnCandidate <> -1 then
begin
Tree.FocusedColumn := ColumnCandidate;
Tree.EditColumn := ColumnCandidate;
end;

if Tree.CanEdit(Tree.FocusedNode, Tree.FocusedColumn) then
Tree.DoEdit;
end;
toHorizontalEdit:
begin
if ColumnCandidate = -1 then
begin
// for toHorizontalEdit if property EditNextColumn is not used
// try to use just next column
ColumnCandidate := Tree.FocusedColumn+1;
while (ColumnCandidate < Tree.Header.Columns.Count)
and not Tree.CanEdit(Tree.FocusedNode, ColumnCandidate)
do
Inc(ColumnCandidate);
end
else
if not Tree.CanEdit(Tree.FocusedNode, ColumnCandidate) then
ColumnCandidate := Tree.Header.Columns.Count; // omit "focus/edit column" (see below)

if ColumnCandidate < Tree.Header.Columns.Count then
begin
Tree.FocusedColumn := ColumnCandidate;
Tree.EditColumn := ColumnCandidate;
Tree.DoEdit;
end;
end;
end;
end;
end;
VK_UP:
Expand All @@ -32846,9 +32925,13 @@ procedure TVTEdit.WMKeyDown(var Message: TWMKeyDown);
Tree.InvalidateNode(FLink.FNode);
NextNode := Tree.GetNextVisible(FLink.FNode, True);
Tree.EndEditNode;
Tree.FocusedNode := NextNode;
if Tree.CanEdit(Tree.FocusedNode, Tree.FocusedColumn) then
Tree.DoEdit;
// check NextNode, otherwise we got AV
if NextNode <> nil then
begin
Tree.FocusedNode := NextNode;
if Tree.CanEdit(Tree.FocusedNode, Tree.FocusedColumn) then
Tree.DoEdit;
end;
end;
end;
Ord('A'):
Expand Down