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

Qt,Qt5: fixed problem with drawing primitives when antialiasing enabled. issue #39416

Browse Source 
(cherry picked from commit e8317fb534)
This commit is contained in:
Željan Rikalo 2021-10-06 11:37:19 +02:00 committed by Maxim Ganetsky
parent 7657129760
commit d7b94bfffa
4 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,10 +428,12 @@ type
procedure drawPoint(x1: Integer; y1: Integer);
procedure drawRect(x1: Integer; y1: Integer; w: Integer; h: Integer;
const AQtBugWorkaroundNeeded: Boolean = False);
procedure drawRectF(x1: double; y1: double; w: double; h: double);
procedure drawRoundRect(x, y, w, h, rx, ry: Integer);
procedure drawText(x: Integer; y: Integer; s: PWideString); overload;
procedure drawText(x,y,w,h,flags: Integer; s:PWideString); overload;
procedure drawLine(x1: Integer; y1: Integer; x2: Integer; y2: Integer);
procedure drawLineF(x1: double; y1: double; x2: double; y2: double);
procedure drawEllipse(x: Integer; y: Integer; w: Integer; h: Integer);
procedure drawPixmap(p: PQtPoint; pm: QPixmapH; sr: PRect);
procedure drawPolyLine(P: PPoint; NumPts: Integer);
@ -2790,6 +2792,16 @@ begin
QPen_setWidthF(QPainter_pen(Widget), PW);
end;
procedure TQtDeviceContext.drawRectF(x1: double; y1: double; w: double;
h: double);
var
R: QRectFH;
begin
R := QRectF_Create(x1 + 0.5, y1 + 0.5, w, h);
QPainter_drawRect(Widget, R);
QRectF_Destroy(R);
end;
procedure TQtDeviceContext.drawRoundRect(x, y, w, h, rx, ry: Integer);
begin
QPainter_drawRoundedRect(Widget, x, y, w, h, rx, ry);
@ -2930,6 +2942,18 @@ begin
QPainter_drawLine(Widget, x1, y1, x2, y2);
end;
procedure TQtDeviceContext.drawLineF(x1: double; y1: double; x2: double;
y2: double);
var
APt1, APt2: TQtPointF;
begin
APt1.x := x1 + 0.5;
APt1.y := y1 + 0.5;
APt2.x := x2 + 0.5;
APt2.y := y2 + 0.5;
QPainter_drawLine(Widget, PQtPointF(@APt1), PQtPointF(@APt2));
end;
{------------------------------------------------------------------------------
Function: TQtDeviceContext.drawEllipse
Params: None

10
lcl/interfaces/qt/qtwinapi.inc
View File

@ -5106,7 +5106,10 @@ begin
LastPos := Point(X, Y);
if TQtDeviceContext(DC).pen.getCosmetic then
LastPos := TQtDeviceContext(DC).GetLineLastPixelPos(PenPos, LastPos);
TQtDeviceContext(DC).drawLine(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y);
if QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
TQtDeviceContext(DC).drawLineF(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y)
else
TQtDeviceContext(DC).drawLine(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y);
MoveToEx(DC, X, Y, nil);
Result := True;
@ -5515,7 +5518,10 @@ begin
(QPaintEngine_type(TQtDeviceContext(DC).PaintEngine) = QPaintEngineRaster) and
QPen_isCosmetic(QPainter_pen(TQtDeviceContext(DC).Widget));
TQtDeviceContext(DC).drawRect(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1, B);
if QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
TQtDeviceContext(DC).drawRectF(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1)
else
TQtDeviceContext(DC).drawRect(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1, B);
Result := True;
end;

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

@ -425,10 +425,12 @@ type
procedure drawPoint(x1: Integer; y1: Integer);
procedure drawRect(x1: Integer; y1: Integer; w: Integer; h: Integer);
procedure drawRectF(x1: double; y1: double; w: double; h: double);
procedure drawRoundRect(x, y, w, h, rx, ry: Integer);
procedure drawText(x: Integer; y: Integer; s: PWideString); overload;
procedure drawText(x,y,w,h,flags: Integer; s:PWideString); overload;
procedure drawLine(x1: Integer; y1: Integer; x2: Integer; y2: Integer);
procedure drawLineF(x1: double; y1: double; x2: double; y2: double);
procedure drawEllipse(x: Integer; y: Integer; w: Integer; h: Integer);
procedure drawPixmap(p: PQtPoint; pm: QPixmapH; sr: PRect);
procedure drawPolyLine(P: PPoint; NumPts: Integer);
@ -2786,6 +2788,16 @@ begin
QPainter_drawRect(Widget, x1, y1, w, h);
end;
procedure TQtDeviceContext.drawRectF(x1: double; y1: double; w: double;
h: double);
var
R: QRectFH;
begin
R := QRectF_Create(x1 + 0.5, y1 + 0.5, w, h);
QPainter_drawRect(Widget, R);
QRectF_Destroy(R);
end;
procedure TQtDeviceContext.drawRoundRect(x, y, w, h, rx, ry: Integer);
begin
QPainter_drawRoundedRect(Widget, x, y, w, h, rx, ry);
@ -2900,6 +2912,18 @@ begin
QPainter_drawLine(Widget, x1, y1, x2, y2);
end;
procedure TQtDeviceContext.drawLineF(x1: double; y1: double; x2: double;
y2: double);
var
APt1, APt2: TQtPointF;
begin
APt1.x := x1 + 0.5;
APt1.y := y1 + 0.5;
APt2.x := x2 + 0.5;
APt2.y := y2 + 0.5;
QPainter_drawLine(Widget, PQtPointF(@APt1), PQtPointF(@APt2));
end;
{------------------------------------------------------------------------------
Function: TQtDeviceContext.drawEllipse
Params: None

11
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -5049,7 +5049,10 @@ begin
LastPos := Point(X, Y);
if TQtDeviceContext(DC).pen.getCosmetic then
LastPos := TQtDeviceContext(DC).GetLineLastPixelPos(PenPos, LastPos);
TQtDeviceContext(DC).drawLine(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y);
if QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
TQtDeviceContext(DC).drawLineF(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y)
else
TQtDeviceContext(DC).drawLine(PenPos.X, PenPos.Y, LastPos.X, LastPos.Y);
MoveToEx(DC, X, Y, nil);
Result := True;
@ -5461,8 +5464,10 @@ begin
R := NormalizeRect(Rect(X1, Y1, X2, Y2));
if IsRectEmpty(R) then Exit(True);
TQtDeviceContext(DC).drawRect(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1);
if QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
TQtDeviceContext(DC).drawRectF(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1)
else
TQtDeviceContext(DC).drawRect(R.Left, R.Top, R.Right - R.Left - 1, R.Bottom - R.Top - 1);
Result := True;
end;