From bdeef86e41e97e93115c363623248d3f9e648cf1 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 12 Oct 2016 18:00:56 +0000
Subject: [PATCH] fpspreadsheet: Significantly speed up zooming of large
 worksheets

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5258 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/examples/visual/zoom/zdmain.pas  |  2 ++
 components/fpspreadsheet/fpspreadsheetgrid.pas     | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/fpspreadsheet/examples/visual/zoom/zdmain.pas b/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
index 0080906d5..74eac93ad 100644
--- a/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
+++ b/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
@@ -127,10 +127,12 @@ procedure TMainForm.GridMouseWheel(Sender: TObject; Shift: TShiftState;
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
   if ([ssCtrl, ssShift] * Shift = [ssCtrl, ssShift]) then begin
+    //Grid.BeginUpdate;
     if WheelDelta > 0 then
       Grid.ZoomFactor := Grid.ZoomFactor * MOUSEWHEEL_FACTOR
     else
       Grid.ZoomFactor := Grid.ZoomFactor / MOUSEWHEEL_FACTOR;
+    //Grid.EndUpdate;
     edZoom.Value := round(Grid.ZoomFactor * 100);
     Handled := true;
   end;
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 09518e40f..de4e4613f 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -281,9 +281,9 @@ type
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
 
-    procedure BeginUpdate;
     procedure AutoColWidth(ACol: Integer);
     procedure AutoRowHeight(ARow: Integer);
+    procedure BeginUpdate;
     function CellRect(ACol1, ARow1, ACol2, ARow2: Integer): TRect; overload;
     procedure Clear;
     procedure DefaultDrawCell(ACol, ARow: Integer; var ARect: TRect;
@@ -291,7 +291,7 @@ type
     procedure DeleteCol(AGridCol: Integer); reintroduce;
     procedure DeleteRow(AGridRow: Integer); reintroduce;
     procedure EditingDone; override;
-    procedure EndUpdate;
+    procedure EndUpdate(ARefresh: Boolean = true);
     function GetGridCol(ASheetCol: Cardinal): Integer; inline;
     function GetGridRow(ASheetRow: Cardinal): Integer; inline;
     procedure GetSheets(const ASheets: TStrings);
@@ -1173,6 +1173,7 @@ end;
 procedure TsCustomWorksheetGrid.BeginUpdate;
 begin
   inc(FLockCount);
+  inherited BeginUpdate;
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -2630,10 +2631,12 @@ end;
   Call BeginUpdate to stop refreshing the grid, and call EndUpdate to release
   the lock and to repaint the grid again.
 -------------------------------------------------------------------------------}
-procedure TsCustomWorksheetGrid.EndUpdate;
+procedure TsCustomWorksheetGrid.EndUpdate(ARefresh: Boolean = true);
 begin
+  inherited EndUpdate(false);
   dec(FLockCount);
-  if FLockCount = 0 then Invalidate;
+  if (FLockCount = 0) and ARefresh then
+    VisualChange;
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -5987,9 +5990,10 @@ end;
 procedure TsCustomWorksheetGrid.SetZoomFactor(AValue: Double);
 begin
   if (AValue <> GetZoomFactor) and Assigned(Worksheet) then begin
+    BeginUpdate;
     try
       Worksheet.ZoomFactor := abs(AValue);
-      AdaptToZoomFactor;
+  //    AdaptToZoomFactor;
     finally
       EndUpdate;
     end;