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

fpspreadsheet: Improved painting of merged cells by TsWorksheetGrid (but: scrolling paints over the fixed rows).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3549 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-09-11 13:53:45 +00:00
parent 88e60530ae
commit dcdd530d16
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/examples/spready/mainform.lfm
View File

@ -393,7 +393,7 @@ object MainFrm: TMainFrm
ActivePage = PgCellValue
Align = alRight
TabIndex = 0
TabOrder = 5
TabOrder = 4
OnChange = InspectorPageControlChange
object PgCellValue: TTabSheet
Caption = 'Cell value'

2
components/fpspreadsheet/examples/spready/mainform.pas
View File

@ -824,6 +824,8 @@ begin
// Initialize Inspector
UpdateCellInfo(nil);
ActiveControl := WorksheetGrid;
end;
procedure TMainFrm.InspectorPageControlChange(Sender: TObject);

2
components/fpspreadsheet/examples/spready/spready.lpi
View File

@ -87,7 +87,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
<CommandLineParams Value="D:\Prog_Lazarus\svn\lazarus-ccr\components\fpspreadsheet\examples\ooxmldemo\test.xls"/>
<CommandLineParams Value="&quot;C:\Users\Pamler\Prog_Lazarus\svn\lazarus-ccr\components\fpspreadsheet\examples\opendocdemo\test.ods&quot;"/>
</local>
</RunParams>
<RequiredPackages Count="2">

5
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -1341,7 +1341,7 @@ var
begin
// Upper and Lower bounds for this row
rct := BoundsRect;
rct := Rect(0,0,0,0);
ColRowToOffSet(False, True, ARow, rct.Top, rct.Bottom);
saved_rct := rct;
@ -1378,6 +1378,7 @@ begin
r := GetGridRow(r1);
ColRowToOffSet(False, True, r, rct.Top, tmp);
ColRowToOffSet(False, True, r + r2 - r1, tmp, rct.Bottom);
c := GetGridCol(c1);
cNext := c + (c2-c1) + 1;
end;
end;
@ -1387,6 +1388,8 @@ begin
if (rct.Left < rct.Right) and HorizontalIntersect(rct, clipArea) then
begin
// IntersectRect(rct, rct, clipArea);
// if rct.Left < clipArea.Left then rct.Left := clipArea.Left;
Rs := (goRowSelect in Options);
gds := GetGridDrawState(c, r);
DoDrawCell(c, r);