1 files changed, 23 insertions, 5 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/car.cpp b/examples/dbus/remotecontrolledcar/car/car.cpp
index 0c1ea3e2d7..0920658281 100644
--- a/examples/dbus/remotecontrolledcar/car/car.cpp
+++ b/examples/dbus/remotecontrolledcar/car/car.cpp
@@ -3,18 +3,17 @@
 
 #include "car.h"
 #include <QtWidgets/QtWidgets>
-#include <qmath.h>
+#include <cmath>
 
 QRectF Car::boundingRect() const
 {
     return QRectF(-35, -81, 70, 115);
 }
 
-Car::Car() : color(Qt::green), wheelsAngle(0), speed(0)
+Car::Car()
 {
     startTimer(1000 / 33);
-    setFlag(QGraphicsItem::ItemIsMovable, true);
-    setFlag(QGraphicsItem::ItemIsFocusable, true);
+    setFlags(ItemIsMovable | ItemIsFocusable);
 }
 
 void Car::accelerate()
@@ -87,12 +86,31 @@ void Car::timerEvent(QTimerEvent *event)
 
     const qreal axelDistance = 54;
     qreal wheelsAngleRads = qDegreesToRadians(wheelsAngle);
-    qreal turnDistance = ::cos(wheelsAngleRads) * axelDistance * 2;
+    qreal turnDistance = std::cos(wheelsAngleRads) * axelDistance * 2;
     qreal turnRateRads = wheelsAngleRads / turnDistance;  // rough estimate
     qreal turnRate = qRadiansToDegrees(turnRateRads);
     qreal rotation = speed * turnRate;
 
     setTransform(QTransform().rotate(rotation), true);
     setTransform(QTransform::fromTranslate(0, -speed), true);
+
+    if (!scene()->views().isEmpty()) {
+        QRect viewRect = scene()->views().at(0)->sceneRect().toRect();
+        QTransform fx = transform();
+        qreal dx = fx.dx();
+        qreal dy = fx.dy();
+        while (dx < viewRect.left() - 10)
+            dx += viewRect.width();
+        while (dy < viewRect.top() - 10)
+            dy += viewRect.height();
+        while (dx > viewRect.right() + 10)
+            dx -= viewRect.width();
+        while (dy > viewRect.bottom() + 10)
+            dy -= viewRect.width();
+        setTransform(QTransform(fx.m11(), fx.m12(), fx.m13(),
+                                fx.m21(), fx.m22(), fx.m23(),
+                                dx, dy, fx.m33()));
+    }
+
     update();
 }