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

LCL, fix font.size returning negative values plus dummy implementation of SetPixel in postscriptcanvas, from C Western, issue 157457

Browse Source 
git-svn-id: trunk@23709 -
This commit is contained in:
jesus 2010-02-16 06:09:23 +00:00
parent 7d178ec26d
commit 1f547bb00d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/postscriptcanvas.pas
View File

@ -165,6 +165,7 @@ Type
const Style: TGraphicsBevelCut); override; const Style: TGraphicsBevelCut); override;
procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2, procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2,
StartX,StartY,EndX,EndY: Integer); override; StartX,StartY,EndX,EndY: Integer); override;
procedure SetPixel(X,Y: Integer; Value: TColor); override;
procedure TextRect(ARect: TRect; X, Y: integer; const Text: string; procedure TextRect(ARect: TRect; X, Y: integer; const Text: string;
const Style: TTextStyle); override; const Style: TTextStyle); override;
@ -1944,7 +1945,7 @@ begin
UpdateFont; UpdateFont;
FPSUnicode.Font:=MappedFontName; FPSUnicode.Font:=MappedFontName;
FPSUnicode.FontSize:=Font.Size; FPSUnicode.FontSize:=Abs(Font.Size);
FPSUnicode.FontStyle:=FontStyleToInt(Font.Style); FPSUnicode.FontStyle:=FontStyleToInt(Font.Style);
//The Y origin for ps text it's Left bottom corner //The Y origin for ps text it's Left bottom corner
@ -1988,8 +1989,8 @@ begin
Result.cY := 0; Result.cY := 0;
if Text='' then Exit; if Text='' then Exit;
RequiredState([csHandleValid, csFontValid]); RequiredState([csHandleValid, csFontValid]);
Result.cY:=round((Font.Size/72)*YDPI); // points to inches and then to pixels Result.cY:=round((Abs(Font.Size)/72)*YDPI); // points to inches and then to pixels
// Abs is not right - should also take internal leading into account
FontName:=MappedFontName; FontName:=MappedFontName;
IndexFont:=0; //By default, use Courier metrics IndexFont:=0; //By default, use Courier metrics
for i:=0 to High(cFontPSMetrics) do for i:=0 to High(cFontPSMetrics) do
@ -2007,7 +2008,7 @@ begin
if (c in [#32..#255]) then if (c in [#32..#255]) then
Inc(Result.cX,cFontPSMetrics[IndexFont].Widths[Ord(c)]); Inc(Result.cX,cFontPSMetrics[IndexFont].Widths[Ord(c)]);
end; end;
Result.cX:=Round(Result.cX*(Font.Size/72)*0.001*XDPI); Result.cX:=Round(Result.cX*Abs(Font.Size/72)*0.001*XDPI);
end; end;
//Draw an Picture //Draw an Picture
@ -2151,6 +2152,11 @@ begin
//Not implemented //Not implemented
end; end;
procedure TPostScriptPrinterCanvas.SetPixel(X, Y: Integer; Value: TColor);
begin
//Not implemented
end;
procedure TPostScriptPrinterCanvas.TextRect(ARect: TRect; X, Y: integer; procedure TPostScriptPrinterCanvas.TextRect(ARect: TRect; X, Y: integer;
const Text: string; const Style: TTextStyle); const Text: string; const Style: TTextStyle);
begin begin