peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arcPath fixed to match conic gradients for ellipsoid arcs

Browse Source
This commit is contained in:
Uwe Rathmann 2023-04-18 16:11:04 +02:00
parent 9e99735d2f
commit c9063fd87e
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/nodes/QskArcRenderer.cpp
View File

@ -12,23 +12,39 @@
static inline QPainterPath qskArcPath( static inline QPainterPath qskArcPath(
const QRectF& rect, const QskArcMetrics& metrics ) const QRectF& rect, const QskArcMetrics& metrics )
{ {
const auto rx = 0.5 * rect.width(); const auto sz = qMin( rect.width(), rect.height() );
const auto ry = 0.5 * rect.height(); if ( sz <= 0.0 )
return QPainterPath();
const auto m = metrics.toAbsolute( rx, ry ); const auto m = metrics.toAbsolute( 0.5 * sz );
const qreal t2 = 0.5 * m.thickness(); const auto tx = m.thickness() * rect.width() / sz;
const auto r = rect.adjusted( t2, t2, -t2, -t2 ); const auto ty = m.thickness() * rect.height() / sz;
const auto innerRect = rect.adjusted( tx, ty, -tx, -ty );
const auto angle = m.startAngle();
const auto span = m.spanAngle();
QPainterPath path; QPainterPath path;
path.arcMoveTo( r, m.startAngle() );
path.arcTo( r, m.startAngle(), m.spanAngle() );
QPainterPathStroker stroker; /*
stroker.setWidth( m.thickness() ); We need the end point of the inner arc to add the line that connects
stroker.setCapStyle( Qt::FlatCap ); the inner/outer arcs. As QPainterPath does not offer such a method
we insert a dummy arcMoveTo and grab the calculated position.
*/
path.arcMoveTo( innerRect, angle + span );
const auto pos = path.currentPosition();
return stroker.createStroke( path ); path.arcMoveTo( rect, angle ); // replaces the dummy arcMoveTo above
path.arcTo( rect, angle, span );
path.lineTo( pos );
path.arcTo( innerRect, angle + span, -span );
path.closeSubpath();
return path;
} }
static inline QRectF qskArcRect( static inline QRectF qskArcRect(