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

bad hash value calculation of QskBoxNode fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2017-09-03 14:55:21 +02:00
parent b03ee5b11d
commit 1866ecb2f3
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nodes/QskBoxNode.cpp
View File

@ -23,7 +23,7 @@ static inline uint qskMetricsHash( const QskBoxOptions& options )
QSizeF radius[4]; QSizeF radius[4];
for ( int i = 0; i < 4; i++ ) for ( int i = 0; i < 4; i++ )
radius[i] = m.radius( static_cast<Qt::Corner>( i ) ); radius[i] = m.radius( static_cast< Qt::Corner >( i ) );
hash = qHashBits( radius, sizeof( radius ), hash ); hash = qHashBits( radius, sizeof( radius ), hash );
@ -39,14 +39,16 @@ static inline uint qskColorsHash( const QskBoxOptions& options )
const auto& colors = options.colors; const auto& colors = options.colors;
QRgb rgb[8]; QRgb rgb[8];
for ( int i = 0; i < 4; i++ )
{
const QColor c1 = colors.borderColor( static_cast< Qt::Edge >( i ) );
rgb[i] = c1.isValid() ? c1.rgba() : 0;
const QColor c2 = colors.fillColor( static_cast< Qt::Corner >( i ) ); rgb[0] = colors.borderColor( Qt::TopEdge ).rgba();
rgb[2*i] = c2.isValid() ? c2.rgba() : 0; rgb[1] = colors.borderColor( Qt::LeftEdge ).rgba();
} rgb[2] = colors.borderColor( Qt::RightEdge ).rgba();
rgb[3] = colors.borderColor( Qt::BottomEdge ).rgba();
rgb[4] = colors.fillColor( Qt::TopLeftCorner ).rgba();
rgb[5] = colors.fillColor( Qt::TopRightCorner ).rgba();
rgb[6] = colors.fillColor( Qt::BottomLeftCorner ).rgba();
rgb[7] = colors.fillColor( Qt::BottomRightCorner ).rgba();
return qHashBits( rgb, sizeof( rgb ), 17000 ); return qHashBits( rgb, sizeof( rgb ), 17000 );
} }