Merge branch 'master' of https://github.com/JAM-Software/Virtual-TreeView

Author: Joachim Marder

Source/VirtualTrees.BaseTree.pas

@@ -7545,7 +7545,7 @@ procedure TBaseVirtualTree.WMNCDestroy(var Message: TWMNCDestroy);
   StopTimer(ChangeTimer);
   StopTimer(StructureChangeTimer);
 
-  if not (csDesigning in ComponentState) and (toAcceptOLEDrop in FOptions.MiscOptions) and HandleAllocated then
+  if not (csDesigning in ComponentState) and HandleAllocated then
     RevokeDragDrop(Handle);
 
   inherited;
@@ -8729,9 +8729,8 @@ procedure TBaseVirtualTree.CreateWnd;
   PrepareBitmaps(True, True);
 
   // Register tree as OLE drop target.
-  if not (csDesigning in ComponentState) and (toAcceptOLEDrop in FOptions.MiscOptions) then
-    if not (csLoading in ComponentState) then // will be done in Loaded after all inherited settings are loaded from the DFMs
-      RegisterDragDrop(Handle, DragManager as IDropTarget);
+  if not (csDesigning in ComponentState) and not (csLoading in ComponentState) then // will be done in Loaded after all inherited settings are loaded from the DFMs
+    RegisterDragDrop(Handle, DragManager as IDropTarget);
 
   UpdateScrollBars(True);
   UpdateHeaderRect;
@@ -11222,6 +11221,12 @@ function TBaseVirtualTree.DragEnter(KeyState: Integer; Pt: TPoint; var Effect: I
 
 begin
   try
+    if not (toAcceptOLEDrop in TreeOptions.MiscOptions) then
+    begin
+      Effect := DROPEFFECT_NONE;
+      Exit(NOERROR);
+    end;
+
     // Determine acceptance of drag operation and reset scroll start time.
     FDragScrollStart := 0;
 
@@ -13484,9 +13489,8 @@ procedure TBaseVirtualTree.Loaded;
   inherited;
 
   // Call RegisterDragDrop after all visual inheritance changes to MiscOptions have been applied.
-  if not (csDesigning in ComponentState) and (toAcceptOLEDrop in FOptions.MiscOptions) then
-    if HandleAllocated then
-      RegisterDragDrop(Handle, DragManager as IDropTarget);
+  if not (csDesigning in ComponentState) and HandleAllocated then
+    RegisterDragDrop(Handle, DragManager as IDropTarget);
 
   // If a root node count has been set during load of the tree then update its child structure now
   // as this hasn't been done yet in this case.

Source/VirtualTrees.DragnDrop.pas

@@ -259,7 +259,7 @@ function TVTDragManager.DragEnter(const DataObject : IDataObject; KeyState : Int
     LockWindowUpdate(0);
   if Assigned(FDropTargetHelper) and FFullDragging then
   begin
-    if toAutoScroll in TreeView.TreeOptions.AutoOptions then
+    if (toAutoScroll in TreeView.TreeOptions.AutoOptions) and (toAcceptOLEDrop in TreeView.TreeOptions.MiscOptions) then
       FDropTargetHelper.DragEnter(FOwner.Handle, DataObject, Pt, Effect)
     else
       FDropTargetHelper.DragEnter(0, DataObject, Pt, Effect); // Do not pass handle, otherwise the IDropTargetHelper will perform autoscroll. Issue #486
@@ -286,7 +286,8 @@ function TVTDragManager.DragLeave : HResult;
   if Assigned(FDropTargetHelper) and FFullDragging then
     FDropTargetHelper.DragLeave;
 
-  TreeView.DragLeave;
+  if (toAcceptOLEDrop in TreeView.TreeOptions.MiscOptions) then
+    TreeView.DragLeave;
   FIsDropTarget := False;
   FDragSource := nil;
   FDataObject := nil;
@@ -301,12 +302,12 @@ function TVTDragManager.DragOver(KeyState : Integer; Pt : TPoint; var Effect : I
   if Assigned(FDropTargetHelper) and FFullDragging then
     FDropTargetHelper.DragOver(Pt, Effect);
 
+  Result := NOERROR;
   if Assigned(fHeader) then
   begin
     TreeView.Header.DragTo(Pt);
-    Result := NOERROR;
   end
-  else
+  else if (toAcceptOLEDrop in TreeView.TreeOptions.MiscOptions) then       
     Result := TreeView.DragOver(FDragSource, KeyState, dsDragMove, Pt, Effect);
 end;
 

Source/VirtualTrees.Header.pas

@@ -2941,6 +2941,7 @@ function TVirtualTreeColumn.GetCaptionWidth : TDimension;
 
   PaintInfo.Column := Self;
   PaintInfo.TargetCanvas := Owner.HeaderBitmap.Canvas;
+  PaintInfo.TargetCanvas.Font := Header.Font;
 
   with PaintInfo, Column do
   begin

Source/VirtualTrees.Types.pas

@@ -1363,12 +1363,8 @@ procedure TCustomVirtualTreeOptions.SetMiscOptions(const Value : TVTMiscOptions)
 
         if not (csDesigning in ComponentState) then
         begin
-          if toAcceptOLEDrop in ToBeCleared then
-            RevokeDragDrop(Handle);
           if toFullRepaintOnResize in ToBeSet + ToBeCleared then
             RecreateWnd;
-          if toAcceptOLEDrop in ToBeSet then
-            RegisterDragDrop(Handle, DragManager as IDropTarget);
           if toVariableNodeHeight in ToBeSet then
           begin
             BeginUpdate();