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

QskSkinStateChanger improved

Browse Source
This commit is contained in:
Uwe Rathmann 2021-12-27 17:33:06 +01:00
parent 622c6f06c2
commit 320ed1b39c
4 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controls/QskListViewSkinlet.cpp
View File

@ -161,7 +161,9 @@ void QskListViewSkinlet::updateBackgroundNodes(
if ( rowSelected >= rowMin && rowSelected <= rowMax ) if ( rowSelected >= rowMin && rowSelected <= rowMax )
{ {
const QskSkinStateChanger stateChanger( listView, QskListView::Selected ); QskSkinStateChanger stateChanger( listView );
stateChanger.addStates( QskListView::Selected );
const QColor color = listView->color( QskListView::Cell ); const QColor color = listView->color( QskListView::Cell );
if ( rowNode == nullptr ) if ( rowNode == nullptr )
@ -438,7 +440,8 @@ QSGNode* QskListViewSkinlet::updateCellNode( const QskListView* listView,
if ( row == listView->selectedRow() ) if ( row == listView->selectedRow() )
rowStates |= QskListView::Selected; rowStates |= QskListView::Selected;
QskSkinStateChanger stateChanger( listView, rowStates ); QskSkinStateChanger stateChanger( listView );
stateChanger.addStates( rowStates );
QSGNode* newNode = nullptr; QSGNode* newNode = nullptr;

21
src/controls/QskMenuSkinlet.cpp
View File

@ -14,19 +14,6 @@
#include <qfontmetrics.h> #include <qfontmetrics.h>
namespace
{
class StateChanger : public QskSkinStateChanger
{
public:
inline StateChanger( const QskSkinnable* skinnable, bool isSelected )
: QskSkinStateChanger( skinnable, isSelected
? QskMenu::Selected : QskAspect::NoState )
{
}
};
}
template< class T > template< class T >
static T qskValueAt( const QskMenu* menu, int index ) static T qskValueAt( const QskMenu* menu, int index )
{ {
@ -152,7 +139,9 @@ static QSGNode* qskUpdateBackgroundNode( const QskMenu* menu, QSGNode* rootNode
QSGNode* newNode = nullptr; QSGNode* newNode = nullptr;
{ {
const StateChanger stateChanger( menu, menu->currentIndex() == i ); QskSkinStateChanger stateChanger( menu );
if ( menu->currentIndex() == i )
stateChanger.addStates( QskMenu::Selected );
newNode = QskSkinlet::updateBoxNode( newNode = QskSkinlet::updateBoxNode(
menu, node, menu->cellRect( i ), QskMenu::Cell ); menu, node, menu->cellRect( i ), QskMenu::Cell );
@ -229,7 +218,9 @@ static QSGNode* qskUpdateItemsNode( const QskMenu* menu, QSGNode* rootNode )
} }
{ {
const StateChanger stateChanger( menu, menu->currentIndex() == i ); QskSkinStateChanger stateChanger( menu );
if ( menu->currentIndex() == i )
stateChanger.addStates( QskMenu::Selected );
const auto cellRect = menu->cellRect( i ); const auto cellRect = menu->cellRect( i );

28
src/controls/QskSkinStateChanger.h
View File

@ -12,12 +12,17 @@
class QskSkinStateChanger class QskSkinStateChanger
{ {
public: public:
QskSkinStateChanger( const QskSkinnable*, QskAspect::States ); QskSkinStateChanger( const QskSkinnable*,
QskAspect::States = QskAspect::States() );
~QskSkinStateChanger(); ~QskSkinStateChanger();
void addStates( QskAspect::States );
void clearStates( QskAspect::States );
private: private:
QskSkinnable* m_skinnable; QskSkinnable* m_skinnable;
QskAspect::States m_oldStates; const QskAspect::States m_oldStates;
}; };
inline QskSkinStateChanger::QskSkinStateChanger( inline QskSkinStateChanger::QskSkinStateChanger(
@ -25,8 +30,7 @@ inline QskSkinStateChanger::QskSkinStateChanger(
: m_skinnable( const_cast< QskSkinnable* >( skinnable ) ) : m_skinnable( const_cast< QskSkinnable* >( skinnable ) )
, m_oldStates( skinnable->skinStates() ) , m_oldStates( skinnable->skinStates() )
{ {
if ( states ) addStates( states );
m_skinnable->replaceSkinStates( m_oldStates | states );
} }
inline QskSkinStateChanger::~QskSkinStateChanger() inline QskSkinStateChanger::~QskSkinStateChanger()
@ -35,4 +39,20 @@ inline QskSkinStateChanger::~QskSkinStateChanger()
m_skinnable->replaceSkinStates( m_oldStates ); m_skinnable->replaceSkinStates( m_oldStates );
} }
inline void QskSkinStateChanger::addStates( QskAspect::States states )
{
const auto newStates = m_oldStates | states;
if ( newStates != m_skinnable->skinStates() )
m_skinnable->replaceSkinStates( newStates );
}
inline void QskSkinStateChanger::clearStates( QskAspect::States states )
{
const auto newStates = m_oldStates & ~states;
if ( newStates != m_skinnable->skinStates() )
m_skinnable->replaceSkinStates( newStates );
}
#endif #endif

2
src/controls/QskSkinlet.h
View File

@ -43,7 +43,7 @@ class QSK_EXPORT QskSkinlet
const QRectF&, QskAspect::Subcontrol ) const; const QRectF&, QskAspect::Subcontrol ) const;
virtual QRectF itemRect( const QskSkinnable*, virtual QRectF itemRect( const QskSkinnable*,
const QRectF&, QskAspect::Subcontrol, int itemIndex ) const; const QRectF&, QskAspect::Subcontrol, int index ) const;
virtual int itemIndexAt( const QskSkinnable*, virtual int itemIndexAt( const QskSkinnable*,
const QRectF&, QskAspect::Subcontrol, const QPointF& ) const; const QRectF&, QskAspect::Subcontrol, const QPointF& ) const;