diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-21 10:05:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-26 21:35:38 +0000 |
| commit | 88e56d0932a3615231adf40d5ae033e742d72c33 (patch) | |
| tree | a1bab6dd40863842d6f465e5e4a4a31b5ffa62f3 /src/corelib/tools/qrect.h | |
| parent | 67ee72f3145fd14b36af408918ed3420504d3035 (diff) | |
Improve rounding of QRect::toRect
Avoid the dimensions of the rounded QRect being off by more than one
pixel. This ensures the aligned containing rect also contains the
rounded rect.
Task-number: QTBUG-56420
Change-Id: Ib79110e51ab80de2dc83d01ea83fc5fbf3852e75
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qrect.h')
| -rw-r--r-- | src/corelib/tools/qrect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 19ff87b420..3b40055b5a 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -870,7 +870,7 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &r1, const QRectF &r2) Q_DE Q_DECL_CONSTEXPR inline QRect QRectF::toRect() const Q_DECL_NOTHROW { - return QRect(qRound(xp), qRound(yp), qRound(w), qRound(h)); + return QRect(QPoint(qRound(xp), qRound(yp)), QPoint(qRound(xp + w) - 1, qRound(yp + h) - 1)); } Q_DECL_CONSTEXPR inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW |