paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Fix compilation (issue caused by renamed haJustify option).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9349 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-05-10 17:15:32 +00:00
parent 09ab7329ef
commit 9f9ac7cd2a
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -1761,7 +1761,7 @@ begin
r := GetWorksheetRow(ARow);
case txtalign of
haLeft,
haJustify, // to do: get a separate option for haJustify; adjust widths of spaces to fill the entire cell.
haJustified, haDistributed, haFilled, // to do: get a separate option for these
haDefault:
// overflow to the right
while (len > ARect.Right - ARect.Left) and (ACol2 < ColCount-1) do

60
components/fpspreadsheet/source/visual/fpsvisualutils.pas
View File

@ -458,17 +458,21 @@ begin
// xpos is x coordinate of left edge of first character
if FRightToLeft then
case FHorAlignment of
haJustify,
haLeft : xpos := FRect.Left + lineinfo.Width;
haCenter : xpos := (FRect.Left + FRect.Right + lineinfo.Width) div 2;
haRight : xpos := FRect.Right;
haJustified, haDistributed, haFilled, haLeft:
xpos := FRect.Left + lineinfo.Width;
haCenter:
xpos := (FRect.Left + FRect.Right + lineinfo.Width) div 2;
haRight:
xpos := FRect.Right;
end
else
case FHorAlignment of
haJustify,
haLeft : xpos := FRect.Left;
haCenter : xpos := (FRect.Left + FRect.Right - lineinfo.Width) div 2;
haRight : xpos := FRect.Right - lineinfo.Width;
haJustified, haDistributed, haFilled, haLeft:
xpos := FRect.Left;
haCenter:
xpos := (FRect.Left + FRect.Right - lineinfo.Width) div 2;
haRight:
xpos := FRect.Right - lineinfo.Width;
end;
DrawLine(pEnd, xpos, ypos, lineinfo.Height, AOverrideTextColor);
inc(ypos, lineinfo.Height);
@ -538,17 +542,21 @@ begin
dx := lineInfo.Height;
if FRightToLeft then
case FHorAlignment of
haJustify,
haLeft : xpos := FRect.Left + FTotalHeight + dx;
haCenter : xpos := (FRect.Left + FRect.Right + FTotalHeight) div 2 - dx;
haRight : xpos := FRect.Right - dx;
haJustified, haDistributed, haFilled, haLeft:
xpos := FRect.Left + FTotalHeight + dx;
haCenter:
xpos := (FRect.Left + FRect.Right + FTotalHeight) div 2 - dx;
haRight:
xpos := FRect.Right - dx;
end
else
case FHorAlignment of
haJustify,
haLeft : xpos := FRect.Left + dx;
haCenter : xpos := (FRect.Left + FRect.Right - FTotalHeight) div 2;
haRight : xpos := FRect.Right - FTotalHeight + dx;
haJustified, haDistributed, haFilled, haLeft:
xpos := FRect.Left + dx;
haCenter:
xpos := (FRect.Left + FRect.Right - FTotalHeight) div 2;
haRight:
xpos := FRect.Right - FTotalHeight + dx;
end;
// (2) Draw text line-by-line
@ -660,10 +668,12 @@ begin
w := FCanvas.TextWidth(ch);
// x is at the center of the character here
case FHorAlignment of
haJustify,
haLeft : FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
haCenter : FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
haRight : FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
haJustified, haDistributed, haFilled, haLeft:
FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
haCenter:
FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
haRight:
FCanvas.TextOut(Pt.x - w div 2, Pt.y, ch);
end;
inc(y, ALineHeight);
inc(nChar);
@ -684,10 +694,12 @@ var
begin
// (1) Get starting point
case FHorAlignment of
haJustify,
haLeft : xpos := IfThen(AClockwise, FRect.Left + FTotalHeight, FRect.Left);
haCenter : xpos := (FRect.Left + FRect.Right + FTotalHeight*SGN[AClockwise]) div 2;
haRight : xpos := IfThen(AClockwise, FRect.Right, FRect.Right - FTotalHeight);
haJustified, haDistributed, haFilled, haLeft:
xpos := IfThen(AClockwise, FRect.Left + FTotalHeight, FRect.Left);
haCenter:
xpos := (FRect.Left + FRect.Right + FTotalHeight*SGN[AClockwise]) div 2;
haRight:
xpos := IfThen(AClockwise, FRect.Right, FRect.Right - FTotalHeight);
end;
// (2) Draw text line by line and respect text rotation