Delete key deletes selected polygon nodes (#1682)

Closes #1555
mapeditor · Aug 11, 2017 · b6a1519 · b6a1519
1 parent 395cdb5
commit b6a1519
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/tiled/editpolygontool.h b/src/tiled/editpolygontool.h
@@ -57,11 +57,15 @@ class EditPolygonTool : public AbstractObjectTool
 
     void languageChanged() override;
 
+    bool hasSelectedHandles() const { return !mSelectedHandles.isEmpty(); }
+
+public slots:
+    void deleteNodes();
+
 private slots:
     void updateHandles();
     void objectsRemoved(const QList<MapObject *> &objects);
 
-    void deleteNodes();
     void joinNodes();
     void splitSegments();
 

diff --git a/src/tiled/mapeditor.cpp b/src/tiled/mapeditor.cpp
@@ -160,6 +160,7 @@ MapEditor::MapEditor(QObject *parent)
     mStampBrush = new StampBrush(this);
     mTerrainBrush = new TerrainBrush(this);
     mBucketFillTool = new BucketFillTool(this);
+    mEditPolygonTool = new EditPolygonTool(this);
     CreateObjectTool *tileObjectsTool = new CreateTileObjectTool(this);
     CreateObjectTool *rectangleObjectsTool = new CreateRectangleObjectTool(this);
     CreateObjectTool *ellipseObjectsTool = new CreateEllipseObjectTool(this);
@@ -176,7 +177,7 @@ MapEditor::MapEditor(QObject *parent)
     mToolsToolBar->addAction(mToolManager->registerTool(new SelectSameTileTool(this)));
     mToolsToolBar->addSeparator();
     mToolsToolBar->addAction(mToolManager->registerTool(new ObjectSelectionTool(this)));
-    mToolsToolBar->addAction(mToolManager->registerTool(new EditPolygonTool(this)));
+    mToolsToolBar->addAction(mToolManager->registerTool(mEditPolygonTool));
     mToolsToolBar->addAction(mToolManager->registerTool(rectangleObjectsTool));
     mToolsToolBar->addAction(mToolManager->registerTool(ellipseObjectsTool));
     mToolsToolBar->addAction(mToolManager->registerTool(polygonObjectsTool));
@@ -479,7 +480,10 @@ void MapEditor::performStandardAction(StandardAction action)
         paste(ClipboardManager::PasteInPlace);
         break;
     case DeleteAction:
-        MapDocumentActionHandler::instance()->delete_();
+        if (mEditPolygonTool->hasSelectedHandles())
+            mEditPolygonTool->deleteNodes();
+        else
+            MapDocumentActionHandler::instance()->delete_();
         break;
     }
 }

diff --git a/src/tiled/mapeditor.h b/src/tiled/mapeditor.h
@@ -44,6 +44,7 @@ namespace Internal {
 
 class AbstractTool;
 class BucketFillTool;
+class EditPolygonTool;
 class LayerDock;
 class MapDocument;
 class MapDocumentActionHandler;
@@ -162,6 +163,7 @@ private slots:
     StampBrush *mStampBrush;
     BucketFillTool *mBucketFillTool;
     TerrainBrush *mTerrainBrush;
+    EditPolygonTool *mEditPolygonTool;
 
     QToolBar *mMainToolBar;
     QToolBar *mToolsToolBar;