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

fpspreadsheet: Improved centering of stacked text in cells of Worksheetgrid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4206 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-07-09 18:34:31 +00:00
parent e1920a4bfa
commit 4e44185df4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/fpsvisualutils.pas
View File

@ -428,7 +428,6 @@ begin
totalHeight := 0;
Convert_sFont_to_Font(AWorkbook.GetFont(AFontIndex), ACanvas.Font);
if ARotation = rtStacked then
stackPeriod := ACanvas.TextWidth('M') * 2;
@ -444,9 +443,6 @@ begin
FirstRtpIndex := iRtp;
NextRtpIndex := iRtp;
ScanLine(pEnd, NumSpaces, NextRtpIndex, Width, Height);
if ARotation = rtStacked then
totalHeight := totalHeight + stackPeriod
else
totalHeight := totalHeight + Height;
iRtp := NextRtpIndex;
p := pEnd;
@ -462,6 +458,7 @@ begin
until p^ = #0;
// Draw lines
// 1/ get starting point of line
case ARotation of
trHorizontal:
case AVertAlignment of
@ -483,14 +480,16 @@ begin
end;
rtStacked:
begin
totalHeight := (Length(lineinfos) - 1) * stackperiod;
case AHorAlignment of
haLeft : xpos := ARect.Left + stackPeriod div 2;
haRight : xpos := ARect.Right - totalHeight + stackPeriod div 2;
haCenter: xpos := (ARect.Left + ARect.Right - (Length(lineInfos)-1) * stackPeriod) div 2;
haCenter: xpos := (ARect.Left + ARect.Right - totalHeight) div 2;
end;
end;
end;
// 2/ Draw line by line and respect text rotation
for lineInfo in lineInfos do begin
with lineInfo do
begin