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

painting order for needle and box inverted

This commit is contained in:
Uwe Rathmann 2018-05-09 08:47:52 +02:00
parent c3cd365b68
commit 4c0aaa8ea2
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
examples/automotive/SpeedometerSkinlet.cpp
View File

@ -208,21 +208,31 @@ QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, Q
return ticksNode; return ticksNode;
} }
QSGNode* SpeedometerSkinlet::updateNeedleNode( const Speedometer* speedometer, QSGNode* node ) const QSGNode* SpeedometerSkinlet::updateNeedleNode(
const Speedometer* speedometer, QSGNode* node ) const
{ {
auto needleNode = static_cast< TicksNode* >( node );
if ( needleNode == nullptr )
needleNode = new TicksNode();
QskBoxNode* boxNode;
if ( needleNode->childCount() == 0 )
{
boxNode = new QskBoxNode();
needleNode->appendChildNode( boxNode );
}
else
{
boxNode = static_cast< QskBoxNode* >( needleNode->childAtIndex( 0 ) );
}
QMarginsF margins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin ); QMarginsF margins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin );
const QRectF panelRect = subControlRect( speedometer, Speedometer::Panel ).marginsRemoved( margins ); const QRectF panelRect = subControlRect( speedometer, Speedometer::Panel ).marginsRemoved( margins );
auto radius = speedometer->metric( Speedometer::NeedleHead | QskAspect::Size ); auto radius = speedometer->metric( Speedometer::NeedleHead | QskAspect::Size );
QPointF center = QPointF( panelRect.x() + panelRect.width() / 2, QPointF center = QPointF( panelRect.x() + panelRect.width() / 2,
panelRect.y() + panelRect.height() / 2 ); panelRect.y() + panelRect.height() / 2 );
auto boxNode = static_cast< QskBoxNode* >( node );
if( boxNode == nullptr )
{
boxNode = new QskBoxNode;
}
QskBoxShapeMetrics shapeMetrics( radius, radius, radius, radius ); QskBoxShapeMetrics shapeMetrics( radius, radius, radius, radius );
QskBoxBorderMetrics borderMetrics = speedometer->boxBorderMetricsHint( Speedometer::NeedleHead ); QskBoxBorderMetrics borderMetrics = speedometer->boxBorderMetricsHint( Speedometer::NeedleHead );
QskBoxBorderColors borderColors = speedometer->boxBorderColorsHint( Speedometer::NeedleHead ); QskBoxBorderColors borderColors = speedometer->boxBorderColorsHint( Speedometer::NeedleHead );
@ -231,17 +241,6 @@ QSGNode* SpeedometerSkinlet::updateNeedleNode( const Speedometer* speedometer, Q
2 * radius, 2 * radius ); 2 * radius, 2 * radius );
boxNode->setBoxData( centerNodeRect, shapeMetrics, borderMetrics, borderColors, gradient ); boxNode->setBoxData( centerNodeRect, shapeMetrics, borderMetrics, borderColors, gradient );
TicksNode* needleNode;
if ( boxNode->childCount() == 0 )
{
needleNode = new TicksNode();
}
else
{
needleNode = static_cast< TicksNode* >( boxNode->childAtIndex( 0 ) );
}
QColor color = speedometer->color( Speedometer::Needle ); QColor color = speedometer->color( Speedometer::Needle );
needleNode->setColor( color ); needleNode->setColor( color );
@ -277,12 +276,7 @@ QSGNode* SpeedometerSkinlet::updateNeedleNode( const Speedometer* speedometer, Q
needleNode->markDirty( QSGNode::DirtyGeometry ); needleNode->markDirty( QSGNode::DirtyGeometry );
if ( boxNode->childCount() == 0 ) return needleNode;
{
boxNode->appendChildNode( needleNode );
}
return boxNode;
} }
#include "moc_SpeedometerSkinlet.cpp" #include "moc_SpeedometerSkinlet.cpp"