diff options
Diffstat (limited to 'src/corelib/tools/qrect.h')
| -rw-r--r-- | src/corelib/tools/qrect.h | 191 |
1 files changed, 88 insertions, 103 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index cfe92e81e6..e69a217f48 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QRECT_H #define QRECT_H @@ -52,9 +16,16 @@ #if defined(Q_OS_DARWIN) || defined(Q_QDOC) struct CGRect; #endif +#if defined(Q_OS_WASM) || defined(Q_QDOC) +namespace emscripten { +class val; +} +#endif QT_BEGIN_NAMESPACE +class QRectF; + class Q_CORE_EXPORT QRect { public: @@ -71,7 +42,7 @@ public: constexpr inline int top() const noexcept; constexpr inline int right() const noexcept; constexpr inline int bottom() const noexcept; - Q_REQUIRED_RESULT QRect normalized() const noexcept; + [[nodiscard]] QRect normalized() const noexcept; constexpr inline int x() const noexcept; constexpr inline int y() const noexcept; @@ -105,9 +76,9 @@ public: constexpr inline void translate(int dx, int dy) noexcept; constexpr inline void translate(const QPoint &p) noexcept; - Q_REQUIRED_RESULT constexpr inline QRect translated(int dx, int dy) const noexcept; - Q_REQUIRED_RESULT constexpr inline QRect translated(const QPoint &p) const noexcept; - Q_REQUIRED_RESULT constexpr inline QRect transposed() const noexcept; + [[nodiscard]] constexpr inline QRect translated(int dx, int dy) const noexcept; + [[nodiscard]] constexpr inline QRect translated(const QPoint &p) const noexcept; + [[nodiscard]] constexpr inline QRect transposed() const noexcept; constexpr inline void moveTo(int x, int t) noexcept; constexpr inline void moveTo(const QPoint &p) noexcept; @@ -119,7 +90,7 @@ public: constexpr inline void getCoords(int *x1, int *y1, int *x2, int *y2) const; constexpr inline void adjust(int x1, int y1, int x2, int y2) noexcept; - Q_REQUIRED_RESULT constexpr inline QRect adjusted(int x1, int y1, int x2, int y2) const noexcept; + [[nodiscard]] constexpr inline QRect adjusted(int x1, int y1, int x2, int y2) const noexcept; constexpr inline QSize size() const noexcept; constexpr inline int width() const noexcept; @@ -130,15 +101,15 @@ public: QRect operator|(const QRect &r) const noexcept; QRect operator&(const QRect &r) const noexcept; - inline QRect& operator|=(const QRect &r) noexcept; - inline QRect& operator&=(const QRect &r) noexcept; + inline QRect &operator|=(const QRect &r) noexcept; + inline QRect &operator&=(const QRect &r) noexcept; bool contains(const QRect &r, bool proper = false) const noexcept; - bool contains(const QPoint &p, bool proper=false) const noexcept; + bool contains(const QPoint &p, bool proper = false) const noexcept; inline bool contains(int x, int y) const noexcept; inline bool contains(int x, int y, bool proper) const noexcept; - Q_REQUIRED_RESULT inline QRect united(const QRect &other) const noexcept; - Q_REQUIRED_RESULT inline QRect intersected(const QRect &other) const noexcept; + [[nodiscard]] inline QRect united(const QRect &other) const noexcept; + [[nodiscard]] inline QRect intersected(const QRect &other) const noexcept; bool intersects(const QRect &r) const noexcept; constexpr inline QRect marginsAdded(const QMargins &margins) const noexcept; @@ -146,13 +117,18 @@ public: constexpr inline QRect &operator+=(const QMargins &margins) noexcept; constexpr inline QRect &operator-=(const QMargins &margins) noexcept; - friend constexpr inline bool operator==(const QRect &, const QRect &) noexcept; - friend constexpr inline bool operator!=(const QRect &, const QRect &) noexcept; + [[nodiscard]] static constexpr inline QRect span(const QPoint &p1, const QPoint &p2) noexcept; + + friend constexpr inline bool operator==(const QRect &r1, const QRect &r2) noexcept + { return r1.x1==r2.x1 && r1.x2==r2.x2 && r1.y1==r2.y1 && r1.y2==r2.y2; } + friend constexpr inline bool operator!=(const QRect &r1, const QRect &r2) noexcept + { return r1.x1!=r2.x1 || r1.x2!=r2.x2 || r1.y1!=r2.y1 || r1.y2!=r2.y2; } friend constexpr inline size_t qHash(const QRect &, size_t) noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT CGRect toCGRect() const noexcept; + [[nodiscard]] CGRect toCGRect() const noexcept; #endif + [[nodiscard]] constexpr inline QRectF toRectF() const noexcept; private: int x1; @@ -160,10 +136,7 @@ private: int x2; int y2; }; -Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE); - -constexpr inline bool operator==(const QRect &, const QRect &) noexcept; -constexpr inline bool operator!=(const QRect &, const QRect &) noexcept; +Q_DECLARE_TYPEINFO(QRect, Q_RELOCATABLE_TYPE); /***************************************************************************** @@ -426,13 +399,13 @@ inline bool QRect::contains(int ax, int ay) const noexcept return contains(QPoint(ax, ay), false); } -inline QRect& QRect::operator|=(const QRect &r) noexcept +inline QRect &QRect::operator|=(const QRect &r) noexcept { *this = *this | r; return *this; } -inline QRect& QRect::operator&=(const QRect &r) noexcept +inline QRect &QRect::operator&=(const QRect &r) noexcept { *this = *this & r; return *this; @@ -448,16 +421,6 @@ inline QRect QRect::united(const QRect &r) const noexcept return *this | r; } -constexpr inline bool operator==(const QRect &r1, const QRect &r2) noexcept -{ - return r1.x1==r2.x1 && r1.x2==r2.x2 && r1.y1==r2.y1 && r1.y2==r2.y2; -} - -constexpr inline bool operator!=(const QRect &r1, const QRect &r2) noexcept -{ - return r1.x1!=r2.x1 || r1.x2!=r2.x2 || r1.y1!=r2.y1 || r1.y2!=r2.y2; -} - constexpr inline size_t qHash(const QRect &r, size_t seed = 0) noexcept { return qHashMulti(seed, r.x1, r.x2, r.y1, r.y2); @@ -505,6 +468,12 @@ constexpr inline QRect &QRect::operator-=(const QMargins &margins) noexcept return *this; } +constexpr QRect QRect::span(const QPoint &p1, const QPoint &p2) noexcept +{ + return QRect(QPoint(qMin(p1.x(), p2.x()), qMin(p1.y(), p2.y())), + QPoint(qMax(p1.x(), p2.x()), qMax(p1.y(), p2.y()))); +} + #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug, const QRect &); #endif @@ -522,7 +491,7 @@ public: constexpr inline bool isNull() const noexcept; constexpr inline bool isEmpty() const noexcept; constexpr inline bool isValid() const noexcept; - Q_REQUIRED_RESULT QRectF normalized() const noexcept; + [[nodiscard]] QRectF normalized() const noexcept; constexpr inline qreal left() const noexcept { return xp; } constexpr inline qreal top() const noexcept { return yp; } @@ -562,10 +531,10 @@ public: constexpr inline void translate(qreal dx, qreal dy) noexcept; constexpr inline void translate(const QPointF &p) noexcept; - Q_REQUIRED_RESULT constexpr inline QRectF translated(qreal dx, qreal dy) const noexcept; - Q_REQUIRED_RESULT constexpr inline QRectF translated(const QPointF &p) const noexcept; + [[nodiscard]] constexpr inline QRectF translated(qreal dx, qreal dy) const noexcept; + [[nodiscard]] constexpr inline QRectF translated(const QPointF &p) const noexcept; - Q_REQUIRED_RESULT constexpr inline QRectF transposed() const noexcept; + [[nodiscard]] constexpr inline QRectF transposed() const noexcept; constexpr inline void moveTo(qreal x, qreal y) noexcept; constexpr inline void moveTo(const QPointF &p) noexcept; @@ -577,7 +546,7 @@ public: constexpr inline void getCoords(qreal *x1, qreal *y1, qreal *x2, qreal *y2) const; constexpr inline void adjust(qreal x1, qreal y1, qreal x2, qreal y2) noexcept; - Q_REQUIRED_RESULT constexpr inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const noexcept; + [[nodiscard]] constexpr inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const noexcept; constexpr inline QSizeF size() const noexcept; constexpr inline qreal width() const noexcept; @@ -588,14 +557,14 @@ public: QRectF operator|(const QRectF &r) const noexcept; QRectF operator&(const QRectF &r) const noexcept; - inline QRectF& operator|=(const QRectF &r) noexcept; - inline QRectF& operator&=(const QRectF &r) noexcept; + inline QRectF &operator|=(const QRectF &r) noexcept; + inline QRectF &operator&=(const QRectF &r) noexcept; bool contains(const QRectF &r) const noexcept; bool contains(const QPointF &p) const noexcept; inline bool contains(qreal x, qreal y) const noexcept; - Q_REQUIRED_RESULT inline QRectF united(const QRectF &other) const noexcept; - Q_REQUIRED_RESULT inline QRectF intersected(const QRectF &other) const noexcept; + [[nodiscard]] inline QRectF united(const QRectF &other) const noexcept; + [[nodiscard]] inline QRectF intersected(const QRectF &other) const noexcept; bool intersects(const QRectF &r) const noexcept; constexpr inline QRectF marginsAdded(const QMarginsF &margins) const noexcept; @@ -603,15 +572,28 @@ public: constexpr inline QRectF &operator+=(const QMarginsF &margins) noexcept; constexpr inline QRectF &operator-=(const QMarginsF &margins) noexcept; - friend constexpr inline bool operator==(const QRectF &, const QRectF &) noexcept; - friend constexpr inline bool operator!=(const QRectF &, const QRectF &) noexcept; + friend constexpr inline bool operator==(const QRectF &r1, const QRectF &r2) noexcept + { + return r1.topLeft() == r2.topLeft() + && r1.size() == r2.size(); + } + friend constexpr inline bool operator!=(const QRectF &r1, const QRectF &r2) noexcept + { + return r1.topLeft() != r2.topLeft() + || r1.size() != r2.size(); + } - Q_REQUIRED_RESULT constexpr inline QRect toRect() const noexcept; - Q_REQUIRED_RESULT QRect toAlignedRect() const noexcept; + [[nodiscard]] constexpr inline QRect toRect() const noexcept; + [[nodiscard]] QRect toAlignedRect() const noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT static QRectF fromCGRect(CGRect rect) noexcept; - Q_REQUIRED_RESULT CGRect toCGRect() const noexcept; + [[nodiscard]] static QRectF fromCGRect(CGRect rect) noexcept; + [[nodiscard]] CGRect toCGRect() const noexcept; +#endif + +#if defined(Q_OS_WASM) || defined(Q_QDOC) + [[nodiscard]] static QRectF fromDOMRect(emscripten::val domRect); + [[nodiscard]] emscripten::val toDOMRect() const; #endif private: @@ -620,10 +602,7 @@ private: qreal w; qreal h; }; -Q_DECLARE_TYPEINFO(QRectF, Q_MOVABLE_TYPE); - -constexpr inline bool operator==(const QRectF &, const QRectF &) noexcept; -constexpr inline bool operator!=(const QRectF &, const QRectF &) noexcept; +Q_DECLARE_TYPEINFO(QRectF, Q_RELOCATABLE_TYPE); /***************************************************************************** @@ -767,7 +746,9 @@ constexpr inline void QRectF::moveTo(const QPointF &p) noexcept } constexpr inline QRectF QRectF::translated(qreal dx, qreal dy) const noexcept -{ return QRectF(xp + dx, yp + dy, w, h); } +{ + return QRectF(xp + dx, yp + dy, w, h); +} constexpr inline QRectF QRectF::translated(const QPointF &p) const noexcept { return QRectF(xp + p.x(), yp + p.y(), w, h); } @@ -808,10 +789,17 @@ constexpr inline void QRectF::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal y } constexpr inline void QRectF::adjust(qreal xp1, qreal yp1, qreal xp2, qreal yp2) noexcept -{ xp += xp1; yp += yp1; w += xp2 - xp1; h += yp2 - yp1; } +{ + xp += xp1; + yp += yp1; + w += xp2 - xp1; + h += yp2 - yp1; +} constexpr inline QRectF QRectF::adjusted(qreal xp1, qreal yp1, qreal xp2, qreal yp2) const noexcept -{ return QRectF(xp + xp1, yp + yp1, w + xp2 - xp1, h + yp2 - yp1); } +{ + return QRectF(xp + xp1, yp + yp1, w + xp2 - xp1, h + yp2 - yp1); +} constexpr inline void QRectF::setWidth(qreal aw) noexcept { this->w = aw; } @@ -830,13 +818,13 @@ inline bool QRectF::contains(qreal ax, qreal ay) const noexcept return contains(QPointF(ax, ay)); } -inline QRectF& QRectF::operator|=(const QRectF &r) noexcept +inline QRectF &QRectF::operator|=(const QRectF &r) noexcept { *this = *this | r; return *this; } -inline QRectF& QRectF::operator&=(const QRectF &r) noexcept +inline QRectF &QRectF::operator&=(const QRectF &r) noexcept { *this = *this & r; return *this; @@ -852,21 +840,18 @@ inline QRectF QRectF::united(const QRectF &r) const noexcept return *this | r; } -constexpr inline bool operator==(const QRectF &r1, const QRectF &r2) noexcept -{ - return qFuzzyCompare(r1.xp, r2.xp) && qFuzzyCompare(r1.yp, r2.yp) - && qFuzzyCompare(r1.w, r2.w) && qFuzzyCompare(r1.h, r2.h); -} - -constexpr inline bool operator!=(const QRectF &r1, const QRectF &r2) noexcept -{ - return !qFuzzyCompare(r1.xp, r2.xp) || !qFuzzyCompare(r1.yp, r2.yp) - || !qFuzzyCompare(r1.w, r2.w) || !qFuzzyCompare(r1.h, r2.h); -} +constexpr QRectF QRect::toRectF() const noexcept { return *this; } constexpr inline QRect QRectF::toRect() const noexcept { - return QRect(QPoint(qRound(xp), qRound(yp)), QPoint(qRound(xp + w) - 1, qRound(yp + h) - 1)); + // This rounding is designed to minimize the maximum possible difference + // in topLeft(), bottomRight(), and size() after rounding. + // All dimensions are at most off by 0.75, and topLeft by at most 0.5. + const int nxp = qRound(xp); + const int nyp = qRound(yp); + const int nw = qRound(w + (xp - nxp) / 2); + const int nh = qRound(h + (yp - nyp) / 2); + return QRect(nxp, nyp, nw, nh); } constexpr inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) noexcept |