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

boundingLabelSize introduced

Browse Source
This commit is contained in:
Uwe Rathmann 2021-02-01 10:22:54 +01:00
parent 38d0397c5e
commit 956e830691
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nodes/QskScaleRenderer.cpp
View File

@ -300,15 +300,16 @@ QVariant QskScaleRenderer::labelAt( qreal pos ) const
return QString::number( pos, 'g' ); return QString::number( pos, 'g' );
} }
qreal QskScaleRenderer::maxLabelWidth() const QSizeF QskScaleRenderer::boundingLabelSize() const
{ {
const auto ticks = m_tickmarks.majorTicks(); const auto ticks = m_tickmarks.majorTicks();
if ( ticks.isEmpty() ) if ( ticks.isEmpty() )
return 0.0; return QSizeF( 0.0, 0.0 );
const QFontMetricsF fm( m_font ); const QFontMetricsF fm( m_font );
qreal maxWidth = 0.0; qreal maxWidth = 0.0;
const qreal h = fm.height();
for ( auto tick : ticks ) for ( auto tick : ticks )
{ {
@ -327,12 +328,12 @@ qreal QskScaleRenderer::maxLabelWidth() const
const auto graphic = label.value< QskGraphic >(); const auto graphic = label.value< QskGraphic >();
if ( !graphic.isNull() ) if ( !graphic.isNull() )
{ {
w = graphic.widthForHeight( fm.height() ); w = graphic.widthForHeight( h );
} }
} }
maxWidth = qMax( w, maxWidth ); maxWidth = qMax( w, maxWidth );
} }
return maxWidth; return QSizeF( maxWidth, h );
} }

2
src/nodes/QskScaleRenderer.h
View File

@ -42,7 +42,7 @@ class QSK_EXPORT QskScaleRenderer
const QRectF& tickmarksRect, const QRectF& labelsRect, QSGNode* ); const QRectF& tickmarksRect, const QRectF& labelsRect, QSGNode* );
virtual QVariant labelAt( qreal pos ) const; virtual QVariant labelAt( qreal pos ) const;
qreal maxLabelWidth() const; QSizeF boundingLabelSize() const;
virtual QSGNode* updateTicksNode( virtual QSGNode* updateTicksNode(
const QskSkinnable*, const QRectF&, QSGNode* ) const; const QskSkinnable*, const QRectF&, QSGNode* ) const;