Tileset Editor: Focus name of new Terrain on add

It's helpful since generally the terrain should be given a name.
mapeditor · Mar 23, 2021 · 05ade1d · 05ade1d
1 parent 3b989cf
commit 05ade1d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/tiled/wangdock.cpp b/src/tiled/wangdock.cpp
@@ -346,15 +346,33 @@ void WangDock::setDocument(Document *document)
 void WangDock::editWangSetName(WangSet *wangSet)
 {
     const QModelIndex index = wangSetIndex(wangSet);
-    QItemSelectionModel *selectionModel = mWangSetView->selectionModel();
 
+    QItemSelectionModel *selectionModel = mWangSetView->selectionModel();
     selectionModel->setCurrentIndex(index,
                                     QItemSelectionModel::ClearAndSelect |
                                     QItemSelectionModel::Rows);
 
     mWangSetView->edit(index);
 }
 
+void WangDock::editWangColorName(int colorIndex)
+{
+    const QModelIndex index = mWangColorModel->colorIndex(colorIndex);
+    if (!index.isValid())
+        return;
+
+    const QModelIndex viewIndex = static_cast<QAbstractProxyModel*>(mWangColorView->model())->mapFromSource(index);
+    if (!viewIndex.isValid())
+        return;
+
+    QItemSelectionModel *selectionModel = mWangColorView->selectionModel();
+    selectionModel->setCurrentIndex(viewIndex,
+                                    QItemSelectionModel::ClearAndSelect |
+                                    QItemSelectionModel::Rows);
+
+    mWangColorView->edit(viewIndex);
+}
+
 void WangDock::changeEvent(QEvent *event)
 {
     QDockWidget::changeEvent(event);
@@ -461,6 +479,7 @@ void WangDock::addColor()
         tilesetDocument->undoStack()->push(new ChangeWangSetColorCount(tilesetDocument,
                                                                        mCurrentWangSet,
                                                                        mCurrentWangSet->colorCount() + 1));
+        editWangColorName(mCurrentWangSet->colorCount());
     }
 }
 

diff --git a/src/tiled/wangdock.h b/src/tiled/wangdock.h
@@ -62,6 +62,7 @@ class WangDock : public QDockWidget
     WangId currentWangId() const { return mCurrentWangId; }
 
     void editWangSetName(WangSet *wangSet);
+    void editWangColorName(int colorIndex);
 
     void setColorView();
     void hideTemplateColorView();