From 2e9533f22630fcafc6697f8b5349a843b05ed16d Mon Sep 17 00:00:00 2001 From: blikblum Date: Wed, 30 Dec 2009 11:51:07 +0000 Subject: [PATCH] * Call PrepareDrag in non windows * Dont offset the Start point in PrepareDrag * Add some logger call to debug header dragging git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1099 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/virtualtreeview-new/trunk/VirtualTrees.pas | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/virtualtreeview-new/trunk/VirtualTrees.pas b/components/virtualtreeview-new/trunk/VirtualTrees.pas index 9353bb539..4b0574693 100644 --- a/components/virtualtreeview-new/trunk/VirtualTrees.pas +++ b/components/virtualtreeview-new/trunk/VirtualTrees.pas @@ -9638,9 +9638,7 @@ begin if I > NoColumn then Invalidate(FColumns[I]); //todo: implement drag image under gtk - {$ifdef Windows} PrepareDrag(P, FDragStart); - {$endif} FStates := FStates - [hsDragPending] + [hsDragging]; HandleHeaderMouseMove := True; Result := 0; @@ -9909,11 +9907,16 @@ begin with TLMLButtonUp(Message) do P := Treeview.ClientToScreen(Point(XPos, YPos)); GetWindowRect(Treeview.Handle, R); + Logger.Send([lcDrag],'Header - EndDrag / R',R); with FColumns do begin + Logger.Send([lcDrag],'Header - EndDrag / FDropTarget: %d FDragIndex: %d FDragIndexPosition: %d', + [FDropTarget, FDragIndex, FColumns[FDragIndex].Position]); + Logger.Send([lcDrag],'Header - EndDrag / FDropBefore', FColumns.FDropBefore); FDragImage.EndDrag; if (FDropTarget > -1) and (FDropTarget <> FDragIndex) and PtInRect(R, P) then begin + Logger.Send([lcDrag],'Header - EndDrag / FDropTargetPosition', FColumns[FDropTarget].Position); OldPosition := FColumns[FDragIndex].Position; if FColumns.FDropBefore then begin @@ -10132,7 +10135,6 @@ begin // Determine initial position of drag image (screen coordinates). FColumns.FDropTarget := NoColumn; Start := Treeview.ScreenToClient(Start); - Inc(Start.Y, FHeight); FColumns.FDragIndex := FColumns.ColumnFromPosition(Start); DragColumn := FColumns[FColumns.FDragIndex];