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

code simplified

Browse Source
This commit is contained in:
Uwe Rathmann 2018-01-03 17:23:40 +01:00
parent ed9433c229
commit 184157a025
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nodes/QskTextNode.cpp
View File

@ -43,22 +43,18 @@ void QskTextNode::setTextData( const QQuickItem* item,
const QString& text, const QRectF& rect, const QFont& font, const QString& text, const QRectF& rect, const QFont& font,
const QskTextOptions& options, const QskTextColors& colors, const QskTextOptions& options, const QskTextColors& colors,
Qt::Alignment alignment, Qsk::TextStyle textStyle ) Qt::Alignment alignment, Qsk::TextStyle textStyle )
{
if ( m_rect != rect )
{ {
QMatrix4x4 matrix; QMatrix4x4 matrix;
matrix.translate( rect.left(), rect.top() ); matrix.translate( rect.left(), rect.top() );
if ( matrix != this->matrix() ) // avoid setting DirtyMatrix accidently if ( matrix != this->matrix() ) // avoid setting DirtyMatrix accidently
setMatrix( matrix ); setMatrix( matrix );
}
const uint hash = qskHash( text, rect.size(), font, const uint hash = qskHash( text, rect.size(), font,
options, colors, alignment, textStyle ); options, colors, alignment, textStyle );
if ( hash == m_hash ) if ( hash != m_hash )
return; {
m_hash = hash; m_hash = hash;
const QRectF textRect( 0, 0, rect.width(), rect.height() ); const QRectF textRect( 0, 0, rect.width(), rect.height() );
@ -71,3 +67,4 @@ void QskTextNode::setTextData( const QQuickItem* item,
QskTextRenderer::updateNode( text, font, options, textStyle, QskTextRenderer::updateNode( text, font, options, textStyle,
colors, alignment, textRect, item, this ); colors, alignment, textRect, item, this );
} }
}

1
src/nodes/QskTextNode.h
View File

@ -30,7 +30,6 @@ public:
Qt::Alignment, Qsk::TextStyle ); Qt::Alignment, Qsk::TextStyle );
private: private:
QRectF m_rect;
uint m_hash; uint m_hash;
}; };