Skip to content

Fix for issue 663 (Exception pressing return after changing tree-item with no columns) #665

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 4 commits into from
Oct 7, 2016
Merged

Fix for issue 663 (Exception pressing return after changing tree-item with no columns) #665

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
780a909
Merge remote-tracking branch 'refs/remotes/Virtual-TreeView/master'
Sep 25, 2016
1305a1f
Merge remote-tracking branch 'refs/remotes/Virtual-TreeView/master'
Sep 25, 2016
2a0219c
Merge remote-tracking branch 'refs/remotes/origin/master' into Virtua…
Oct 4, 2016
a21a18a
Fixed bug in issue 663 (Exception pressing return on an edited item w…
whookie1 Oct 6, 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
21 changes: 11 additions & 10 deletions Source/VirtualTrees.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32861,17 +32861,18 @@ procedure TVTEdit.WMKeyDown(var Message: TWMKeyDown);

// 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;
EditOptions := Tree.TreeOptions.EditOptions; // default
ColumnCandidate := -1;
if Tree.Header.Columns.Count > 0 then // are there any columns?
begin
Column := Tree.Header.Columns[Tree.FocusedColumn];
if Column.EditOptions <> toDefaultEdit then
EditOptions := Column.EditOptions;

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

case EditOptions of
toDefaultEdit: Tree.SetFocus;
Expand Down