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

QskArcMetrics::toAbsolute version with qreal added

Browse Source
This commit is contained in:
Uwe Rathmann 2023-04-12 12:18:32 +02:00
parent 98cb1b256b
commit 76248e480b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/QskArcMetrics.cpp
View File

@ -73,17 +73,27 @@ QVariant QskArcMetrics::interpolate(
} }
QskArcMetrics QskArcMetrics::toAbsolute( const QSizeF& size ) const noexcept QskArcMetrics QskArcMetrics::toAbsolute( const QSizeF& size ) const noexcept
{
if ( size.width() < 0.0 )
return toAbsolute( size.height() );
if ( size.height() < 0.0 )
return toAbsolute( size.width() );
return toAbsolute( qMin( size.width(), size.height() ) );
}
QskArcMetrics QskArcMetrics::toAbsolute( qreal size ) const noexcept
{ {
if ( m_sizeMode != Qt::RelativeSize ) if ( m_sizeMode != Qt::RelativeSize )
return *this; return *this;
QskArcMetrics absoluted = *this; QskArcMetrics absoluted = *this;
const auto l = qMin( size.width(), size.height() ); if ( size <= 0.0 )
if ( l <= 0.0 )
absoluted.m_thickness = 0.0; absoluted.m_thickness = 0.0;
else else
absoluted.m_thickness = qskAbsoluted( l, absoluted.m_thickness ); absoluted.m_thickness = qskAbsoluted( size, absoluted.m_thickness );
absoluted.m_sizeMode = Qt::AbsoluteSize; absoluted.m_sizeMode = Qt::AbsoluteSize;

1
src/common/QskArcMetrics.h
View File

@ -55,6 +55,7 @@ class QSK_EXPORT QskArcMetrics
qreal value ) const noexcept; qreal value ) const noexcept;
QskArcMetrics toAbsolute( const QSizeF& ) const noexcept; QskArcMetrics toAbsolute( const QSizeF& ) const noexcept;
QskArcMetrics toAbsolute( qreal ) const noexcept;
QskHashValue hash( QskHashValue seed = 0 ) const noexcept; QskHashValue hash( QskHashValue seed = 0 ) const noexcept;