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

Merge branch 'master' into features/textinputs

This commit is contained in:
Uwe Rathmann 2025-03-14 10:48:27 +01:00
parent 38e1820272 a0f80749e1
commit 2c34318c00
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls/QskSkinlet.cpp
View File

@ -415,12 +415,14 @@ void QskSkinlet::replaceChildNode( quint8 role,
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* node, QskAspect::Subcontrol subControl ) const QSGNode* node, QskAspect::Subcontrol subControl ) const
{ {
const auto rect = qskSubControlRect( this, skinnable, subControl ); auto r = qskSubControlRect( this, skinnable, subControl );
if ( rect.isEmpty() ) if ( r.isEmpty() )
return nullptr; return nullptr;
r = r.marginsRemoved( skinnable->marginHint( subControl ) );
return qskUpdateBoxNode( skinnable, node, return qskUpdateBoxNode( skinnable, node,
rect, skinnable->boxHints( subControl ) ); r, skinnable->boxHints( subControl ) );
} }
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
@ -429,8 +431,8 @@ QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
if ( rect.isEmpty() ) if ( rect.isEmpty() )
return nullptr; return nullptr;
const auto hints = skinnable->boxHints( subControl ); const auto r = rect.marginsRemoved( skinnable->marginHint( subControl ) );
return qskUpdateBoxNode( skinnable, node, rect, hints ); return qskUpdateBoxNode( skinnable, node, r, skinnable->boxHints( subControl ) );
} }
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,