* Synchronize with main VTV repository up to svn rev 183

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@830 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/virtualtreeview-new/VirtualTrees.pas

@@ -610,9 +610,8 @@ type
     ckFlat,           // flat images (no 3D border)
     ckXP,             // Windows XP style
     ckCustom,         // application defined check images
-    ckSystem,         // System defined check images.
     ckSystemFlat,     // Flat system defined check images.
-    ckSystemDefault   // Uses the system check images, theme aware
+    ckSystemDefault   // Uses the system check images, theme aware.
   );
 
   // mode to describe a move action
@@ -4022,7 +4021,6 @@ const
     'VT_FLAT',
     'VT_XP',
     '',//ckCustom,
-    '',//ckSystem,
     '',//ckSystemFlat
     '' //ckSystemDefault
      );
@@ -12968,13 +12966,6 @@ begin
   // A priori nothing changes.
   Result := False;
 
-  // If the old rectangle is empty then we just started the drag selection.
-  // So we just copy the new rectangle to the old and get out of here.
-  if (OldRect.Top < OldRect.Bottom) or (OldRect.Right < OldRect.Left) and
-     ((OldRect.Left <> OldRect.Right) or (OldRect.Top <> OldRect.Bottom)) then
-    OldRect := NewRect
-  else
-  begin
   // Determine minimum and maximum vertical coordinates to limit iteration to.
   MinY := Min(OldRect.Top, NewRect.Top);
   MaxY := Max(OldRect.Bottom, NewRect.Bottom);
@@ -13120,7 +13111,6 @@ begin
       Run := NextNode;
     until CurrentTop > MaxY;
   end;
-  end;
 end;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -13163,13 +13153,6 @@ begin
   // Switch the alignment to the opposite value in RTL context.
   ChangeBiDiModeAlignment(Alignment);
 
-  // If the old rectangle is empty then we just started the drag selection.
-  // So we just copy the new rectangle to the old and get out of here.
-  if (OldRect.Top < OldRect.Bottom) or (OldRect.Right < OldRect.Left) and
-     ((OldRect.Left <> OldRect.Right) or (OldRect.Top <> OldRect.Bottom)) then
-    OldRect := NewRect
-  else
-  begin
   // Determine minimum and maximum vertical coordinates to limit iteration to.
   MinY := Min(OldRect.Top, NewRect.Top);
   MaxY := Max(OldRect.Bottom, NewRect.Bottom);
@@ -13315,7 +13298,6 @@ begin
       Run := NextNode;
     until CurrentTop > MaxY;
   end;
-  end;
 end;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -21693,9 +21675,9 @@ begin
   begin
     FCheckImages := TBitmap.Create;
     case FCheckImageKind of
-      ckSystem:
+      ckSystemDefault:
         CreateSystemImageSet(FCheckImages, False);
-      ckSystemFlat, ckSystemDefault:
+      ckSystemFlat:
         CreateSystemImageSet(FCheckImages, True);
       else
         FCheckImages.TransparentColor := clDefault;
@@ -23399,7 +23381,8 @@ begin
           ClearSelection;
         end;
         DoStateChange([tsDrawSelecting], [tsDrawSelPending]);
-        // reset to main column for multiselection
+
+        // Reset to main column for multiselection.
         FocusedColumn := FHeader.MainColumn;
 
         // The current rectangle may already include some node captions. Handle this.
@@ -29573,10 +29556,8 @@ var
   {$endif}
   VAlign,
   IndentSize,
-  NodeLevel,
   ButtonX,
   ButtonY: Integer;
-  Run: PVirtualNode;
   LineImage: TLineImage;
   PaintInfo: TVTPaintInfo;     // all necessary information about a node to pass to the paint routines
 
@@ -33001,6 +32982,7 @@ var
   Alignment: TAlignment;
   PaintInfo: TVTPaintInfo;
   Dummy: TColumnIndex;
+  LineImage: TLineImage;
 
 begin
   if Length(S) = 0 then
@@ -33026,7 +33008,18 @@ begin
   PaintInfo.Column := Column;
   PaintInfo.CellRect := Rect(0, 0, 0, 0);
   if Column > NoColumn then
-    PaintInfo.CellRect.Right := FHeader.Columns[Column].Width
+	begin
+	  PaintInfo.CellRect.Right := FHeader.Columns[Column].Width - FTextMargin;
+	  PaintInfo.CellRect.Left := FTextMargin + FMargin;
+	  if Column = Header.MainColumn then
+	  begin
+	    if toFixedIndent in FOptions.FPaintOptions then
+	      SetLength(LineImage, 1)
+	    else
+	      DetermineLineImageAndSelectLevel(Node, LineImage);
+	    Inc(PaintInfo.CellRect.Left, Length(LineImage) * Integer(Indent));
+	  end;
+	end
   else
     PaintInfo.CellRect.Right := ClientWidth;
   AdjustPaintCellRect(PaintInfo, Dummy);