From 5f198584e206cb8ab85d0474ce19d0faabce9468 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Aug 2020 15:34:48 +0200 Subject: Define inverted QRects consistently Changes the definition of invalid QRects to be more consistent. This simplifies the logic, and makes it possible for us to fix normalized() so dimensions don't change. The actual API is not changed except for inverted rects. Only one use-case for the old normalized() function existed, and has been reimplemented as QRect::span(). Fixes: QTBUG-22934 Change-Id: I29dad2952dc6c8e84a6d931898dc7e43d66780f3 Reviewed-by: hjk Reviewed-by: Lars Knoll --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 356b969055..5f73864f99 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -8780,7 +8780,7 @@ public: void resizeEvent(QResizeEvent *) override { - setMask(QRegion(QRect(0, 0, width(), 10).normalized())); + setMask(QRegion(QRect(0, 0, width(), 10))); } QRegion paintedRegion; @@ -9288,7 +9288,7 @@ class MaskResizeTestWidget : public QWidget public: explicit MaskResizeTestWidget(QWidget* p = nullptr) : QWidget(p) { - setMask(QRegion(QRect(0, 0, 100, 100).normalized())); + setMask(QRegion(QRect(0, 0, 100, 100))); } void paintEvent(QPaintEvent* event) override @@ -9304,12 +9304,12 @@ public: public slots: void enlargeMask() { - QRegion newMask(QRect(0, 0, 150, 150).normalized()); + QRegion newMask(QRect(0, 0, 150, 150)); setMask(newMask); } void shrinkMask() { - QRegion newMask(QRect(0, 0, 50, 50).normalized()); + QRegion newMask(QRect(0, 0, 50, 50)); setMask(newMask); } -- cgit v1.2.3