From f97bf899bb677d348b1972144e86a47319b15e76 Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Tue, 7 Jan 2020 13:26:46 +0000
Subject: [PATCH] Grid: fix High-DPI font scaling

git-svn-id: trunk@62506 -
---
 lcl/grids.pas | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/lcl/grids.pas b/lcl/grids.pas
index 31bbc34c64..43c18ca525 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -486,6 +486,8 @@ type
     destructor Destroy; override;
     procedure Assign(Source: TPersistent); override;
     procedure FillTitleDefaultFont;
+    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual;
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); virtual;
     function IsDefault: boolean;
     property Column: TGridColumn read FColumn;
   published
@@ -589,6 +591,8 @@ type
     destructor Destroy; override;
     procedure Assign(Source: TPersistent); override;
     procedure FillDefaultFont;
+    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual;
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); virtual;
     function  IsDefault: boolean; virtual;
     property Grid: TCustomGrid read GetGrid;
     property DefaultWidth: Integer read GetDefaultWidth;
@@ -1141,6 +1145,8 @@ type
     procedure RowHeightsChanged; virtual;
     procedure SaveContent(cfg: TXMLConfig); virtual;
     procedure SaveGridOptions(cfg: TXMLConfig); virtual;
+    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); override;
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
     procedure ScrollBarRange(Which:Integer; aRange,aPage,aPos: Integer);
     procedure ScrollBarPosition(Which, Value: integer);
     function  ScrollBarIsVisible(Which:Integer): Boolean;
@@ -8488,6 +8494,20 @@ begin
   result := FixedCols;
 end;
 
+procedure TCustomGrid.FixDesignFontsPPI(const ADesignTimePPI: Integer);
+var
+  LTitleFontIsDefault: Boolean;
+  I: Integer;
+begin
+  inherited FixDesignFontsPPI(ADesignTimePPI);
+
+  LTitleFontIsDefault := FTitleFontIsDefault;
+  DoFixDesignFontPPI(TitleFont, ADesignTimePPI);
+  FTitleFontIsDefault := LTitleFontIsDefault;
+  for I := 0 to FColumns.Count-1 do
+    FColumns[I].FixDesignFontsPPI(ADesignTimePPI);
+end;
+
 function TCustomGrid.FixedGrid: boolean;
 begin
   result := (FixedCols=ColCount) or (FixedRows=RowCount)
@@ -9901,6 +9921,18 @@ begin
   end;
 end;
 
+procedure TCustomGrid.ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double);
+var
+  LTitleFontIsDefault: Boolean;
+  I: Integer;
+begin
+  inherited ScaleFontsPPI(AToPPI, AProportion);
+  LTitleFontIsDefault := FTitleFontIsDefault;
+  DoScaleFontPPI(TitleFont, AToPPI, AProportion);
+  FTitleFontIsDefault := LTitleFontIsDefault;
+  for I := 0 to FColumns.Count-1 do
+    FColumns[I].ScaleFontsPPI(AToPPI, AProportion);
+end;
 
 type
   TWinCtrlAccess=class(TWinControl);
@@ -12105,6 +12137,15 @@ begin
   FIsDefaultTitleFont := True;
 end;
 
+procedure TGridColumnTitle.FixDesignFontsPPI(const ADesignTimePPI: Integer);
+var
+  LIsDefaultTitleFont: Boolean;
+begin
+  LIsDefaultTitleFont := FIsDefaultTitleFont;
+  FColumn.Grid.DoFixDesignFontPPI(Font, ADesignTimePPI);
+  FIsDefaultTitleFont := LIsDefaultTitleFont;
+end;
+
 function TGridColumnTitle.GetFont: TFont;
 begin
   Result := FFont;
@@ -12143,6 +12184,15 @@ begin
   result := FLayout <> nil;
 end;
 
+procedure TGridColumnTitle.ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double);
+var
+  LIsDefaultTitleFont: Boolean;
+begin
+  LIsDefaultTitleFont := FIsDefaultTitleFont;
+  FColumn.Grid.DoScaleFontPPI(Font, AToPPI, AProportion);
+  FIsDefaultTitleFont := LIsDefaultTitleFont;
+end;
+
 procedure TGridColumnTitle.SetAlignment(const AValue: TAlignment);
 begin
   if Falignment = nil then begin
@@ -12503,6 +12553,16 @@ begin
   result := FWidth <> nil;
 end;
 
+procedure TGridColumn.ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double);
+var
+  LisDefaultFont: Boolean;
+begin
+  LisDefaultFont := FisDefaultFont;
+  Grid.DoScaleFontPPI(Font, AToPPI, AProportion);
+  FisDefaultFont := LisDefaultFont;
+  Title.ScaleFontsPPI(AToPPI, AProportion);
+end;
+
 procedure TGridColumn.SetAlignment(const AValue: TAlignment);
 begin
   if FAlignment = nil then begin
@@ -12869,6 +12929,16 @@ begin
   end;
 end;
 
+procedure TGridColumn.FixDesignFontsPPI(const ADesignTimePPI: Integer);
+var
+  LisDefaultFont: Boolean;
+begin
+  LisDefaultFont := FisDefaultFont;
+  Grid.DoFixDesignFontPPI(Font, ADesignTimePPI);
+  FisDefaultFont := LisDefaultFont;
+  Title.FixDesignFontsPPI(ADesignTimePPI);
+end;
+
 function TGridColumn.IsDefault: boolean;
 begin
   result := FTitle.IsDefault and (FAlignment=nil) and (FColor=nil)