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

more variations of updateBoxNode

Browse Source
This commit is contained in:
Uwe Rathmann 2020-07-31 07:40:33 +02:00
parent 97b1c7167d
commit 1e6f1c810b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/controls/QskSkinlet.cpp
View File

@ -241,11 +241,11 @@ void QskSkinlet::updateNode( QskSkinnable* skinnable, QSGNode* parentNode ) cons
QSGNode* QskSkinlet::updateBackgroundNode( QSGNode* QskSkinlet::updateBackgroundNode(
const QskControl* control, QSGNode* node ) const const QskControl* control, QSGNode* node ) const
{ {
const QRectF rect = control->rect(); const auto rect = control->rect();
if ( rect.isEmpty() ) if ( rect.isEmpty() )
return nullptr; return nullptr;
const QskGradient gradient = control->background(); const auto gradient = control->background();
if ( !gradient.isValid() ) if ( !gradient.isValid() )
return nullptr; return nullptr;
@ -265,7 +265,7 @@ QSGNode* QskSkinlet::updateDebugNode(
return nullptr; return nullptr;
} }
QSGSimpleRectNode* rectNode = static_cast< QSGSimpleRectNode* >( node ); auto rectNode = static_cast< QSGSimpleRectNode* >( node );
if ( rectNode == nullptr ) if ( rectNode == nullptr )
{ {
rectNode = new QSGSimpleRectNode(); rectNode = new QSGSimpleRectNode();
@ -413,6 +413,14 @@ QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* node, const QRectF& rect, QskAspect::Subcontrol subControl ) QSGNode* node, const QRectF& rect, QskAspect::Subcontrol subControl )
{
const auto fillGradient = skinnable->gradientHint( subControl );
return updateBoxNode( skinnable, node, rect, fillGradient, subControl );
}
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* node, const QRectF& rect, const QskGradient& fillGradient,
QskAspect::Subcontrol subControl )
{ {
using namespace QskAspect; using namespace QskAspect;
@ -426,7 +434,6 @@ QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
borderMetrics = borderMetrics.toAbsolute( boxRect.size() ); borderMetrics = borderMetrics.toAbsolute( boxRect.size() );
const auto borderColors = skinnable->boxBorderColorsHint( subControl ); const auto borderColors = skinnable->boxBorderColorsHint( subControl );
const auto fillGradient = skinnable->gradientHint( subControl );
if ( !qskIsBoxVisible( borderMetrics, borderColors, fillGradient ) ) if ( !qskIsBoxVisible( borderMetrics, borderColors, fillGradient ) )
return nullptr; return nullptr;

3
src/controls/QskSkinlet.h
View File

@ -56,6 +56,9 @@ class QSK_EXPORT QskSkinlet
static QSGNode* updateBoxNode( const QskSkinnable*, QSGNode*, static QSGNode* updateBoxNode( const QskSkinnable*, QSGNode*,
const QRectF&, QskAspect::Subcontrol ); const QRectF&, QskAspect::Subcontrol );
static QSGNode* updateBoxNode( const QskSkinnable*, QSGNode*,
const QRectF&, const QskGradient&, QskAspect::Subcontrol );
static QSGNode* updateTextNode( const QskSkinnable*, QSGNode*, static QSGNode* updateTextNode( const QskSkinnable*, QSGNode*,
const QRectF&, Qt::Alignment, const QString&, const QskTextOptions&, const QRectF&, Qt::Alignment, const QString&, const QskTextOptions&,
QskAspect::Subcontrol ); QskAspect::Subcontrol );