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

Make unified control name

Browse Source
This commit is contained in:
Clemens Manert 2023-02-11 21:15:32 +01:00
parent 92ba2385db
commit a7dc136dcd
No known key found for this signature in database
GPG Key ID: 9197EAE8F85E3A18
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/controls/QskRadioBoxSkinlet.cpp
View File

@ -171,10 +171,10 @@ QRectF QskRadioBoxSkinlet::sampleRect( const QskSkinnable* skinnable,
QskAspect::States QskRadioBoxSkinlet::sampleStates( const QskSkinnable* skinnable, QskAspect::States QskRadioBoxSkinlet::sampleStates( const QskSkinnable* skinnable,
QskAspect::Subcontrol subControl, int index ) const { QskAspect::Subcontrol subControl, int index ) const {
auto radioButtons = static_cast<const QskRadioBox*>( skinnable ); auto radio = static_cast<const QskRadioBox*>( skinnable );
auto states = Inherited::sampleStates( skinnable, subControl, index ); auto states = Inherited::sampleStates( skinnable, subControl, index );
if( radioButtons->selectedIndex() == index ) { if( radio->selectedIndex() == index ) {
return states | Q::Selected; return states | Q::Selected;
} }
@ -183,33 +183,33 @@ QskAspect::States QskRadioBoxSkinlet::sampleStates( const QskSkinnable* skinnabl
QSGNode* QskRadioBoxSkinlet::updateSampleNode( const QskSkinnable* skinnable, QSGNode* QskRadioBoxSkinlet::updateSampleNode( const QskSkinnable* skinnable,
QskAspect::Subcontrol subcontrol, int index, QSGNode* node ) const { QskAspect::Subcontrol subcontrol, int index, QSGNode* node ) const {
auto radioButtons = static_cast<const QskRadioBox*>( skinnable ); auto radio = static_cast<const QskRadioBox*>( skinnable );
auto rect = sampleRect( skinnable, radioButtons->contentsRect(), auto rect = sampleRect( skinnable, radio->contentsRect(),
subcontrol, index ); subcontrol, index );
if( subcontrol == Q::Text ) { if( subcontrol == Q::Text ) {
return QskSkinlet::updateTextNode( radioButtons, return QskSkinlet::updateTextNode( radio,
node, node,
rect, rect,
Qt::AlignLeft, Qt::AlignLeft,
radioButtons->items()[index], radio->items()[index],
subcontrol); subcontrol);
} else if (subcontrol == Q::Button) { } else if (subcontrol == Q::Button) {
return QskSkinlet::updateBoxNode(radioButtons, return QskSkinlet::updateBoxNode(radio,
node, node,
rect, rect,
subcontrol); subcontrol);
} else if( subcontrol == Q::Symbol ) { } else if( subcontrol == Q::Symbol ) {
auto symbol = QskStandardSymbol::NoSymbol; auto symbol = QskStandardSymbol::NoSymbol;
auto color = radioButtons->color( subcontrol ).rgb(); auto color = radio->color( subcontrol ).rgb();
if( radioButtons->selectedIndex() == index ) { if( radio->selectedIndex() == index ) {
symbol = QskStandardSymbol::Bullet; symbol = QskStandardSymbol::Bullet;
color = radioButtons->color( subcontrol | Q::Selected ).rgb(); color = radio->color( subcontrol | Q::Selected ).rgb();
} }
auto graphic = radioButtons->effectiveSkin()->symbol( symbol ); auto graphic = radio->effectiveSkin()->symbol( symbol );
/* /*
Our default skins do not have the concept of colorRoles Our default skins do not have the concept of colorRoles
@ -220,7 +220,7 @@ QSGNode* QskRadioBoxSkinlet::updateSampleNode( const QskSkinnable* skinnable,
QskGraphic::fromGraphic( graphic, filter ); QskGraphic::fromGraphic( graphic, filter );
return updateGraphicNode( radioButtons, node, graphic, filter, rect ); return updateGraphicNode( radio, node, graphic, filter, rect );
} }
return node; return node;