You've already forked lazarus-ccr
TvPlanIt: More compatibile calculation of average character size, avoids crash in cocoa.
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8889 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@ -1602,9 +1602,25 @@ end;
|
|||||||
function TVpLineWrapper.GetAverageCharSize(ACanvas: TCanvas): Integer;
|
function TVpLineWrapper.GetAverageCharSize(ACanvas: TCanvas): Integer;
|
||||||
var
|
var
|
||||||
Metrics: TTextMetric;
|
Metrics: TTextMetric;
|
||||||
|
{$IFDEF LCL}
|
||||||
|
bmp: TBitmap;
|
||||||
|
{$ELSE}
|
||||||
SavedFontHandle: THandle;
|
SavedFontHandle: THandle;
|
||||||
DC: HDC;
|
DC: HDC;
|
||||||
begin
|
{$ENDIF}
|
||||||
|
begin
|
||||||
|
{$IFDEF LCL}
|
||||||
|
// The Delphi version crashes in cocoa.
|
||||||
|
bmp := TBitmap.Create;
|
||||||
|
try
|
||||||
|
bmp.SetSize(10, 10);
|
||||||
|
bmp.Canvas.Font.Assign(ACanvas.Font);
|
||||||
|
GetTextMetrics(bmp.Canvas.Handle, Metrics) then
|
||||||
|
Result := Metrics.tmAveCharWidth;
|
||||||
|
finally
|
||||||
|
bmp.Free;
|
||||||
|
end;
|
||||||
|
{$ELSE}
|
||||||
DC := GetDC(0);
|
DC := GetDC(0);
|
||||||
SavedFontHandle := SelectObject(DC, ACanvas.Font.Reference.Handle);
|
SavedFontHandle := SelectObject(DC, ACanvas.Font.Reference.Handle);
|
||||||
try
|
try
|
||||||
@ -1613,7 +1629,8 @@ begin
|
|||||||
finally
|
finally
|
||||||
SelectObject(DC, SavedFontHandle);
|
SelectObject(DC, SavedFontHandle);
|
||||||
ReleaseDC(0, DC);
|
ReleaseDC(0, DC);
|
||||||
end;
|
end;
|
||||||
|
{$ENDIF}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TVpLineWrapper.GetNextRectangle(ARegion: HRGN;
|
function TVpLineWrapper.GetNextRectangle(ARegion: HRGN;
|
||||||
|
Reference in New Issue
Block a user