fix: do not edit grid cell on right-click, and set HotCursor on DBtree

ansgarbecker · ansgarbecker · commit 0257867dff77 · 2025-12-03T12:12:39.000+01:00
diff --git a/source/main.lfm b/source/main.lfm
@@ -945,6 +945,7 @@ object MainForm: TMainForm
         Constraints.MinHeight = 40
         Constraints.MinWidth = 40
         DefaultText = 'Node'
+        DragMode = dmAutomatic
         Header.AutoSizeIndex = 0
         Header.Columns = <        
           item
@@ -959,13 +960,15 @@ object MainForm: TMainForm
           end>
         Header.Options = [hoAutoResize, hoColumnResize, hoDrag]
         HintMode = hmTooltip
+        HotCursor = crHandPoint
         Images = ImageListMain
         IncrementalSearch = isInitializedOnly
         ParentShowHint = False
         PopupMenu = popupDB
         ShowHint = True
         TabOrder = 3
-        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toGhostedIfUnfocused, toUseExplorerTheme]
+        TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoSort, toAutoTristateTracking, toAutoHideButtons, toAutoDeleteMovedNodes, toAutoChangeScale]
+        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toGhostedIfUnfocused, toUseExplorerTheme]
         TreeOptions.SelectionOptions = [toFullRowSelect, toRightClickSelect]
         OnAfterCellPaint = DBtreeAfterCellPaint
         OnBeforeCellPaint = DBtreeBeforeCellPaint
diff --git a/source/main.pas b/source/main.pas
@@ -1216,6 +1216,7 @@   TMainForm = class(TExtForm)
     FLastMouseUpOnPageControl: Cardinal;
     FLastTabNumberOnMouseUp: Integer;
     FLastMouseDownCloseButton: TObject;
+    FLastMouseButtonUpOnGrid: TMouseButton;
     //FJumpList: TJumpList;
     // Filter text per tab for filter panel
     FFilterTextDatabases,
@@ -2133,6 +2134,7 @@ procedure TMainForm.FormCreate(Sender: TObject);
   // Set noderoot for query helpers box
   treeQueryHelpers.RootNodeCount := 7;
 
+  FLastMouseButtonUpOnGrid := mbLeft;
   FLastCaptionChange := 0;
   FLastPortableSettingsSave := 0;
   FLastAppSettingsWrites := 0;
@@ -10784,6 +10786,9 @@ procedure TMainForm.AnyGridEditing(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Column: TColumnIndex; var Allowed: Boolean);
 begin
   Allowed := False;
+  // Do not edit on right-click
+  if FLastMouseButtonUpOnGrid = mbRight then
+    Exit;
   try
     if not AnyGridEnsureFullRow(Sender as TVirtualStringTree, Node) then
       ErrorDialog(_('Could not load full row data.'))
@@ -11315,6 +11320,7 @@ procedure TMainForm.AnyGridMouseUp(Sender: TObject; Button: TMouseButton;
   Hit: THitInfo;
   Results: TDBQuery;
 begin
+  FLastMouseButtonUpOnGrid := Button;
   // Detect mouse hit in grid whitespace and apply changes.
   Grid := Sender as TVirtualStringTree;
   if not Assigned(Grid.FocusedNode) then
