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

the geometry for the tick can change

This commit is contained in:
Uwe Rathmann 2022-04-04 18:32:17 +02:00
parent 3a40d4c0db
commit 752a97524b
1 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/controls/QskCheckBoxSkinlet.cpp
View File

@ -14,71 +14,51 @@ namespace
class Tick : public QSGGeometryNode class Tick : public QSGGeometryNode
{ {
public: public:
Tick( const QRectF& rect, const QColor& color ) Tick()
: m_target( rect ) : geometry( QSGGeometry::defaultAttributes_Point2D(), 3 )
, geometry( QSGGeometry::defaultAttributes_Point2D(), 3 )
{ {
geometry.setDrawingMode( QSGGeometry::DrawLineStrip ); geometry.setDrawingMode( QSGGeometry::DrawLineStrip );
geometry.setLineWidth( 2 ); geometry.setLineWidth( 2 );
setGeometry( &geometry ); setGeometry( &geometry );
material.setColor( color );
setMaterial( &material ); setMaterial( &material );
markDirty( QSGNode::DirtyGeometry );
} }
void setColor( const QColor& color ) { void setColor( const QColor& color )
{
material.setColor( color ); material.setColor( color );
markDirty( QSGNode::DirtyMaterial ); markDirty( QSGNode::DirtyMaterial );
} }
void makeTick() void makeTick( const QRectF& rect )
{ {
const auto x = m_target.x(); const auto x = rect.x();
const auto y = m_target.y(); const auto y = rect.y();
auto vertexData = geometry.vertexDataAsPoint2D(); auto vertexData = geometry.vertexDataAsPoint2D();
vertexData[0].set( x, y + m_target.height() / 2 ); vertexData[0].set( x, y + rect.height() / 2 );
vertexData[1].set( x + m_target.width() / 3, y + m_target.height() ); vertexData[1].set( x + rect.width() / 3, y + rect.height() );
vertexData[2].set( x + m_target.width(), y ); vertexData[2].set( x + rect.width(), y );
markDirty( QSGNode::DirtyGeometry ); markDirty( QSGNode::DirtyGeometry );
} }
void makePartially() void makePartially( const QRectF& rect )
{ {
const auto x = m_target.x(); const auto x = rect.x();
const auto y = m_target.y(); const auto y = rect.y();
auto vertexData = geometry.vertexDataAsPoint2D(); auto vertexData = geometry.vertexDataAsPoint2D();
vertexData[0].set( x, y + m_target.height() / 2 ); vertexData[0].set( x, y + rect.height() / 2 );
vertexData[1].set( x, y + m_target.height() / 2 ); vertexData[1].set( x, y + rect.height() / 2 );
vertexData[2].set( x + m_target.width(), y + m_target.height() / 2 ); vertexData[2].set( x + rect.width(), y + rect.height() / 2 );
markDirty( QSGNode::DirtyGeometry );
}
void makeEmpty()
{
const auto x = m_target.x();
const auto y = m_target.y();
auto vertexData = geometry.vertexDataAsPoint2D();
vertexData[0].set( x, y );
vertexData[1].set( x, y );
vertexData[2].set( x, y );
markDirty( QSGNode::DirtyGeometry ); markDirty( QSGNode::DirtyGeometry );
} }
private: private:
const QRectF m_target;
QSGFlatColorMaterial material; QSGFlatColorMaterial material;
QSGGeometry geometry; QSGGeometry geometry;
}; };
@ -125,35 +105,25 @@ QSGNode* QskCheckBoxSkinlet::updateTickNode(
{ {
using Q = QskCheckBox; using Q = QskCheckBox;
if ( checkBox->checkState() == Qt::Unchecked )
return nullptr;
auto rect = checkBox->subControlRect( Q::Tick ); auto rect = checkBox->subControlRect( Q::Tick );
rect = rect.marginsRemoved( checkBox->marginHint( Q::Tick ) ); rect = rect.marginsRemoved( checkBox->marginHint( Q::Tick ) );
auto tick = static_cast< Tick* >( node ); auto tick = static_cast< Tick* >( node );
if ( tick == nullptr ) if ( tick == nullptr )
tick = new Tick( rect, checkBox->color( Q::Tick ) ); tick = new Tick();
switch ( checkBox->checkState() ) if ( checkBox->checkState() == Qt::PartiallyChecked )
{ {
case Qt::Unchecked: tick->setColor( checkBox->color( Q::Tick | Q::PartiallyChecked ) );
tick->makePartially( rect );
tick->setColor( checkBox->color( Q::Tick ) ); }
tick->makeEmpty(); else
{
break; tick->setColor( checkBox->color( Q::Tick | Q::Checked ) );
tick->makeTick( rect );
case Qt::PartiallyChecked:
tick->setColor( checkBox->color( Q::Tick | Q::PartiallyChecked ) );
tick->makePartially();
break;
case Qt::Checked:
tick->setColor( checkBox->color( Q::Tick | Q::Checked ) );
tick->makeTick();
break;
} }
return tick; return tick;