Skip to content

Commit b09823e

Browse files
committed
fix: remove column nodes from tree in table tools dialog
Refs #2563 and #2069
1 parent f492bed commit b09823e

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

source/main.pas

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ implementation
14791479
FileInfo, winpeimagereader, elfreader, machoreader, About, data_sorting, column_selection, loaddata, editvar,
14801480
copytable, csv_detector, exportgrid, usermanager, rolemanagerpg, reformatter, connections, sqlhelp, updatecheck,
14811481
insertfiles, texteditor, preferences, table_editor, view, routine_editor, trigger_editor, event_editor, grideditlinks,
1482-
crashdialog;
1482+
crashdialog, selectdbobject;
14831483

14841484
{$R *.lfm}
14851485

@@ -9850,10 +9850,17 @@ procedure TMainForm.DBtreeInitNode(Sender: TBaseVirtualTree; ParentNode, Node:
98509850
Columns: TTableColumnList;
98519851

98529852
function TreeShowColumns: Boolean;
9853+
var f: TWinControl;
98539854
begin
9854-
Result := Item.NodeType = lntTable;
9855-
if Sender = DBtree then // optional in dbtree
9856-
Result := actTreeShowColumns.Checked;
9855+
Result := False;
9856+
if Item.NodeType = lntTable then begin
9857+
if Sender = DBtree then // optional in dbtree
9858+
Result := actTreeShowColumns.Checked
9859+
else begin
9860+
f := GetParentFormOrFrame(Sender);
9861+
Result := Assigned(f) and (f is TfrmSelectDBObject);
9862+
end;
9863+
end;
98579864
end;
98589865

98599866
begin

0 commit comments

Comments
 (0)