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

LCL/TSpeedButton: Layout improvements when AutoSize = false

Browse Source
This commit is contained in:
wp_xyz 2024-09-10 13:07:57 +02:00
parent d869f6a082
commit 8f6a59c9a2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/include/speedbutton.inc
View File

@ -801,14 +801,23 @@ begin
case CurLayout of case CurLayout of
blGlyphLeft: blGlyphLeft:
if (Margin >= 0) and (Spacing >= 0) then if (Margin >= 0) and (Spacing >= 0) then
TextRect.Right := PaintRect.Right - Margin; begin
TextRect.Right := PaintRect.Right;
if Alignment = taRightJustify then dec(TextRect.Right, Margin);
end;
blGlyphRight: blGlyphRight:
if (Margin >= 0) and (Spacing >= 0) then if (Margin >= 0) and (Spacing >= 0) then
TextRect.Right := PaintRect.Left + OffsetGlyph.X - Spacing; TextRect.Right := PaintRect.Left + OffsetGlyph.X - Spacing;
blGlyphTop, blGlyphTop,
blGlyphBottom: blGlyphBottom:
if Margin >= 0 then if Margin >= 0 then
begin
TextRect.Right := PaintRect.Right; TextRect.Right := PaintRect.Right;
case Alignment of
taLeftJustify: inc(TextRect.Left, Margin);
taRightJustify: dec(TextRect.Right, Margin);
end;
end;
end; end;
TextFlags := DT_TOP or cAlignment[BidiFlipAlignment(FAlignment, UseRightToLeftAlignment)]; // or DT_NOCLIP; TextFlags := DT_TOP or cAlignment[BidiFlipAlignment(FAlignment, UseRightToLeftAlignment)]; // or DT_NOCLIP;