From 1ec350e35fcea87c527b36cf429b595731059240 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 10 Apr 2020 12:55:43 +0200 Subject: Stop using obsolete TouchPoint rect accessors in tests and examples Followup to cf4a8b12fa277c2ea218f022607934f60fed1a06 68916fede41d1eca5d07eb6b1db518d41a007616 and 3c159957f863cf8d367a9261e7016e52cd0348c1. Task-number: QTBUG-83403 Change-Id: Ieaf418860c565dbe883384e7f296a829fbfa1e33 Reviewed-by: Volker Hilsheimer --- examples/widgets/touch/fingerpaint/scribblearea.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp index e490495cd9..4af0ec8e7e 100644 --- a/examples/widgets/touch/fingerpaint/scribblearea.cpp +++ b/examples/widgets/touch/fingerpaint/scribblearea.cpp @@ -205,22 +205,24 @@ bool ScribbleArea::event(QEvent *event) continue; default: { - QRectF rect = touchPoint.rect(); - if (rect.isEmpty()) { + QSizeF diams = touchPoint.ellipseDiameters(); + if (diams.isEmpty()) { qreal diameter = MaximumDiameter; if (touch->device()->capabilities() & QTouchDevice::Pressure) diameter = MinimumDiameter + (MaximumDiameter - MinimumDiameter) * touchPoint.pressure(); - rect.setSize(QSizeF(diameter, diameter)); + diams = QSizeF(diameter, diameter); } QPainter painter(&image); painter.setPen(Qt::NoPen); painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count())); - painter.drawEllipse(rect); + painter.drawEllipse(touchPoint.pos(), diams.width() / 2, diams.height() / 2); painter.end(); modified = true; - int rad = 2; + const int rad = 2; + QRectF rect(QPointF(), diams); + rect.moveCenter(touchPoint.pos()); update(rect.toRect().adjusted(-rad,-rad, +rad, +rad)); } break; -- cgit v1.2.3