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

LCL-CustomDrawn: Improves a little the error handling in GetTextMetrics and friends

Browse Source 
git-svn-id: trunk@37036 -
This commit is contained in:
sekelsenmat 2012-04-26 14:37:09 +00:00
parent 8437f7dbd1
commit 31551c6c8f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lcl/interfaces/customdrawn/customdrawnwinapi.inc
View File

@ -4105,6 +4105,11 @@ begin
if not IsValidDC(DC) then Exit;
ftFont := TFreeTypeFont(LazDC.ExtraFontData);
if ftFont = nil then
begin
DebugLn('[TCDWidgetSet.GetTextExtentPoint] Error: ExtraFontData not yet created');
Exit;
end;
Size.cx := Round(ftFont.TextWidth(Str));
Size.cy := Round(ftFont.TextHeight(Str));
if Size.cy = 0 then Size.cy := LazDC.AssignedFont.Size; // crude aproximation
@ -4136,17 +4141,15 @@ begin
if not IsValidDC(DC) then Exit;
FillChar(TM, SizeOf(TM), 0);
lFont := LazDC.Font;
lFTFont := TFreeTypeFont(LazDC.ExtraFontData);
if lFTFont = nil then raise Exception.Create('ExtraFontData not yet created');
{ begin
lFTFont := TFreeTypeFont.Create;
lFTFont.Name := BackendGetFontPath(LazDC.Font.Name, '');
lFTFont.Hinted := true;
lFTFont.ClearType := true;
lFTFont.Quality := grqHighQuality;
FreeFTFont := True;
end;}
if lFTFont = nil then
begin
DebugLn('[TCDWidgetSet.GetTextMetrics] Error: ExtraFontData not yet created');
Exit;
end;
//QtFontMetrics := QtDC.Metrics;
TM.tmHeight := Round(lFTFont.TextHeight('ŹÇ'));