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

LCL-CustomDrawn: Fix compilation on Windows. Fix color in TCDWidgetSet.ExtTextOut. Issue #40182, patch by Bart B.

Browse Source
This commit is contained in:
Juha 2023-03-27 18:07:50 +03:00
parent de07d13b01
commit 00f4ec79dc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2111,7 +2111,7 @@ begin
lFontSize := Round(ftFont.TextHeight(Str) * 0.75);// ToDo: Find out why this 75% factor works
RealX := X + lDestCanvas.WindowOrg.X + lDestCanvas.BaseWindowOrg.X;
RealY := Y + lDestCanvas.WindowOrg.Y + lDestCanvas.BaseWindowOrg.Y + lFontSize;
FTDrawer.DrawText(Str, ftFont, RealX, RealY, colBlack, 255);
FTDrawer.DrawText(Str, ftFont, RealX, RealY, lDestCanvas.Font.FPColor, 255);
finally
if FreeFTFont then ftFont.Free;
FTDrawer.Free;

2
lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
View File

@ -1245,10 +1245,12 @@ begin
end;
*)
{$ifdef CD_UseNativeMonitors}
function TCDWidgetSet.EnumDisplayMonitors(hdc: HDC; lprcClip: PRect; lpfnEnum: MonitorEnumProc; dwData: LPARAM): LongBool;
begin
Result := MultiMon.EnumDisplayMonitors(hdc, lprcClip, lpfnEnum, dwData);
end;
{$endif}
type
TProcRedirRec = record