paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 09:38:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, fix problem on preview with zoom level<>100% sometimes a different font size was used for text objects (mostly non-windows targets)

Browse Source 
git-svn-id: trunk@28806 -
This commit is contained in:
jesus 2010-12-22 20:58:31 +00:00
parent 92a22bdc4c
commit 3fe140b210
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/lazreport/source/lr_class.pas
View File

@ -2471,17 +2471,21 @@ end;
procedure TfrMemoView.AssignFont(aCanvas: TCanvas);
begin
with aCanvas do
begin
{$IFDEF DebugLR}
DebugLn('AssignFont(%s)',[self.Font.Name]);
{$ENDIF}
//** Brush.Style := bsClear;
Font.Assign(Self.Font);
//Font := Self.Font;
if not IsPrinting and (ScaleY<>0) then
Font.Height := -Round(Font.Size * 96 / 72 * ScaleY);
end;
{$IFDEF DebugLR}
DebugLnEnter('AssignFont (%s) INIT: Self.Font.Size=%d aCanvas.Font.Size=%d',
[self.Font.Name,Self.Font.Size,ACanvas.Font.Size]);
{$ENDIF}
//** Brush.Style := bsClear;
aCanvas.Font.Assign(Self.Font);
if Self.Font.Name='' then
aCanvas.Font.Name := 'default';
//Font := Self.Font;
if not IsPrinting and (ScaleY<>0) then
ACanvas.Font.Height := -Round(Self.Font.Size * 96 / 72 * ScaleY);
{$IFDEF DebugLR}
DebugLnExit('AssignFont (%s) DONE: Self.Font.Size=%d aCanvas.Font.Size=%d',
[self.Font.Name,Self.Font.Size,ACanvas.Font.Size]);
{$ENDIF}
end;
type
@ -2773,7 +2777,6 @@ var
end;
// handle any alignment with same code
AssignFont(Canvas);
Ts := Canvas.TextStyle;
Ts.Layout :=tlTop;
Ts.Alignment :=self.Alignment;
@ -2898,6 +2901,10 @@ var
end;
begin
{$IFDEF DebugLR}
DebugLnEnter('TfrMemoView.ShowMemo INIT Font.Size=%d Canvas.Font.Size=%d',
[Font.Size, Canvas.Font.Size]);
{$ENDIF}
AssignFont(Canvas);
SavX:=X;
SavY:=Y;
@ -2918,6 +2925,9 @@ begin
finally
X:=SavX;
Y:=SavY;
{$IFDEF DebugLR}
DebugLnExit('TfrMemoView.ShowMemo DONE Font.Size=%d Canvas.Font.Size=%d',[Font.Size, Canvas.Font.Size]);
{$ENDIF}
end;
(*
if (Adjust and $18) <> 0 then