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

rearrange a bit

This commit is contained in:
Peter Hartmann 2022-01-12 10:59:30 +01:00
parent 078456653f
commit 9e77b21cab
2 changed files with 74 additions and 31 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, gradient3, gradient3, gradient3 ); box->setBorderGradients( gradient1, gradient2, gradient1, gradient3 );
box->setShape( 30, Qt::AbsoluteSize ); box->setShape( 30, Qt::AbsoluteSize );
} }

103
src/nodes/QskBoxRendererEllipse.cpp
View File

@ -556,6 +556,8 @@ namespace
auto s = gradient.stops(); auto s = gradient.stops();
qDebug() << "adding" << additionalStopCount << "stops";
for( int l = 1; l <= additionalStopCount; ++l ) for( int l = 1; l <= additionalStopCount; ++l )
{ {
auto p = s.at( l ).position(); auto p = s.at( l ).position();
@ -564,10 +566,9 @@ namespace
xEnd = x12 + p * ( x22 - x12 ), xEnd = x12 + p * ( x22 - x12 ),
yEnd = y12 + p * ( y22 - y12 ); yEnd = y12 + p * ( y22 - y12 );
qDebug() << "start:" << x11 << y11 << x12 << y12; qDebug() << " start:" << x11 << y11 << x12 << y12;
qDebug() << "end:" << x21 << y21 << x22 << y22; qDebug() << " end:" << x21 << y21 << x22 << y22;
qDebug() << "here set line for stop" << s.at( l ) qDebug() << " gradient stop:" << xStart << yStart << xEnd << yEnd;
<< "and line number" << l << xStart << yStart << xEnd << yEnd;
lines[ l ].setLine( xStart, yStart, xEnd, yEnd, s.at( l ).color() ); lines[ l ].setLine( xStart, yStart, xEnd, yEnd, s.at( l ).color() );
} }
@ -660,32 +661,6 @@ namespace
// } // }
} }
if( j == numCornerLines - 1 )
{
// we are at the end of the loop and can add additional
// stops for border gradients:
int additionalStopCount = additionalGradientStops( borderMapTL.gradient() );
if( additionalStopCount > 0 )
{
auto stops = borderMapTL.gradient().stops();
float x1TL = c[ TopLeft ].centerX - v.dx1( TopLeft ),
y1TL = c[ TopLeft ].centerY - v.dy1( TopLeft ),
x2TL = c[ TopLeft ].centerX - v.dx2( TopLeft ),
y2TL = c[ TopLeft ].centerY - v.dy2( TopLeft ),
x1BL = c[ BottomLeft ].centerX - v.dx1( BottomLeft ),
y1BL = c[ BottomLeft ].centerY + v.dy1( BottomLeft ),
x2BL = c[ BottomLeft ].centerX - v.dx2( BottomLeft ),
y2BL = c[ BottomLeft ].centerY + v.dy2( BottomLeft );
addAdditionalLines( x1TL, y1TL, x2TL, y2TL, x1BL, y1BL, x2BL, y2BL,
borderMapTL.gradient(), linesTL + j );
}
}
{ {
constexpr auto corner = TopRight; constexpr auto corner = TopRight;
@ -736,6 +711,74 @@ namespace
c[ corner ].centerY + v.dy2( corner ), c[ corner ].centerY + v.dy2( corner ),
borderMapBR.colorAt( j ) ); borderMapBR.colorAt( j ) );
} }
// at the beginning and end of the loop we can add
// additional lines for border gradients:
if( j == 0 )
{
if( additionalGradientStops( borderMapTR.gradient() ) > 0 )
{
auto stops = borderMapTR.gradient().stops();
float x1TR = c[ TopRight ].centerX + v.dx1( TopRight ),
y1TR = c[ TopRight ].centerY - v.dy1( TopRight ),
x2TR = c[ TopRight ].centerX + v.dx2( TopRight ),
y2TR = c[ TopRight ].centerY - v.dy2( TopRight ),
x1TL = c[ TopLeft ].centerX - v.dx1( TopLeft ),
y1TL = c[ TopLeft ].centerY - v.dy1( TopLeft ),
x2TL = c[ TopLeft ].centerX - v.dx2( TopLeft ),
y2TL = c[ TopLeft ].centerY - v.dy2( TopLeft );
qDebug() << "top:" << j << k;
addAdditionalLines( x1TR, y1TR, x2TR, y2TR, x1TL, y1TL, x2TL, y2TL,
borderMapTR.gradient(), linesTR + k );
}
}
if( j == numCornerLines - 1 )
{
if( additionalGradientStops( borderMapTL.gradient() ) > 0 )
{
auto stops = borderMapTL.gradient().stops();
// ### this can be simplified?
float x1TL = c[ TopLeft ].centerX - v.dx1( TopLeft ),
y1TL = c[ TopLeft ].centerY - v.dy1( TopLeft ),
x2TL = c[ TopLeft ].centerX - v.dx2( TopLeft ),
y2TL = c[ TopLeft ].centerY - v.dy2( TopLeft ),
x1BL = c[ BottomLeft ].centerX - v.dx1( BottomLeft ),
y1BL = c[ BottomLeft ].centerY + v.dy1( BottomLeft ),
x2BL = c[ BottomLeft ].centerX - v.dx2( BottomLeft ),
y2BL = c[ BottomLeft ].centerY + v.dy2( BottomLeft );
qDebug() << "left:" << j << k;
addAdditionalLines( x1TL, y1TL, x2TL, y2TL, x1BL, y1BL, x2BL, y2BL,
borderMapTL.gradient(), linesTL + j );
}
if( additionalGradientStops( borderMapBR.gradient() ) > 0 )
{
auto stops = borderMapBR.gradient().stops();
// ### this can be simplified?
float x1BR = c[ BottomRight ].centerX + v.dx1( BottomRight ),
y1BR = c[ BottomRight ].centerY + v.dy1( BottomRight ),
x2BR = c[ BottomRight ].centerX + v.dx2( BottomRight ),
y2BR = c[ BottomRight ].centerY + v.dy2( BottomRight ),
x1TR = c[ TopRight ].centerX + v.dx1( TopRight ),
y1TR = c[ TopRight ].centerY - v.dy1( TopRight ),
x2TR = c[ TopRight ].centerX + v.dx2( TopRight ),
y2TR = c[ TopRight ].centerY - v.dy2( TopRight );
qDebug() << "right:" << j << k;
addAdditionalLines( x1BR, y1BR, x2BR, y2BR, x1TR, y1TR, x2TR, y2TR,
borderMapBR.gradient(), linesBR + j );
}
}
} }
if ( fillLines ) if ( fillLines )