pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Synchronize with main VTV repository up to svn rev 183

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@830 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2009-06-08 19:11:22 +00:00
parent 48f19f547e
commit 2eb02a2179
1 changed files with 280 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

567
components/virtualtreeview-new/VirtualTrees.pas
View File

@ -610,9 +610,8 @@ type
ckFlat, // flat images (no 3D border) ckFlat, // flat images (no 3D border)
ckXP, // Windows XP style ckXP, // Windows XP style
ckCustom, // application defined check images ckCustom, // application defined check images
ckSystem, // System defined check images.
ckSystemFlat, // Flat 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 // mode to describe a move action
@ -4022,7 +4021,6 @@ const
'VT_FLAT', 'VT_FLAT',
'VT_XP', 'VT_XP',
'',//ckCustom, '',//ckCustom,
'',//ckSystem,
'',//ckSystemFlat '',//ckSystemFlat
'' //ckSystemDefault '' //ckSystemDefault
); );
@ -12968,158 +12966,150 @@ begin
// A priori nothing changes. // A priori nothing changes.
Result := False; Result := False;
// If the old rectangle is empty then we just started the drag selection. // Determine minimum and maximum vertical coordinates to limit iteration to.
// So we just copy the new rectangle to the old and get out of here. MinY := Min(OldRect.Top, NewRect.Top);
if (OldRect.Top < OldRect.Bottom) or (OldRect.Right < OldRect.Left) and MaxY := Max(OldRect.Bottom, NewRect.Bottom);
((OldRect.Left <> OldRect.Right) or (OldRect.Top <> OldRect.Bottom)) then
OldRect := NewRect // Initialize short hand variables to speed up tests below.
DoSwitch := ssCtrl in FDrawSelShiftState;
WithCheck := (toCheckSupport in FOptions.FMiscOptions) and Assigned(FCheckImages);
// Don't check the events here as descendant trees might have overriden the DoGetImageIndex method.
WithImages := Assigned(FImages);
if WithImages then
ImageOffset := FImages.Width + 2
else else
ImageOffset := 0;
WithStateImages := Assigned(FStateImages);
if WithStateImages then
StateImageOffset := FStateImages.Width + 2
else
StateImageOffset := 0;
if WithCheck then
CheckOffset := FCheckImages.Height + 2
else
CheckOffset := 0;
AutoSpan := FHeader.UseColumns and (toAutoSpanColumns in FOptions.FAutoOptions);
SimpleSelection := toSimpleDrawSelection in FOptions.FSelectionOptions;
// This is the node to start with.
Run := GetNodeAt(0, MinY, False, CurrentTop);
if Assigned(Run) then
begin begin
// Determine minimum and maximum vertical coordinates to limit iteration to. // The initial minimal left border is determined by the identation level of the node and is dynamically adjusted.
MinY := Min(OldRect.Top, NewRect.Top); if toShowRoot in FOptions.FPaintOptions then
MaxY := Max(OldRect.Bottom, NewRect.Bottom); Inc(NodeLeft, Integer((GetNodeLevel(Run) + 1) * FIndent) + FMargin)
// Initialize short hand variables to speed up tests below.
DoSwitch := ssCtrl in FDrawSelShiftState;
WithCheck := (toCheckSupport in FOptions.FMiscOptions) and Assigned(FCheckImages);
// Don't check the events here as descendant trees might have overriden the DoGetImageIndex method.
WithImages := Assigned(FImages);
if WithImages then
ImageOffset := FImages.Width + 2
else else
ImageOffset := 0; Inc(NodeLeft, Integer(GetNodeLevel(Run) * FIndent) + FMargin);
WithStateImages := Assigned(FStateImages);
if WithStateImages then
StateImageOffset := FStateImages.Width + 2
else
StateImageOffset := 0;
if WithCheck then
CheckOffset := FCheckImages.Height + 2
else
CheckOffset := 0;
AutoSpan := FHeader.UseColumns and (toAutoSpanColumns in FOptions.FAutoOptions);
SimpleSelection := toSimpleDrawSelection in FOptions.FSelectionOptions;
// This is the node to start with. // ----- main loop
Run := GetNodeAt(0, MinY, False, CurrentTop); // Change selection depending on the node's rectangle being in the selection rectangle or not, but
// touch only those nodes which overlap either the old selection rectangle or the new one but not both.
repeat
// Collect offsets for check, normal and state images.
TextLeft := NodeLeft;
if WithCheck and (Run.CheckType <> ctNone) then
Inc(TextLeft, CheckOffset);
if WithImages and HasImage(Run, ikNormal, MainColumn) then
Inc(TextLeft, ImageOffset);
if WithStateImages and HasImage(Run, ikState, MainColumn) then
Inc(TextLeft, StateImageOffset);
if Assigned(Run) then // Ensure the node's height is determined.
begin MeasureItemHeight(Canvas, Run);
// The initial minimal left border is determined by the identation level of the node and is dynamically adjusted.
if toShowRoot in FOptions.FPaintOptions then NextTop := CurrentTop + Integer(NodeHeight[Run]);
Inc(NodeLeft, Integer((GetNodeLevel(Run) + 1) * FIndent) + FMargin)
// Simple selection allows to draw the selection rectangle anywhere. No intersection with node captions is
// required. Only top and bottom bounds of the rectangle matter.
if SimpleSelection then
begin
IsInOldRect := (NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end
else else
Inc(NodeLeft, Integer(GetNodeLevel(Run) * FIndent) + FMargin); begin
// The right column border might be extended if column spanning is enabled.
// ----- main loop if AutoSpan then
// Change selection depending on the node's rectangle being in the selection rectangle or not, but
// touch only those nodes which overlap either the old selection rectangle or the new one but not both.
repeat
// Collect offsets for check, normal and state images.
TextLeft := NodeLeft;
if WithCheck and (Run.CheckType <> ctNone) then
Inc(TextLeft, CheckOffset);
if WithImages and HasImage(Run, ikNormal, MainColumn) then
Inc(TextLeft, ImageOffset);
if WithStateImages and HasImage(Run, ikState, MainColumn) then
Inc(TextLeft, StateImageOffset);
// Ensure the node's height is determined.
MeasureItemHeight(Canvas, Run);
NextTop := CurrentTop + Integer(NodeHeight[Run]);
// Simple selection allows to draw the selection rectangle anywhere. No intersection with node captions is
// required. Only top and bottom bounds of the rectangle matter.
if SimpleSelection then
begin begin
IsInOldRect := (NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom); with FHeader.FColumns do
IsInNewRect := (NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom); begin
NextColumn := MainColumn;
repeat
Dummy := GetNextVisibleColumn(NextColumn);
if (Dummy = InvalidColumn) or not ColumnIsEmpty(Run, Dummy) or
(Items[Dummy].BidiMode <> bdLeftToRight) then
Break;
NextColumn := Dummy;
until False;
if NextColumn = MainColumn then
CurrentRight := NodeRight
else
GetColumnBounds(NextColumn, Dummy, CurrentRight);
end;
end
else
CurrentRight := NodeRight;
// Check if we need the node's width. This is the case when the node is not left aligned or the
// left border of the selection rectangle is to the right of the left node border.
if (TextLeft < OldRect.Left) or (TextLeft < NewRect.Left) or (Alignment <> taLeftJustify) then
begin
NodeWidth := DoGetNodeWidth(Run, MainColumn);
if NodeWidth >= (CurrentRight - TextLeft) then
TextRight := CurrentRight
else
case Alignment of
taLeftJustify:
TextRight := TextLeft + NodeWidth;
taCenter:
begin
TextLeft := (TextLeft + CurrentRight - NodeWidth) div 2;
TextRight := TextLeft + NodeWidth;
end;
else
// taRightJustify
TextRight := CurrentRight;
TextLeft := TextRight - NodeWidth;
end;
end
else
TextRight := CurrentRight;
// Now determine whether we need to change the state.
IsInOldRect := (OldRect.Left <= TextRight) and (OldRect.Right >= TextLeft) and
(NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NewRect.Left <= TextRight) and (NewRect.Right >= TextLeft) and
(NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end;
if IsInOldRect xor IsInNewRect then
begin
Result := True;
if DoSwitch then
begin
if vsSelected in Run.States then
InternalRemoveFromSelection(Run)
else
InternalCacheNode(Run);
end end
else else
begin begin
// The right column border might be extended if column spanning is enabled. if IsInNewRect then
if AutoSpan then InternalCacheNode(Run)
begin
with FHeader.FColumns do
begin
NextColumn := MainColumn;
repeat
Dummy := GetNextVisibleColumn(NextColumn);
if (Dummy = InvalidColumn) or not ColumnIsEmpty(Run, Dummy) or
(Items[Dummy].BidiMode <> bdLeftToRight) then
Break;
NextColumn := Dummy;
until False;
if NextColumn = MainColumn then
CurrentRight := NodeRight
else
GetColumnBounds(NextColumn, Dummy, CurrentRight);
end;
end
else else
CurrentRight := NodeRight; InternalRemoveFromSelection(Run);
// Check if we need the node's width. This is the case when the node is not left aligned or the
// left border of the selection rectangle is to the right of the left node border.
if (TextLeft < OldRect.Left) or (TextLeft < NewRect.Left) or (Alignment <> taLeftJustify) then
begin
NodeWidth := DoGetNodeWidth(Run, MainColumn);
if NodeWidth >= (CurrentRight - TextLeft) then
TextRight := CurrentRight
else
case Alignment of
taLeftJustify:
TextRight := TextLeft + NodeWidth;
taCenter:
begin
TextLeft := (TextLeft + CurrentRight - NodeWidth) div 2;
TextRight := TextLeft + NodeWidth;
end;
else
// taRightJustify
TextRight := CurrentRight;
TextLeft := TextRight - NodeWidth;
end;
end
else
TextRight := CurrentRight;
// Now determine whether we need to change the state.
IsInOldRect := (OldRect.Left <= TextRight) and (OldRect.Right >= TextLeft) and
(NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NewRect.Left <= TextRight) and (NewRect.Right >= TextLeft) and
(NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end; end;
end;
if IsInOldRect xor IsInNewRect then CurrentTop := NextTop;
begin // Get next visible node and update left node position.
Result := True; NextNode := GetNextVisibleNoInit(Run, True);
if DoSwitch then if NextNode = nil then
begin Break;
if vsSelected in Run.States then Inc(NodeLeft, CountLevelDifference(Run, NextNode) * Integer(FIndent));
InternalRemoveFromSelection(Run) Run := NextNode;
else until CurrentTop > MaxY;
InternalCacheNode(Run);
end
else
begin
if IsInNewRect then
InternalCacheNode(Run)
else
InternalRemoveFromSelection(Run);
end;
end;
CurrentTop := NextTop;
// Get next visible node and update left node position.
NextNode := GetNextVisibleNoInit(Run, True);
if NextNode = nil then
Break;
Inc(NodeLeft, CountLevelDifference(Run, NextNode) * Integer(FIndent));
Run := NextNode;
until CurrentTop > MaxY;
end;
end; end;
end; end;
@ -13163,158 +13153,150 @@ begin
// Switch the alignment to the opposite value in RTL context. // Switch the alignment to the opposite value in RTL context.
ChangeBiDiModeAlignment(Alignment); ChangeBiDiModeAlignment(Alignment);
// If the old rectangle is empty then we just started the drag selection. // Determine minimum and maximum vertical coordinates to limit iteration to.
// So we just copy the new rectangle to the old and get out of here. MinY := Min(OldRect.Top, NewRect.Top);
if (OldRect.Top < OldRect.Bottom) or (OldRect.Right < OldRect.Left) and MaxY := Max(OldRect.Bottom, NewRect.Bottom);
((OldRect.Left <> OldRect.Right) or (OldRect.Top <> OldRect.Bottom)) then
OldRect := NewRect // Initialize short hand variables to speed up tests below.
DoSwitch := ssCtrl in FDrawSelShiftState;
WithCheck := (toCheckSupport in FOptions.FMiscOptions) and Assigned(FCheckImages);
// Don't check the events here as descendant trees might have overriden the DoGetImageIndex method.
WithImages := Assigned(FImages);
if WithImages then
ImageOffset := FImages.Width + 2
else else
ImageOffset := 0;
WithStateImages := Assigned(FStateImages);
if WithStateImages then
StateImageOffset := FStateImages.Width + 2
else
StateImageOffset := 0;
if WithCheck then
CheckOffset := FCheckImages.Height + 2
else
CheckOffset := 0;
AutoSpan := FHeader.UseColumns and (toAutoSpanColumns in FOptions.FAutoOptions);
SimpleSelection := toSimpleDrawSelection in FOptions.FSelectionOptions;
// This is the node to start with.
Run := GetNodeAt(0, MinY, False, CurrentTop);
if Assigned(Run) then
begin begin
// Determine minimum and maximum vertical coordinates to limit iteration to. // The initial minimal left border is determined by the identation level of the node and is dynamically adjusted.
MinY := Min(OldRect.Top, NewRect.Top); if toShowRoot in FOptions.FPaintOptions then
MaxY := Max(OldRect.Bottom, NewRect.Bottom); Dec(NodeRight, Integer((GetNodeLevel(Run) + 1) * FIndent) + FMargin)
// Initialize short hand variables to speed up tests below.
DoSwitch := ssCtrl in FDrawSelShiftState;
WithCheck := (toCheckSupport in FOptions.FMiscOptions) and Assigned(FCheckImages);
// Don't check the events here as descendant trees might have overriden the DoGetImageIndex method.
WithImages := Assigned(FImages);
if WithImages then
ImageOffset := FImages.Width + 2
else else
ImageOffset := 0; Dec(NodeRight, Integer(GetNodeLevel(Run) * FIndent) + FMargin);
WithStateImages := Assigned(FStateImages);
if WithStateImages then
StateImageOffset := FStateImages.Width + 2
else
StateImageOffset := 0;
if WithCheck then
CheckOffset := FCheckImages.Height + 2
else
CheckOffset := 0;
AutoSpan := FHeader.UseColumns and (toAutoSpanColumns in FOptions.FAutoOptions);
SimpleSelection := toSimpleDrawSelection in FOptions.FSelectionOptions;
// This is the node to start with. // ----- main loop
Run := GetNodeAt(0, MinY, False, CurrentTop); // Change selection depending on the node's rectangle being in the selection rectangle or not, but
// touch only those nodes which overlap either the old selection rectangle or the new one but not both.
repeat
// Collect offsets for check, normal and state images.
TextRight := NodeRight;
if WithCheck and (Run.CheckType <> ctNone) then
Dec(TextRight, CheckOffset);
if WithImages and HasImage(Run, ikNormal, MainColumn) then
Dec(TextRight, ImageOffset);
if WithStateImages and HasImage(Run, ikState, MainColumn) then
Dec(TextRight, StateImageOffset);
if Assigned(Run) then // Ensure the node's height is determined.
begin MeasureItemHeight(Canvas, Run);
// The initial minimal left border is determined by the identation level of the node and is dynamically adjusted.
if toShowRoot in FOptions.FPaintOptions then NextTop := CurrentTop + Integer(NodeHeight[Run]);
Dec(NodeRight, Integer((GetNodeLevel(Run) + 1) * FIndent) + FMargin)
// Simple selection allows to draw the selection rectangle anywhere. No intersection with node captions is
// required. Only top and bottom bounds of the rectangle matter.
if SimpleSelection then
begin
IsInOldRect := (NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end
else else
Dec(NodeRight, Integer(GetNodeLevel(Run) * FIndent) + FMargin); begin
// The left column border might be extended if column spanning is enabled.
// ----- main loop if AutoSpan then
// Change selection depending on the node's rectangle being in the selection rectangle or not, but
// touch only those nodes which overlap either the old selection rectangle or the new one but not both.
repeat
// Collect offsets for check, normal and state images.
TextRight := NodeRight;
if WithCheck and (Run.CheckType <> ctNone) then
Dec(TextRight, CheckOffset);
if WithImages and HasImage(Run, ikNormal, MainColumn) then
Dec(TextRight, ImageOffset);
if WithStateImages and HasImage(Run, ikState, MainColumn) then
Dec(TextRight, StateImageOffset);
// Ensure the node's height is determined.
MeasureItemHeight(Canvas, Run);
NextTop := CurrentTop + Integer(NodeHeight[Run]);
// Simple selection allows to draw the selection rectangle anywhere. No intersection with node captions is
// required. Only top and bottom bounds of the rectangle matter.
if SimpleSelection then
begin begin
IsInOldRect := (NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom); NextColumn := MainColumn;
IsInNewRect := (NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom); repeat
Dummy := FHeader.FColumns.GetPreviousVisibleColumn(NextColumn);
if (Dummy = InvalidColumn) or not ColumnIsEmpty(Run, Dummy) or
(FHeader.FColumns[Dummy].BiDiMode = bdLeftToRight) then
Break;
NextColumn := Dummy;
until False;
if NextColumn = MainColumn then
CurrentLeft := NodeLeft
else
FHeader.FColumns.GetColumnBounds(NextColumn, CurrentLeft, Dummy);
end
else
CurrentLeft := NodeLeft;
// Check if we need the node's width. This is the case when the node is not left aligned (in RTL context this
// means actually right aligned) or the right border of the selection rectangle is to the left
// of the right node border.
if (TextRight > OldRect.Right) or (TextRight > NewRect.Right) or (Alignment <> taRightJustify) then
begin
NodeWidth := DoGetNodeWidth(Run, MainColumn);
if NodeWidth >= (TextRight - CurrentLeft) then
TextLeft := CurrentLeft
else
case Alignment of
taLeftJustify:
begin
TextLeft := CurrentLeft;
TextRight := TextLeft + NodeWidth;
end;
taCenter:
begin
TextLeft := (TextRight + CurrentLeft - NodeWidth) div 2;
TextRight := TextLeft + NodeWidth;
end;
else
// taRightJustify
TextLeft := TextRight - NodeWidth;
end;
end
else
TextLeft := CurrentLeft;
// Now determine whether we need to change the state.
IsInOldRect := (OldRect.Right >= TextLeft) and (OldRect.Left <= TextRight) and
(NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NewRect.Right >= TextLeft) and (NewRect.Left <= TextRight) and
(NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end;
if IsInOldRect xor IsInNewRect then
begin
Result := True;
if DoSwitch then
begin
if vsSelected in Run.States then
InternalRemoveFromSelection(Run)
else
InternalCacheNode(Run);
end end
else else
begin begin
// The left column border might be extended if column spanning is enabled. if IsInNewRect then
if AutoSpan then InternalCacheNode(Run)
begin
NextColumn := MainColumn;
repeat
Dummy := FHeader.FColumns.GetPreviousVisibleColumn(NextColumn);
if (Dummy = InvalidColumn) or not ColumnIsEmpty(Run, Dummy) or
(FHeader.FColumns[Dummy].BiDiMode = bdLeftToRight) then
Break;
NextColumn := Dummy;
until False;
if NextColumn = MainColumn then
CurrentLeft := NodeLeft
else
FHeader.FColumns.GetColumnBounds(NextColumn, CurrentLeft, Dummy);
end
else else
CurrentLeft := NodeLeft; InternalRemoveFromSelection(Run);
// Check if we need the node's width. This is the case when the node is not left aligned (in RTL context this
// means actually right aligned) or the right border of the selection rectangle is to the left
// of the right node border.
if (TextRight > OldRect.Right) or (TextRight > NewRect.Right) or (Alignment <> taRightJustify) then
begin
NodeWidth := DoGetNodeWidth(Run, MainColumn);
if NodeWidth >= (TextRight - CurrentLeft) then
TextLeft := CurrentLeft
else
case Alignment of
taLeftJustify:
begin
TextLeft := CurrentLeft;
TextRight := TextLeft + NodeWidth;
end;
taCenter:
begin
TextLeft := (TextRight + CurrentLeft - NodeWidth) div 2;
TextRight := TextLeft + NodeWidth;
end;
else
// taRightJustify
TextLeft := TextRight - NodeWidth;
end;
end
else
TextLeft := CurrentLeft;
// Now determine whether we need to change the state.
IsInOldRect := (OldRect.Right >= TextLeft) and (OldRect.Left <= TextRight) and
(NextTop > OldRect.Top) and (CurrentTop < OldRect.Bottom);
IsInNewRect := (NewRect.Right >= TextLeft) and (NewRect.Left <= TextRight) and
(NextTop > NewRect.Top) and (CurrentTop < NewRect.Bottom);
end; end;
end;
if IsInOldRect xor IsInNewRect then CurrentTop := NextTop;
begin // Get next visible node and update left node position.
Result := True; NextNode := GetNextVisibleNoInit(Run, True);
if DoSwitch then if NextNode = nil then
begin Break;
if vsSelected in Run.States then Dec(NodeRight, CountLevelDifference(Run, NextNode) * Integer(FIndent));
InternalRemoveFromSelection(Run) Run := NextNode;
else until CurrentTop > MaxY;
InternalCacheNode(Run);
end
else
begin
if IsInNewRect then
InternalCacheNode(Run)
else
InternalRemoveFromSelection(Run);
end;
end;
CurrentTop := NextTop;
// Get next visible node and update left node position.
NextNode := GetNextVisibleNoInit(Run, True);
if NextNode = nil then
Break;
Dec(NodeRight, CountLevelDifference(Run, NextNode) * Integer(FIndent));
Run := NextNode;
until CurrentTop > MaxY;
end;
end; end;
end; end;
@ -21693,9 +21675,9 @@ begin
begin begin
FCheckImages := TBitmap.Create; FCheckImages := TBitmap.Create;
case FCheckImageKind of case FCheckImageKind of
ckSystem: ckSystemDefault:
CreateSystemImageSet(FCheckImages, False); CreateSystemImageSet(FCheckImages, False);
ckSystemFlat, ckSystemDefault: ckSystemFlat:
CreateSystemImageSet(FCheckImages, True); CreateSystemImageSet(FCheckImages, True);
else else
FCheckImages.TransparentColor := clDefault; FCheckImages.TransparentColor := clDefault;
@ -23399,7 +23381,8 @@ begin
ClearSelection; ClearSelection;
end; end;
DoStateChange([tsDrawSelecting], [tsDrawSelPending]); DoStateChange([tsDrawSelecting], [tsDrawSelPending]);
// reset to main column for multiselection
// Reset to main column for multiselection.
FocusedColumn := FHeader.MainColumn; FocusedColumn := FHeader.MainColumn;
// The current rectangle may already include some node captions. Handle this. // The current rectangle may already include some node captions. Handle this.
@ -29573,10 +29556,8 @@ var
{$endif} {$endif}
VAlign, VAlign,
IndentSize, IndentSize,
NodeLevel,
ButtonX, ButtonX,
ButtonY: Integer; ButtonY: Integer;
Run: PVirtualNode;
LineImage: TLineImage; LineImage: TLineImage;
PaintInfo: TVTPaintInfo; // all necessary information about a node to pass to the paint routines PaintInfo: TVTPaintInfo; // all necessary information about a node to pass to the paint routines
@ -33001,6 +32982,7 @@ var
Alignment: TAlignment; Alignment: TAlignment;
PaintInfo: TVTPaintInfo; PaintInfo: TVTPaintInfo;
Dummy: TColumnIndex; Dummy: TColumnIndex;
LineImage: TLineImage;
begin begin
if Length(S) = 0 then if Length(S) = 0 then
@ -33026,7 +33008,18 @@ begin
PaintInfo.Column := Column; PaintInfo.Column := Column;
PaintInfo.CellRect := Rect(0, 0, 0, 0); PaintInfo.CellRect := Rect(0, 0, 0, 0);
if Column > NoColumn then 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 else
PaintInfo.CellRect.Right := ClientWidth; PaintInfo.CellRect.Right := ClientWidth;
AdjustPaintCellRect(PaintInfo, Dummy); AdjustPaintCellRect(PaintInfo, Dummy);