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

Revert "We don't need this commit either" 

This reverts commit 2dc38064f7fee1d0505262fe5cebcf9e1fb16cea.
This commit is contained in:
Peter Hartmann 2021-12-15 15:52:17 +01:00
parent c16eaa48bd
commit 7cbd5d8cb8
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/nodes/QskBoxRendererColorMap.h
View File

@ -44,34 +44,20 @@ namespace QskVertex
class ColorMapGradient
{
public:
inline ColorMapGradient( const QskGradient& gradient )
: m_gradient( gradient )
inline ColorMapGradient( Color color1, Color color2 )
: m_color1( color1 )
, m_color2( color2 )
{
}
inline Color colorAt( qreal ratio ) const
inline Color colorAt( qreal value ) const
{
const auto stops = m_gradient.stops();
for( int i = 0; i < m_gradient.stopCount(); ++i )
{
const QskGradientStop stop = stops.at( i );
if( stop.position() >= ratio )
{
const int start = ( i == 0 ) ? 0 : i - 1;
const int end = ( i == 0 ) ? 1 : i;
const QColor color = QskGradientStop::interpolated( stops.at( start ),
stops.at( end ), ratio );
return Color( color );
}
}
return Color();
return m_color1.interpolatedTo( m_color2, value );
}
private:
const QskGradient m_gradient;
const Color m_color1;
const Color m_color2;
};
class ColorIterator

6
src/nodes/QskBoxRendererEllipse.cpp
View File

@ -902,7 +902,7 @@ static inline void qskRenderFillRandom(
}
else
{
const ColorMapGradient map( gradient );
const ColorMapGradient map( gradient.startColor(), gradient.endColor() );
qskRenderFillLines( metrics, orientation, line, map );
}
}
@ -926,7 +926,7 @@ static inline void qskRenderBoxRandom(
{
const auto orientation = qskQtOrientation( gradient );
const ColorMapGradient fillMap( gradient );
const ColorMapGradient fillMap( gradient.startColor(), gradient.endColor() );
qskRenderLines( metrics, orientation, borderLine, borderMap, fillLine, fillMap );
}
}
@ -948,7 +948,7 @@ static inline void qskRenderBoxRandom(
{
const auto orientation = qskQtOrientation( gradient );
const ColorMapGradient fillMap( gradient );
const ColorMapGradient fillMap( gradient.startColor(), gradient.endColor() );
qskRenderLines( metrics, orientation, borderLine, tl, tr, bl, br, fillLine, fillMap );
}
}

2
src/nodes/QskBoxRendererRect.cpp
View File

@ -604,7 +604,7 @@ void QskBoxRenderer::renderRect(
if ( fillRandom )
{
const ColorMapGradient colorMap( { Qt::Vertical, gd.startColor(), gd.endColor() } );
const ColorMapGradient colorMap( gd.startColor(), gd.endColor() );
qskCreateFillRandom( gd.orientation(), in, colorMap, line );
}
else