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

unused parameter removed

Browse Source
This commit is contained in:
Uwe Rathmann 2018-01-03 17:24:27 +01:00
parent 184157a025
commit 6108af2c84
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nodes/QskPlainTextRenderer.cpp
View File

@ -43,14 +43,15 @@ QRectF QskPlainTextRenderer::textRect( const QString& text,
return fm.boundingRect( r, options.textFlags(), text ); return fm.boundingRect( r, options.textFlags(), text );
} }
static qreal qskLayoutText( QTextLayout* layout, const QPointF& position, qreal lineWidth, static qreal qskLayoutText( QTextLayout* layout, qreal lineWidth, const QskTextOptions& options )
const QskTextOptions& options )
{ {
const auto maxLineCount = options.wrapMode() == QskTextOptions::NoWrap const auto maxLineCount =( options.wrapMode() == QskTextOptions::NoWrap )
? 1 : options.maximumLineCount(); ? 1 : options.maximumLineCount();
int lineNumber = 0; int lineNumber = 0;
int characterPosition = 0; int characterPosition = 0;
qreal y = 0; qreal y = 0;
Q_FOREVER Q_FOREVER
{ {
if ( ++lineNumber > maxLineCount ) if ( ++lineNumber > maxLineCount )
@ -84,7 +85,7 @@ static qreal qskLayoutText( QTextLayout* layout, const QPointF& position, qreal
if ( !line.isValid() ) if ( !line.isValid() )
break; break;
line.setPosition( position + QPointF( 0, y ) ); line.setPosition( QPointF( 0, y ) );
line.setLineWidth( lineWidth ); line.setLineWidth( lineWidth );
characterPosition = line.textStart() + line.textLength(); characterPosition = line.textStart() + line.textLength();
y += line.leading() + line.height(); y += line.leading() + line.height();
@ -167,7 +168,7 @@ void QskPlainTextRenderer::updateNode( const QString& text,
layout.beginLayout(); layout.beginLayout();
QPointF position; QPointF position;
position.ry() += qskLayoutText( &layout, position, rect.width(), options ); position.ry() += qskLayoutText( &layout, rect.width(), options );
layout.endLayout(); layout.endLayout();
position.setX( 0 ); position.setX( 0 );