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

interpolating colors improved

Browse Source
This commit is contained in:
Uwe Rathmann 2019-01-04 11:53:16 +01:00
parent 738695031b
commit 14444fc1fd
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/QskRgbValue.cpp
View File

@ -79,13 +79,30 @@ QRgb QskRgbValue::interpolated( QRgb rgb1, QRgb rgb2, qreal ratio )
QColor QskRgbValue::interpolated( const QColor& c1, const QColor& c2, qreal ratio ) QColor QskRgbValue::interpolated( const QColor& c1, const QColor& c2, qreal ratio )
{ {
if ( c1 != c2 && c1.isValid() && c2.isValid() ) if ( c1 == c2 )
return c2;
/*
If one of the colors is invalid we treat it like
a transparent version of the other color
*/
if ( !c1.isValid() )
{ {
if ( c1.spec() == c2.spec() ) QColor c = c2;
return qskInterpolatedColor( c1, c2, ratio ); c.setAlpha( ratio * c2.alpha() );
else return c;
return qskInterpolatedColor( c1.convertTo( c2.spec() ), c2, ratio );
} }
return c2; if ( !c2.isValid() )
{
QColor c = c1;
c.setAlpha( ( 1.0 - ratio ) * c1.alpha() );
return c;
}
if ( c1.spec() == c2.spec() )
return qskInterpolatedColor( c1, c2, ratio );
else
return qskInterpolatedColor( c1.convertTo( c2.spec() ), c2, ratio );
} }