paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 10:18:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt,Qt5: fixed antialiased paint of ellipse and poylgon. issue #35568 , issue #39416

Browse Source
This commit is contained in:
Željan Rikalo 2021-10-06 19:57:32 +02:00
parent 29fa1e508e
commit 26930d85c6
2 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1508,11 +1508,18 @@ end;
function TQtWidgetSet.Ellipse(DC: HDC; x1, y1, x2, y2: Integer): Boolean;
var
R: TRect;
APenWidthF: QReal;
ARectF: QRectFH;
begin
if not IsValidDC(DC) then Exit(False);
R := NormalizeRect(Rect(X1, Y1, X2, Y2));
if IsRectEmpty(R) then Exit(True);
TQtDeviceContext(DC).drawEllipse(R.Left, R.Top, R.Right - R.Left, R.Bottom - R.Top);
APenWidthF := QPen_widthF(QPainter_pen(TQtDeviceContext(DC).Widget));
if APenWidthF = 0 then
APenWidthF := 1;
ARectF := QRectF_Create(R.Left + (APenWidthF / 2), R.Top + (APenWidthF / 2), R.Right - R.Left - (APenWidthF / 2), R.Bottom - R.Top - (APenWidthF / 2));
QPainter_drawEllipse(TQtDeviceContext(DC).Widget, ARectF);
QRectF_destroy(ARectF);
Result := True;
end;
@ -5440,14 +5447,27 @@ begin
Result := IsValidDC(DC);
if Result then
begin
GetMem(QtPoints, NumPts * SizeOf(TQtPoint));
for i := 0 to NumPts - 1 do
QtPoints[i] := QtPoint(Points[i].x, Points[i].y);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtOddEvenFill);
FreeMem(QtPoints);
if QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
begin
GetMem(QtPointsF, NumPts * SizeOf(TQtPointF));
for i := 0 to NumPts - 1 do
QtPointsF[i] := QtPointF(QReal(Points[i].x) + 0.5, QReal(Points[i].y) + 0.5);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, PQtPointF(QtPointsF), NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, PQtPointF(QtPointsF), NumPts, QtOddEvenFill);
FreeMem(QtPointsF);
end else
begin
GetMem(QtPoints, NumPts * SizeOf(TQtPoint));
for i := 0 to NumPts - 1 do
QtPoints[i] := QtPoint(Points[i].x, Points[i].y);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtOddEvenFill);
FreeMem(QtPoints);
end;
end;
end;

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

@ -1471,12 +1471,18 @@ end;
function TQtWidgetSet.Ellipse(DC: HDC; x1, y1, x2, y2: Integer): Boolean;
var
R: TRect;
APenWidthF: QReal;
ARectF: QRectFH;
begin
if not IsValidDC(DC) then Exit(False);
R := NormalizeRect(Rect(X1, Y1, X2, Y2));
if IsRectEmpty(R) then Exit(True);
TQtDeviceContext(DC).drawEllipse(R.Left, R.Top, R.Right - R.Left, R.Bottom - R.Top{ - 1});
APenWidthF := QPen_widthF(QPainter_pen(TQtDeviceContext(DC).Widget));
if APenWidthF = 0 then
APenWidthF := 1;
ARectF := QRectF_Create(R.Left + (APenWidthF / 2), R.Top + (APenWidthF / 2), R.Right - R.Left - (APenWidthF / 2), R.Bottom - R.Top - (APenWidthF / 2));
QPainter_drawEllipse(TQtDeviceContext(DC).Widget, ARectF);
QRectF_destroy(ARectF);
Result := True;
end;
@ -5384,6 +5390,7 @@ function TQtWidgetSet.Polygon(DC: HDC; Points: PPoint; NumPts: Integer;
Winding: boolean): boolean;
var
QtPoints: PQtPoint;
QtPointsF: PQtPointF;
i: integer;
begin
{$ifdef VerboseQtWinAPI}
@ -5392,14 +5399,28 @@ begin
Result := IsValidDC(DC);
if Result then
begin
GetMem(QtPoints, NumPts * SizeOf(TQtPoint));
for i := 0 to NumPts - 1 do
QtPoints[i] := QtPoint(Points[i].x, Points[i].y);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtOddEvenFill);
FreeMem(QtPoints);
if (0 = 0) then // QPainter_testRenderHint(TQtDeviceContext(DC).Widget, QPainterAntialiasing) then
begin
GetMem(QtPointsF, NumPts * SizeOf(TQtPointF));
for i := 0 to NumPts - 1 do
QtPointsF[i] := QtPointF(QReal(Points[i].x) + 0.5, QReal(Points[i].y) + 0.5);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, PQtPointF(QtPointsF), NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, PQtPointF(QtPointsF), NumPts, QtOddEvenFill);
FreeMem(QtPointsF);
end else
begin
GetMem(QtPoints, NumPts * SizeOf(TQtPoint));
for i := 0 to NumPts - 1 do
QtPoints[i] := QtPoint(Points[i].x, Points[i].y);
if Winding then
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtWindingFill)
else
QPainter_drawPolygon(TQtDeviceContext(DC).Widget, QtPoints, NumPts, QtOddEvenFill);
FreeMem(QtPoints);
end;
end;
end;