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

IDE: removed workaround for drawing scaled non visual component. Related to issue #41299, #41313

Browse Source
This commit is contained in:
zeljan1 2025-01-05 22:00:35 +01:00
parent ff108ae5b6
commit 55123014f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
designer/designer.pp
View File

@ -3633,11 +3633,11 @@ begin
// into account // into account
Icon := TBitmap.Create; Icon := TBitmap.Create;
try try
TextSize := Icon.Canvas.TextExtent(AComponent.Name);
Icon.SetSize(Round(TextSize.cx * ScaleFactor), Round(TextSize.cy * ScaleFactor));
LCLIntf.SetDeviceScaleRatio(Icon.Canvas.Handle, ScaleFactor);
Icon.Canvas.Font.Assign(FDDC.Canvas.Font); Icon.Canvas.Font.Assign(FDDC.Canvas.Font);
Icon.Canvas.Font.PixelsPerInch := FDDC.Canvas.Font.PixelsPerInch; Icon.Canvas.Font.PixelsPerInch := FDDC.Canvas.Font.PixelsPerInch;
Icon.Canvas.Font.Height := Round(GetFontData(FDDC.Canvas.Font.Reference.Handle).Height*ScaleFactor);
TextSize := Icon.Canvas.TextExtent(AComponent.Name);
Icon.SetSize(TextSize.cx, TextSize.cy);
TextRect := Rect(0, 0, TextSize.cx, TextSize.cy); TextRect := Rect(0, 0, TextSize.cx, TextSize.cy);
if FDDC.Form <> nil then if FDDC.Form <> nil then
Icon.Canvas.Brush.Color := FDDC.Form.Brush.Color Icon.Canvas.Brush.Color := FDDC.Form.Brush.Color
@ -3647,10 +3647,10 @@ begin
Icon.Canvas.Font.Color := clWindowText; Icon.Canvas.Font.Color := clWindowText;
DrawText(Icon.Canvas.Handle, PChar(AComponent.Name), -1, TextRect, DrawText(Icon.Canvas.Handle, PChar(AComponent.Name), -1, TextRect,
DT_CENTER or DT_VCENTER or DT_SINGLELINE or DT_NOCLIP); DT_CENTER or DT_VCENTER or DT_SINGLELINE or DT_NOCLIP);
TextRect.Left := (ItemLeft + ItemRight - LongInt(Round(TextSize.cx/ScaleFactor))) div 2; TextRect.Left := (ItemLeft + ItemRight - TextSize.cx) div 2;
TextRect.Top := (ItemBottom + NonVisualCompBorder + 2); TextRect.Top := (ItemBottom + NonVisualCompBorder + 2);
TextRect.Right := TextRect.Left + Round(TextSize.cx/ScaleFactor); TextRect.Right := TextRect.Left + Icon.Width;
TextRect.Bottom := TextRect.Top + Round(TextSize.cy/ScaleFactor); TextRect.Bottom := TextRect.Top + Icon.Height;
FDDC.Canvas.StretchDraw(TextRect, Icon); FDDC.Canvas.StretchDraw(TextRect, Icon);
finally finally
Icon.Free; Icon.Free;