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

now it works

This commit is contained in:
Peter Hartmann 2022-01-12 15:55:18 +01:00
parent 88fe651b52
commit c00b3ad84a
2 changed files with 4 additions and 53 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( gradient3, gradient3, gradient3, gradient1 ); box->setBorderGradients( gradient1, gradient2, gradient3, gradient1 );
box->setShape( 30, Qt::AbsoluteSize ); box->setShape( 30, Qt::AbsoluteSize );
} }

55
src/nodes/QskBoxRendererEllipse.cpp
View File

@ -560,7 +560,7 @@ namespace
for( int l = 1; l <= additionalStopCount; ++l ) for( int l = 1; l <= additionalStopCount; ++l )
{ {
auto p = s.at( l ).position(); auto p = ( 1 - s.at( l ).position() );
float xStart = x11 + p * ( x21 - x11 ), float xStart = x11 + p * ( x21 - x11 ),
yStart = y11 + p * ( y21 - y11 ), yStart = y11 + p * ( y21 - y11 ),
xEnd = x12 + p * ( x22 - x12 ), xEnd = x12 + p * ( x22 - x12 ),
@ -600,12 +600,6 @@ namespace
linesTR = linesBR + numCornerLines + additionalGradientStops( borderMapBR.gradient() ); linesTR = linesBR + numCornerLines + additionalGradientStops( borderMapBR.gradient() );
linesTL = linesTR + numCornerLines + additionalGradientStops( borderMapTR.gradient() ); linesTL = linesTR + numCornerLines + additionalGradientStops( borderMapTR.gradient() );
linesBL = linesTL + numCornerLines + additionalGradientStops( borderMapTL.gradient() ); linesBL = linesTL + numCornerLines + additionalGradientStops( borderMapTL.gradient() );
qDebug() << "total additional lines:" << additionalGradientStops( borderMapBR.gradient() )
<< additionalGradientStops( borderMapTR.gradient() )
<< additionalGradientStops( borderMapTL.gradient() )
<< additionalGradientStops( borderMapBL.gradient() )
<< "corner lines:" << numCornerLines;
} }
if ( fillLines ) if ( fillLines )
@ -655,16 +649,6 @@ namespace
c[ corner ].centerX - v.dx2( corner ), c[ corner ].centerX - v.dx2( corner ),
c[ corner ].centerY - v.dy2( corner ), c[ corner ].centerY - v.dy2( corner ),
borderMapTL.colorAt( j ) ); borderMapTL.colorAt( j ) );
// Color( 255, 0, 0, 255 ) );
// if(j==0)
// {
// qDebug() << "TL first coordinates:" <<
// c[ corner ].centerX - v.dx1( corner ) <<
// c[ corner ].centerY - v.dy1( corner ) <<
// c[ corner ].centerX - v.dx2( corner ) <<
// c[ corner ].centerY - v.dy2( corner );
// }
} }
{ {
@ -687,37 +671,11 @@ namespace
c[ corner ].centerX - v.dx2( corner ), c[ corner ].centerX - v.dx2( corner ),
c[ corner ].centerY + v.dy2( corner ), c[ corner ].centerY + v.dy2( corner ),
borderMapBL.colorAt( k ) ); borderMapBL.colorAt( k ) );
// Color( 255, 255, 0, 255 ) );
// if(j==0)
// {
// qDebug() << "BL first coordinates:" <<
// c[ corner ].centerX - v.dx1( corner ) <<
// c[ corner ].centerY + v.dy1( corner ) <<
// c[ corner ].centerX - v.dx2( corner ) <<
// c[ corner ].centerY + v.dy2( corner );
// }
// if( j == numCornerLines - 1 )
// {
// qDebug() << "BL last coordinates:" <<
// c[ corner ].centerX - v.dx1( corner ) <<
// c[ corner ].centerY + v.dy1( corner ) <<
// c[ corner ].centerX - v.dx2( corner ) <<
// c[ corner ].centerY + v.dy2( corner );
// }
} }
{ {
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 ),
@ -767,8 +725,6 @@ 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 ] = borderLines[0];
} }
} }
@ -868,15 +824,10 @@ namespace
+ additionalGradientStops( borderMapBL.gradient() ); + additionalGradientStops( borderMapBL.gradient() );
const int k = 4 * numCornerLines + additionalStops; const int k = 4 * numCornerLines + additionalStops;
qDebug() << "presumed last line no:" << k;
if ( orientation == Qt::Vertical ) if ( orientation == Qt::Vertical )
{
borderLines[ k ] = borderLines[ 0 ]; borderLines[ k ] = borderLines[ 0 ];
qDebug() << "setting line" << k << "to line 0"; else
} borderLines[ 0 ] = borderLines[ k ];
// else
// borderLines[ 0 ] = borderLines[ k ];
} }
#endif #endif
} }