Show map name change in map tree

If a map has been renamed in the map properties view, then the map name in the map tree is updated now.
EasyRPG · Nov 30, 2021 · 6edcfac · 6edcfac
1 parent d6c2b72
commit 6edcfac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/ui/main_window.cpp b/src/ui/main_window.cpp
@@ -1309,7 +1309,7 @@ void MainWindow::on_actionMapProperties_triggered()
 	if (!currentScene())
 		return;
 
-	currentScene()->editMapProperties();
+	currentScene()->editMapProperties(ui->treeMap->currentItem());
 }
 
 void MainWindow::on_actionSearch_triggered()

diff --git a/src/ui/map/map_scene.cpp b/src/ui/map/map_scene.cpp
@@ -235,10 +235,11 @@ QMap<int, lcf::rpg::Event*> *MapScene::mapEvents()
 	return events;
 }
 
-void MapScene::editMapProperties()
+void MapScene::editMapProperties(QTreeWidgetItem *item)
 {
 	int old_width = m_map->width;
 	int old_height = m_map->height;
+	lcf::DBString old_name = n_mapInfo.name;
 
 	MapPropertiesDialog dlg(m_project, n_mapInfo, *m_map, m_view);
 	if (dlg.exec() == QDialog::Accepted) {
@@ -252,6 +253,10 @@ void MapScene::editMapProperties()
 		redrawPanorama();
 		redrawMap();
 		setScale(m_scale);
+
+		if (n_mapInfo.name != old_name) {
+			item->setData(0, Qt::DisplayRole, ToQString(n_mapInfo.name));
+		}
 	}
 }
 

diff --git a/src/ui/map/map_scene.h b/src/ui/map/map_scene.h
@@ -25,6 +25,7 @@
 #include <QMap>
 #include <QMenu>
 #include <QUndoStack>
+#include <QTreeWidgetItem>
 #include <memory>
 #include <lcf/rpg/map.h>
 #include <lcf/rpg/mapinfo.h>
@@ -51,7 +52,7 @@ class MapScene : public QGraphicsScene
 	void setLayerData(Core::Layer layer, std::vector<short> data);
 	void setEventData(int id, const lcf::rpg::Event &data);
 	QMap<int, lcf::rpg::Event *> *mapEvents();
-	void editMapProperties();
+	void editMapProperties(QTreeWidgetItem *item);
 
 signals: