method names cleaned up

This commit is contained in:
Uwe Rathmann 2023-01-10 15:36:43 +01:00
parent 4038f52cdf
commit 5ba34eb11c
3 changed files with 11 additions and 12 deletions

View File

@ -42,7 +42,7 @@ void QskBoxRenderer::renderBorder(
if ( shape.isRectangle() ) if ( shape.isRectangle() )
QskRectRenderer::renderBorder( rect, border, geometry ); QskRectRenderer::renderBorder( rect, border, geometry );
else else
QskRoundedRectRenderer::renderRectellipseBorder( rect, shape, border, geometry ); QskRoundedRectRenderer::renderBorder( rect, shape, border, geometry );
} }
void QskBoxRenderer::renderFill( void QskBoxRenderer::renderFill(
@ -52,7 +52,7 @@ void QskBoxRenderer::renderFill(
if ( shape.isRectangle() ) if ( shape.isRectangle() )
QskRectRenderer::renderFill( rect, border, geometry ); QskRectRenderer::renderFill( rect, border, geometry );
else else
QskRoundedRectRenderer::renderRectellipseFill( rect, shape, border, geometry ); QskRoundedRectRenderer::renderFill( rect, shape, border, geometry );
} }
void QskBoxRenderer::renderBox( const QRectF& rect, void QskBoxRenderer::renderBox( const QRectF& rect,
@ -69,7 +69,7 @@ void QskBoxRenderer::renderBox( const QRectF& rect,
} }
else else
{ {
QskRoundedRectRenderer::renderRectellipse( QskRoundedRectRenderer::renderRect(
rect, shape, border, borderColors, gradientN, geometry ); rect, shape, border, borderColors, gradientN, geometry );
} }
} }

View File

@ -1157,7 +1157,7 @@ QskRoundedRectRenderer::Metrics::Metrics( const QRectF& rect,
( borderRight == borderBottom ); ( borderRight == borderBottom );
} }
void QskRoundedRectRenderer::renderRectellipseBorder( void QskRoundedRectRenderer::renderBorder(
const QRectF& rect, const QskBoxShapeMetrics& shape, const QRectF& rect, const QskBoxShapeMetrics& shape,
const QskBoxBorderMetrics& border, QSGGeometry& geometry ) const QskBoxBorderMetrics& border, QSGGeometry& geometry )
{ {
@ -1176,7 +1176,7 @@ void QskRoundedRectRenderer::renderRectellipseBorder(
qskRenderBorderLines( metrics, Qt::Vertical, line, BorderMapNone() ); qskRenderBorderLines( metrics, Qt::Vertical, line, BorderMapNone() );
} }
void QskRoundedRectRenderer::renderRectellipseFill( void QskRoundedRectRenderer::renderFill(
const QRectF& rect, const QskBoxShapeMetrics& shape, const QRectF& rect, const QskBoxShapeMetrics& shape,
const QskBoxBorderMetrics& border, QSGGeometry& geometry ) const QskBoxBorderMetrics& border, QSGGeometry& geometry )
{ {
@ -1307,7 +1307,7 @@ void QskRoundedRectRenderer::renderRectellipseFill(
#endif #endif
} }
void QskRoundedRectRenderer::renderRectellipse( const QRectF& rect, void QskRoundedRectRenderer::renderRect( const QRectF& rect,
const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border,
const QskBoxBorderColors& borderColors, const QskGradient& gradient, const QskBoxBorderColors& borderColors, const QskGradient& gradient,
QSGGeometry& geometry ) QSGGeometry& geometry )

View File

@ -25,9 +25,7 @@ namespace QskRoundedRectRenderer
QskVertex::Quad outerQuad; QskVertex::Quad outerQuad;
QskVertex::Quad innerQuad; QskVertex::Quad innerQuad;
#if 1 QskVertex::Quad centerQuad;
QskVertex::Quad centerQuad; // to be removed
#endif
struct Corner struct Corner
{ {
@ -45,16 +43,17 @@ namespace QskRoundedRectRenderer
bool isTotallyCropped; bool isTotallyCropped;
}; };
void renderRectellipseFill( const QRectF&, void renderFill( const QRectF&,
const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& );
void renderRectellipseBorder( const QRectF&, void renderBorder( const QRectF&,
const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& );
void renderRectellipse( const QRectF&, void renderRect( const QRectF&,
const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&,
const QskBoxBorderColors&, const QskGradient&, QSGGeometry& ); const QskBoxBorderColors&, const QskGradient&, QSGGeometry& );
// QskBoxRendererDEllipse.cpp
void renderDiagonalFill( const Metrics&, const QskGradient&, void renderDiagonalFill( const Metrics&, const QskGradient&,
int lineCount, QskVertex::ColoredLine* ); int lineCount, QskVertex::ColoredLine* );
} }