atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Move default prefab prompt to when the user selects the prefab tab, rather than app startup

Browse source
This commit is contained in:
Marcus Huderle 2022-10-09 14:36:12 -05:00
parent 2fc4b6b53b
commit fc2f91023f
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ui/prefab.h
View file

@ -23,7 +23,7 @@ public:
void initPrefabUI(MetatileSelector *selector, QWidget *prefabWidget, QLabel *emptyPrefabLabel, Map *map); void initPrefabUI(MetatileSelector *selector, QWidget *prefabWidget, QLabel *emptyPrefabLabel, Map *map);
void addPrefab(MetatileSelection selection, Map *map, QString name); void addPrefab(MetatileSelection selection, Map *map, QString name);
void updatePrefabUi(Map *map); void updatePrefabUi(Map *map);
void handlePrefabImport(); void tryImportDefaultPrefabs(Map *map);
private: private:
MetatileSelector *selector; MetatileSelector *selector;

1
src/mainwindow.cpp
View file

@ -1697,6 +1697,7 @@ void MainWindow::on_mapViewTab_tabBarClicked(int index)
editor->setEditingCollision(); editor->setEditingCollision();
} else if (index == 2) { } else if (index == 2) {
editor->setEditingMap(); editor->setEditingMap();
prefab.tryImportDefaultPrefabs(this->editor->map);
} }
editor->setCursorRectVisible(false); editor->setCursorRectVisible(false);
} }

5
src/ui/prefab.cpp
View file

@ -159,7 +159,6 @@ void Prefab::initPrefabUI(MetatileSelector *selector, QWidget *prefabWidget, QLa
this->selector = selector; this->selector = selector;
this->prefabWidget = prefabWidget; this->prefabWidget = prefabWidget;
this->emptyPrefabLabel = emptyPrefabLabel; this->emptyPrefabLabel = emptyPrefabLabel;
this->handlePrefabImport();
this->loadPrefabs(); this->loadPrefabs();
this->updatePrefabUi(map); this->updatePrefabUi(map);
} }
@ -270,7 +269,7 @@ void Prefab::addPrefab(MetatileSelection selection, Map *map, QString name) {
this->updatePrefabUi(map); this->updatePrefabUi(map);
} }
void Prefab::handlePrefabImport() { void Prefab::tryImportDefaultPrefabs(Map *map) {
BaseGameVersion version = projectConfig.getBaseGameVersion(); BaseGameVersion version = projectConfig.getBaseGameVersion();
// Ensure we have default prefabs for the project's game version. // Ensure we have default prefabs for the project's game version.
if (version != BaseGameVersion::pokeruby && version != BaseGameVersion::pokeemerald && version != BaseGameVersion::pokefirered) if (version != BaseGameVersion::pokeruby && version != BaseGameVersion::pokeemerald && version != BaseGameVersion::pokefirered)
@ -330,6 +329,8 @@ void Prefab::handlePrefabImport() {
prefabsFile.write(content.toUtf8()); prefabsFile.write(content.toUtf8());
prefabsFile.close(); prefabsFile.close();
this->loadPrefabs();
this->updatePrefabUi(map);
} }
projectConfig.setPrefabImportPrompted(true); projectConfig.setPrefabImportPrompted(true);