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

still off, but seems like we need an additional line

This commit is contained in:
Peter Hartmann 2022-01-12 14:26:08 +01:00
parent c7aec57838
commit c46fdfc67a
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/boxes/main.cpp
View File

@ -421,7 +421,7 @@ static void addColoredBorderRectangles6( QskLinearBox* parent )
{ 1.0, Qt::black } } ); { 1.0, Qt::black } } );
QskGradient gradient3( Qt::green ); QskGradient gradient3( Qt::green );
QskGradient gradient4( Qt::Vertical, Qt::red, Qt::blue ); QskGradient gradient4( Qt::Vertical, Qt::red, Qt::blue );
box->setBorderGradients( gradient1, gradient2, gradient1, gradient1 ); box->setBorderGradients( gradient3, gradient3, gradient3, gradient1 );
box->setShape( 30, Qt::AbsoluteSize ); box->setShape( 30, Qt::AbsoluteSize );
} }

33
src/nodes/QskBoxRendererEllipse.cpp
View File

@ -704,6 +704,14 @@ namespace
{ {
constexpr auto corner = BottomRight; constexpr auto corner = BottomRight;
if(j==0)
qDebug() << "first line:" <<
c[ corner ].centerX + v.dx1( corner ) <<
c[ corner ].centerY + v.dy1( corner ) <<
c[ corner ].centerX + v.dx2( corner ) <<
c[ corner ].centerY + v.dy2( corner ) <<
borderMapBR.colorAt( j );
linesBR[ j ].setLine( linesBR[ j ].setLine(
c[ corner ].centerX + v.dx1( corner ), c[ corner ].centerX + v.dx1( corner ),
c[ corner ].centerY + v.dy1( corner ), c[ corner ].centerY + v.dy1( corner ),
@ -753,6 +761,8 @@ namespace
qDebug() << "bottom:" << j << k; qDebug() << "bottom:" << j << k;
addAdditionalLines( x1BL, y1BL, x2BL, y2BL, x1BR, y1BR, x2BR, y2BR, addAdditionalLines( x1BL, y1BL, x2BL, y2BL, x1BR, y1BR, x2BR, y2BR,
borderMapBL.gradient(), linesBL + k ); borderMapBL.gradient(), linesBL + k );
// ###:
linesBL[ k + 2 ].setLine( x1BR, y1BR, x2BR, y2BR, borderMapBR.colorAt( j ) );
} }
} }
@ -844,15 +854,18 @@ namespace
} }
#if 1 #if 1
if ( borderLines ) // if ( borderLines )
{ // {
const int k = 4 * numCornerLines; // const int k = 4 * numCornerLines;
if ( orientation == Qt::Vertical ) // if ( orientation == Qt::Vertical )
borderLines[ k ] = borderLines[ 0 ]; // {
else // borderLines[ k ] = borderLines[ 0 ];
borderLines[ 0 ] = borderLines[ k ]; // qDebug() << "setting line" << k << "to line 0";
} // }
// else
// borderLines[ 0 ] = borderLines[ k ];
// }
#endif #endif
} }
@ -1372,13 +1385,15 @@ void QskBoxRenderer::renderRectellipse( const QRectF& rect,
{ {
borderLineCount = 4 * ( stepCount + 1 ) + 1; borderLineCount = 4 * ( stepCount + 1 ) + 1;
const int additionalLines = qMax( 0, -1 const int additionalLines = qMax( 0, 0
+ additionalGradientStops( borderColors.gradient( Qsk::Left ) ) + additionalGradientStops( borderColors.gradient( Qsk::Left ) )
+ additionalGradientStops( borderColors.gradient( Qsk::Top ) ) + additionalGradientStops( borderColors.gradient( Qsk::Top ) )
+ additionalGradientStops( borderColors.gradient( Qsk::Right ) ) + additionalGradientStops( borderColors.gradient( Qsk::Right ) )
+ additionalGradientStops( borderColors.gradient( Qsk::Bottom ) ) ); + additionalGradientStops( borderColors.gradient( Qsk::Bottom ) ) );
borderLineCount += additionalLines; borderLineCount += additionalLines;
qDebug() << "additional lines:" << additionalLines;
} }
int lineCount = borderLineCount + fillLineCount; int lineCount = borderLineCount + fillLineCount;