whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPageLayout: use existing qBound() 

instead of rolling our own qt_clamp().

Change-Id: I2729ae3ff98e8c29c66f0f5c792b1bc7bf586f06
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Marc Mutz 2014-04-05 00:58:08 +02:00 committed by The Qt Project
parent d9077669a1
commit 5110831721
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/painting/qpagelayout.cpp
View File

@ -50,11 +50,6 @@
QT_BEGIN_NAMESPACE
static qreal qt_clamp(qreal value, qreal min, qreal max)
{
return qMin(qMax(value, min), max);
}
// Multiplier for converting units to points.
Q_GUI_EXPORT qreal qt_pointMultiplier(QPageLayout::Unit unit)
{
@ -221,10 +216,10 @@ bool QPageLayoutPrivate::isValid() const
void QPageLayoutPrivate::clampMargins(const QMarginsF &margins)
{
m_margins = QMarginsF(qt_clamp(margins.left(), m_minMargins.left(), m_maxMargins.left()),
qt_clamp(margins.top(), m_minMargins.top(), m_maxMargins.top()),
qt_clamp(margins.right(), m_minMargins.right(), m_maxMargins.right()),
qt_clamp(margins.bottom(), m_minMargins.bottom(), m_maxMargins.bottom()));
m_margins = QMarginsF(qBound(m_minMargins.left(), margins.left(), m_maxMargins.left()),
qBound(m_minMargins.top(), margins.top(), m_maxMargins.top()),
qBound(m_minMargins.right(), margins.right(), m_maxMargins.right()),
qBound(m_minMargins.bottom(), margins.bottom(), m_maxMargins.bottom()));
}
QMarginsF QPageLayoutPrivate::margins(QPageLayout::Unit units) const