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

Qt,Qt5: removed old workaround in DrawText(). Fixes issue #34587

Browse Source 
git-svn-id: trunk@59652 -
This commit is contained in:
zeljko 2018-11-25 12:13:38 +00:00
parent af653f96cb
commit 5ea7ebcdfa
2 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2822,10 +2822,6 @@ end;
To get a correct behavior we need to sum the text's height to the Y coordinate. To get a correct behavior we need to sum the text's height to the Y coordinate.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString); procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString);
{$IFDEF DARWIN}
var
OldBkMode: Integer;
{$ENDIF}
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y); Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y);
@ -2846,17 +2842,11 @@ begin
// The ascent is only applied here, because it also needs // The ascent is only applied here, because it also needs
// to be rotated // to be rotated
{$IFDEF DARWIN}
OldBkMode := SetBkMode(TRANSPARENT);
{$ENDIF}
if Font.Angle <> 0 then if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Metrics.ascent, s) QPainter_drawText(Widget, 0, Metrics.ascent, s)
else else
QPainter_drawText(Widget, x, y, s); QPainter_drawText(Widget, x, y, s);
{$IFDEF DARWIN}
SetBkMode(OldBkMode);
{$ENDIF}
RestorePenColor; RestorePenColor;
// Restore previous angle // Restore previous angle
@ -2879,10 +2869,6 @@ end;
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString); procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString);
{$IFDEF DARWIN}
var
OldBkMode: Integer;
{$ENDIF}
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h); Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h);
@ -2897,16 +2883,10 @@ begin
end; end;
RestoreTextColor; RestoreTextColor;
{$IFDEF DARWIN}
OldBkMode := SetBkMode(TRANSPARENT);
{$ENDIF}
if Font.Angle <> 0 then if Font.Angle <> 0 then
QPainter_DrawText(Widget, 0, 0, w, h, Flags, s) QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
else else
QPainter_DrawText(Widget, x, y, w, h, Flags, s); QPainter_DrawText(Widget, x, y, w, h, Flags, s);
{$IFDEF DARWIN}
SetBkMode(OldBkMode);
{$ENDIF}
RestorePenColor; RestorePenColor;
// Restore previous angle // Restore previous angle

22
lcl/interfaces/qt5/qtobjects.pas
View File

@ -2820,10 +2820,6 @@ end;
To get a correct behavior we need to sum the text's height to the Y coordinate. To get a correct behavior we need to sum the text's height to the Y coordinate.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString); procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString);
{$IFDEF DARWIN}
var
OldBkMode: Integer;
{$ENDIF}
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y); Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y);
@ -2844,17 +2840,11 @@ begin
// The ascent is only applied here, because it also needs // The ascent is only applied here, because it also needs
// to be rotated // to be rotated
{$IFDEF DARWIN}
OldBkMode := SetBkMode(TRANSPARENT);
{$ENDIF}
if Font.Angle <> 0 then if Font.Angle <> 0 then
QPainter_drawText(Widget, 0, Metrics.ascent, s) QPainter_drawText(Widget, 0, Metrics.ascent, s)
else else
QPainter_drawText(Widget, x, y, s); QPainter_drawText(Widget, x, y, s);
{$IFDEF DARWIN}
SetBkMode(OldBkMode);
{$ENDIF}
RestorePenColor; RestorePenColor;
// Restore previous angle // Restore previous angle
@ -2877,10 +2867,6 @@ end;
Returns: Nothing Returns: Nothing
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString); procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString);
{$IFDEF DARWIN}
var
OldBkMode: Integer;
{$ENDIF}
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h); Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h);
@ -2895,16 +2881,10 @@ begin
end; end;
RestoreTextColor; RestoreTextColor;
{$IFDEF DARWIN}
OldBkMode := SetBkMode(TRANSPARENT);
{$ENDIF}
if Font.Angle <> 0 then if Font.Angle <> 0 then
QPainter_DrawText(Widget, 0, 0, w, h, Flags, s) QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
else else
QPainter_DrawText(Widget, x, y, w, h, Flags, s); QPainter_DrawText(Widget, x, y, w, h, Flags, s);
{$IFDEF DARWIN}
SetBkMode(OldBkMode);
{$ENDIF}
RestorePenColor; RestorePenColor;
// Restore previous angle // Restore previous angle