diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/graphicsview/dragdroprobot | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/graphicsview/dragdroprobot')
4 files changed, 36 insertions, 28 deletions
diff --git a/examples/widgets/graphicsview/dragdroprobot/coloritem.cpp b/examples/widgets/graphicsview/dragdroprobot/coloritem.cpp index 262e18a317..23fb5fda50 100644 --- a/examples/widgets/graphicsview/dragdroprobot/coloritem.cpp +++ b/examples/widgets/graphicsview/dragdroprobot/coloritem.cpp @@ -48,10 +48,18 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "coloritem.h" +#include <QApplication> +#include <QBitmap> +#include <QCursor> +#include <QDrag> +#include <QGraphicsSceneMouseEvent> +#include <QMimeData> +#include <QPainter> +#include <QRandomGenerator> +#include <QWidget> + //! [0] ColorItem::ColorItem() : color(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)) @@ -128,7 +136,7 @@ void ColorItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) QPainter painter(&pixmap); painter.translate(15, 15); painter.setRenderHint(QPainter::Antialiasing); - paint(&painter, 0, 0); + paint(&painter, nullptr, nullptr); painter.end(); pixmap.setMask(pixmap.createHeuristicMask()); diff --git a/examples/widgets/graphicsview/dragdroprobot/main.cpp b/examples/widgets/graphicsview/dragdroprobot/main.cpp index 045e184569..b00e9705d4 100644 --- a/examples/widgets/graphicsview/dragdroprobot/main.cpp +++ b/examples/widgets/graphicsview/dragdroprobot/main.cpp @@ -48,19 +48,20 @@ ** ****************************************************************************/ -#include <QtWidgets> +#include <QApplication> +#include <QGraphicsScene> +#include <QGraphicsView> #include "coloritem.h" #include "robot.h" -#include <math.h> +#include <cmath> + class GraphicsView : public QGraphicsView { public: - GraphicsView(QGraphicsScene *scene) : QGraphicsView(scene) - { - } + using QGraphicsView::QGraphicsView; protected: void resizeEvent(QResizeEvent *) override @@ -96,7 +97,7 @@ int main(int argc, char **argv) view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); view.setBackgroundBrush(QColor(230, 200, 167)); view.setWindowTitle("Drag and Drop Robot"); - view.show(); + view.show(); return app.exec(); } diff --git a/examples/widgets/graphicsview/dragdroprobot/robot.cpp b/examples/widgets/graphicsview/dragdroprobot/robot.cpp index cc70366872..7457dabf8a 100644 --- a/examples/widgets/graphicsview/dragdroprobot/robot.cpp +++ b/examples/widgets/graphicsview/dragdroprobot/robot.cpp @@ -48,13 +48,17 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "robot.h" +#include <QGraphicsSceneDragDropEvent> +#include <QMimeData> +#include <QPainter> +#include <QParallelAnimationGroup> +#include <QPropertyAnimation> + //! [0] RobotPart::RobotPart(QGraphicsItem *parent) - : QGraphicsObject(parent), color(Qt::lightGray), dragOver(false) + : QGraphicsObject(parent), color(Qt::lightGray) { setAcceptDrops(true); } @@ -157,11 +161,6 @@ void RobotHead::dropEvent(QGraphicsSceneDragDropEvent *event) } //! [8] -RobotTorso::RobotTorso(QGraphicsItem *parent) - : RobotPart(parent) -{ -} - QRectF RobotTorso::boundingRect() const { return QRectF(-30, -20, 60, 60); diff --git a/examples/widgets/graphicsview/dragdroprobot/robot.h b/examples/widgets/graphicsview/dragdroprobot/robot.h index e25966c7c4..67f6bb4100 100644 --- a/examples/widgets/graphicsview/dragdroprobot/robot.h +++ b/examples/widgets/graphicsview/dragdroprobot/robot.h @@ -62,15 +62,15 @@ QT_END_NAMESPACE class RobotPart : public QGraphicsObject { public: - RobotPart(QGraphicsItem *parent = 0); + RobotPart(QGraphicsItem *parent = nullptr); protected: void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; void dropEvent(QGraphicsSceneDragDropEvent *event) override; - QColor color; - bool dragOver; + QColor color = Qt::lightGray; + bool dragOver = false; }; //! [0] @@ -78,10 +78,10 @@ protected: class RobotHead : public RobotPart { public: - RobotHead(QGraphicsItem *parent = 0); + RobotHead(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; protected: void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; @@ -96,10 +96,10 @@ private: class RobotTorso : public RobotPart { public: - RobotTorso(QGraphicsItem *parent = 0); + using RobotPart::RobotPart; QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [2] @@ -107,10 +107,10 @@ public: class RobotLimb : public RobotPart { public: - RobotLimb(QGraphicsItem *parent = 0); + RobotLimb(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [3] @@ -118,10 +118,10 @@ public: class Robot : public RobotPart { public: - Robot(QGraphicsItem *parent = 0); + Robot(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; }; //! [4] |