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

Qt: more accurate autosize calculation for TQtBitBtn

Browse Source 
git-svn-id: trunk@34506 -
This commit is contained in:
zeljko 2011-12-29 18:52:02 +00:00
parent 2369626edf
commit 48b2cd29e5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcl/interfaces/qt/qtwidgets.pas
View File

@ -5482,6 +5482,7 @@ var
BtnWidth: Integer;
BtnHeight: Integer;
IconSize: TSize;
R: TRect;
{style pixel metrics}
BtnMargin, FocusH, FocusV, ShiftH, ShiftV: Integer;
begin
@ -5493,7 +5494,13 @@ var
AMetrics := QFontMetrics_create(QWidget_font(Widget));
try
QStyleOption_fontMetrics(AOpt, AMetrics);
BtnWidth := QFontMetrics_width(AMetrics, PWideString(@AText));
// QtTextShowMnemonic = $0800
QFontMetrics_boundingRect(AMetrics, PRect(@R), 0, 0,
QWidget_maximumWidth(Widget), QWidget_maximumHeight(Widget),
QtAlignLeft or $0800, PWideString(@AText));
BtnWidth := R.Right - R.Left; // QFontMetrics_width(AMetrics, PWideString(@AText));
BtnHeight := QFontMetrics_height(AMetrics);
Result.cx := BtnWidth;
Result.cy := BtnHeight;
@ -5515,7 +5522,7 @@ var
if not QIcon_isNull(FIcon) then
begin
IconSize := Self.FIconSize;
Result.cx := Result.cx + IconSize.cx + (FocusH * 2) + (ShiftH * 2) + IconDistance;
Result.cx := Result.cx + IconSize.cx + (FocusH * 2) + (ShiftH * 2);
if IconSize.cy + BtnMargin + (FocusV * 2) + (ShiftV * 2) > Result.cy then
Result.cy := IconSize.cy + BtnMargin + (FocusV * 2) + (ShiftV * 2);
if FText <> '' then
@ -5523,6 +5530,8 @@ var
if FGlyphLayout in [2, 3] then
inc(Result.cy, BtnHeight + IconDistance);
end;
if ShiftV = 0 then
inc(Result.cy, 1);
end;
end;