Add ESC key handling to cancel shape drawing

Author: bjorn

src/tiled/shapefilltool.cpp

@@ -28,11 +28,10 @@
 
 #include <QActionGroup>
 #include <QApplication>
+#include <QKeyEvent>
 #include <QToolBar>
 #include <QUndoStack>
 
-#include <memory>
-
 using namespace Tiled;
 
 ShapeFillTool::ShapeFillTool(QObject *parent)
@@ -86,9 +85,7 @@ void ShapeFillTool::mousePressed(QGraphicsSceneMouseEvent *event)
 {
     // Right-click cancels drawing a shape
     if (mToolBehavior == MakingShape && event->button() == Qt::RightButton) {
-        mToolBehavior = Free;
-        clearOverlay();
-        updateStatusInfo();
+        cancelMakingShape();
         return;
     }
 
@@ -139,6 +136,18 @@ void ShapeFillTool::modifiersChanged(Qt::KeyboardModifiers modifiers)
         updateFillOverlay();
 }
 
+void ShapeFillTool::keyPressed(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Escape) {
+        if (mToolBehavior == MakingShape) {
+            cancelMakingShape();
+            return;
+        }
+    }
+
+    AbstractTileFillTool::keyPressed(event);
+}
+
 void ShapeFillTool::languageChanged()
 {
     setName(tr("Shape Fill Tool"));
@@ -153,7 +162,7 @@ void ShapeFillTool::populateToolBar(QToolBar *toolBar)
 {
     AbstractTileFillTool::populateToolBar(toolBar);
 
-    QActionGroup *actionGroup = new QActionGroup(toolBar);
+    auto *actionGroup = new QActionGroup(toolBar);
     actionGroup->addAction(mRectFill);
     actionGroup->addAction(mCircleFill);
 
@@ -194,6 +203,13 @@ void ShapeFillTool::setCurrentShape(Shape shape)
     mCurrentShape = shape;
 }
 
+void ShapeFillTool::cancelMakingShape()
+{
+    mToolBehavior = Free;
+    clearOverlay();
+    updateStatusInfo();
+}
+
 void ShapeFillTool::updateFillOverlay()
 {
     int dx = tilePosition().x() - mStartCorner.x();

src/tiled/shapefilltool.h

@@ -41,6 +41,8 @@ class ShapeFillTool : public AbstractTileFillTool
 
     void modifiersChanged(Qt::KeyboardModifiers) override;
 
+    void keyPressed(QKeyEvent *event) override;
+
     void languageChanged() override;
 
     void populateToolBar(QToolBar *toolBar) override;
@@ -73,6 +75,7 @@ class ShapeFillTool : public AbstractTileFillTool
     void setActionsEnabled(bool enabled);
 
     void setCurrentShape(Shape shape);
+    void cancelMakingShape();
     void updateFillOverlay();
 };