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

Qt: bugfix for #14646 - TQtDeviceContext.DrawText()

Browse Source 
git-svn-id: trunk@21821 -
This commit is contained in:
zeljko 2009-09-22 15:45:13 +00:00
parent e62f9ab988
commit 566a4c3378
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2074,7 +2074,7 @@ end;
procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString);
var
ARect: TRect;
FixedY, dy: Integer;
dy: Integer;
begin
{$ifdef VerboseQt}
Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y);
@ -2088,19 +2088,19 @@ begin
Rotate(-0.1 * Font.Angle);
end;
// what about Font.Metrics.descent and Font.Metrics.leading ?
FixedY := y + Font.Metrics.ascent;
// manual check for clipping
if getClipping then
begin
dy := Font.Metrics.height;
ARect := getClipRegion.getBoundingRect;
if (FixedY + dy < ARect.Top) or (FixedY > ARect.Bottom) or
if (y + dy < ARect.Top) or (y > ARect.Bottom) or
(x > ARect.Right) then
Exit;
end;
// what about Font.Metrics.descent and Font.Metrics.leading ?
y := y + Font.Metrics.ascent;
RestoreTextColor;
// The ascent is only applied here, because it also needs
@ -2108,13 +2108,14 @@ begin
if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Font.Metrics.ascent, s)
else
QPainter_drawText(Widget, x, FixedY, s);
QPainter_drawText(Widget, x, y, s);
RestorePenColor;
// Restore previous angle
if Font.Angle <> 0 then
begin
y := y - Font.Metrics.ascent;
Rotate(0.1 * Font.Angle);
Translate(-x, -y);
end;