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

fpspreadsheet: Fix minor painting issues in RTL mode when TsWorksheet headers are off.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4462 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-01-23 17:23:39 +00:00
parent 89c374f198
commit b4b631c0f8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@@ -1726,6 +1726,8 @@ begin
sc1 := GetWorksheetCol(GCache.VisibleGrid.Left); sc1 := GetWorksheetCol(GCache.VisibleGrid.Left);
sr2 := GetWorksheetRow(GCache.VisibleGrid.Bottom); sr2 := GetWorksheetRow(GCache.VisibleGrid.Bottom);
sc2 := GetWorksheetCol(GCache.VisibleGrid.Right); sc2 := GetWorksheetCol(GCache.VisibleGrid.Right);
if sr1 = UNASSIGNED_ROW_COL_INDEX then sr1 := 0;
if sc1 = UNASSIGNED_ROW_COL_INDEX then sc1 := 0;
for cell in Worksheet.Cells.GetRangeEnumerator(sr1, sc1, sr2, sc2) do for cell in Worksheet.Cells.GetRangeEnumerator(sr1, sc1, sr2, sc2) do
if (uffBorder in Worksheet.ReadUsedFormatting(cell)) then if (uffBorder in Worksheet.ReadUsedFormatting(cell)) then
@@ -2187,7 +2189,11 @@ begin
end; end;
FDrawingCell := nil; FDrawingCell := nil;
temp_rct := rct; temp_rct := rct;
for i := gc1 to gc2 do begin // for i := gc1 to gc2 do begin
for i:= gc2 downto gc1 do begin
//starting from last col will insure drawing grid lines below text
//when text is overflow in RTL and have no problem in LTR
// modification by "shobits1"
ColRowToOffset(true, true, i, temp_rct.Left, temp_rct.Right); ColRowToOffset(true, true, i, temp_rct.Left, temp_rct.Right);
if HorizontalIntersect(temp_rct, clipArea) and (i <> gc) then if HorizontalIntersect(temp_rct, clipArea) and (i <> gc) then
begin begin
@@ -2243,7 +2249,7 @@ begin
gds := GetGridDrawState(gc, gr); gds := GetGridDrawState(gc, gr);
temp_rct := rct; temp_rct := rct;
// Avoid painting into the fixed cells // Avoid painting into the fixed cells
if IsRightToLeft then if IsRightToLeft and (HeaderCount > 0) then
begin begin
if temp_rct.Right > fixed_rct.Left then temp_rct.Right := fixed_rct.Left if temp_rct.Right > fixed_rct.Left then temp_rct.Right := fixed_rct.Left
end else end else