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

using QRgb instead of QColor

Browse Source
This commit is contained in:
Uwe Rathmann 2022-11-14 09:01:07 +01:00
parent 688c7881b2
commit 70f4d28285
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodes/QskBoxRendererColorMap.h
View File

@ -155,13 +155,13 @@ namespace QskVertex
{ {
if ( stops.first().position() > 0.0 ) if ( stops.first().position() > 0.0 )
{ {
m_color1 = m_color2 = stops[ 0 ].color(); m_color1 = m_color2 = stops[ 0 ].rgb();
m_index = 0; m_index = 0;
} }
else else
{ {
m_color1 = stops[ 0 ].color(); m_color1 = stops[ 0 ].rgb();
m_color2 = stops[ 1 ].color(); m_color2 = stops[ 1 ].rgb();
m_index = 1; m_index = 1;
} }
@ -206,7 +206,7 @@ namespace QskVertex
{ {
const auto& stop = m_stops[ m_index ]; const auto& stop = m_stops[ m_index ];
m_color2 = stop.color(); m_color2 = stop.rgb();
m_valueStep2 = valueAt( stop.position() ); m_valueStep2 = valueAt( stop.position() );
} }

2
src/nodes/QskBoxRendererEllipse.cpp
View File

@ -558,7 +558,7 @@ namespace
const float x2 = x12 + pos * dx2; const float x2 = x12 + pos * dx2;
const float y2 = y12 + pos * dy2; const float y2 = y12 + pos * dy2;
line->setLine( x1, y1, x2, y2, stop.color() ); line->setLine( x1, y1, x2, y2, stop.rgb() );
} }
void addAdditionalLines( void addAdditionalLines(

24
src/nodes/QskBoxRendererRect.cpp
View File

@ -425,7 +425,7 @@ static inline void qskCreateBorder(
if ( stops.first().position() > 0.0 ) if ( stops.first().position() > 0.0 )
{ {
( line++ )->setLine( in.right, in.bottom, ( line++ )->setLine( in.right, in.bottom,
out.right, out.bottom, stops.first().color() ); out.right, out.bottom, stops.first().rgb() );
} }
for( const auto& stop : stops ) for( const auto& stop : stops )
@ -433,13 +433,13 @@ static inline void qskCreateBorder(
const qreal x1 = in.right - stop.position() * dx1; const qreal x1 = in.right - stop.position() * dx1;
const qreal x2 = out.right - stop.position() * dx2; const qreal x2 = out.right - stop.position() * dx2;
( line++ )->setLine( x1, in.bottom, x2, out.bottom, stop.color() ); ( line++ )->setLine( x1, in.bottom, x2, out.bottom, stop.rgb() );
} }
if ( stops.last().position() < 1.0 ) if ( stops.last().position() < 1.0 )
{ {
( line++ )->setLine( in.left, in.bottom, ( line++ )->setLine( in.left, in.bottom,
out.left, out.bottom, stops.last().color() ); out.left, out.bottom, stops.last().rgb() );
} }
} }
@ -449,7 +449,7 @@ static inline void qskCreateBorder(
if ( stops.first().position() > 0.0 ) if ( stops.first().position() > 0.0 )
{ {
( line++ )->setLine( in.left, in.bottom, ( line++ )->setLine( in.left, in.bottom,
out.left, out.bottom, stops.first().color() ); out.left, out.bottom, stops.first().rgb() );
} }
for( const auto& stop : stops ) for( const auto& stop : stops )
@ -457,13 +457,13 @@ static inline void qskCreateBorder(
const qreal y1 = in.bottom + stop.position() * dy1; const qreal y1 = in.bottom + stop.position() * dy1;
const qreal y2 = out.bottom + stop.position() * dy2; const qreal y2 = out.bottom + stop.position() * dy2;
( line++ )->setLine( in.left, y1, out.left, y2, stop.color() ); ( line++ )->setLine( in.left, y1, out.left, y2, stop.rgb() );
} }
if ( stops.last().position() < 1.0 ) if ( stops.last().position() < 1.0 )
{ {
( line++ )->setLine( in.left, in.top, ( line++ )->setLine( in.left, in.top,
out.left, out.top, stops.last().color() ); out.left, out.top, stops.last().rgb() );
} }
} }
@ -473,7 +473,7 @@ static inline void qskCreateBorder(
if ( stops.first().position() > 0.0 ) if ( stops.first().position() > 0.0 )
{ {
( line++ )->setLine( in.left, in.top, ( line++ )->setLine( in.left, in.top,
out.left, out.top, stops.first().color() ); out.left, out.top, stops.first().rgb() );
} }
for( const auto& stop : stops ) for( const auto& stop : stops )
@ -481,13 +481,13 @@ static inline void qskCreateBorder(
const qreal x1 = in.left + stop.position() * dx1; const qreal x1 = in.left + stop.position() * dx1;
const qreal x2 = out.left + stop.position() * dx2; const qreal x2 = out.left + stop.position() * dx2;
( line++ )->setLine( x1, in.top, x2, out.top, stop.color() ); ( line++ )->setLine( x1, in.top, x2, out.top, stop.rgb() );
} }
if ( stops.last().position() < 1.0 ) if ( stops.last().position() < 1.0 )
{ {
( line++ )->setLine( in.right, in.top, ( line++ )->setLine( in.right, in.top,
out.right, out.top, stops.last().color() ); out.right, out.top, stops.last().rgb() );
} }
} }
@ -497,7 +497,7 @@ static inline void qskCreateBorder(
if ( stops.first().position() > 0.0 ) if ( stops.first().position() > 0.0 )
{ {
( line++ )->setLine( in.right, in.top, ( line++ )->setLine( in.right, in.top,
out.right, out.top, stops.first().color() ); out.right, out.top, stops.first().rgb() );
} }
for( const auto& stop : stops ) for( const auto& stop : stops )
@ -505,13 +505,13 @@ static inline void qskCreateBorder(
const qreal y1 = in.bottom + ( 1 - stop.position() ) * dy1; const qreal y1 = in.bottom + ( 1 - stop.position() ) * dy1;
const qreal y2 = out.bottom + ( 1 - stop.position() ) * dy2; const qreal y2 = out.bottom + ( 1 - stop.position() ) * dy2;
( line++ )->setLine( in.right, y1, out.right, y2, stop.color() ); ( line++ )->setLine( in.right, y1, out.right, y2, stop.rgb() );
} }
if ( stops.last().position() < 1.0 ) if ( stops.last().position() < 1.0 )
{ {
( line++ )->setLine( in.right, in.bottom, ( line++ )->setLine( in.right, in.bottom,
out.right, out.bottom, stops.last().color() ); out.right, out.bottom, stops.last().rgb() );
} }
} }
} }