Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-25 07:18:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix freeze when creating a new tileset

Browse Source
This commit is contained in:
GriffinR 2025-01-22 14:38:49 -05:00
parent f4c0cb2d2d
commit cfb6f70580
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ui/newtilesetdialog.h
View File

@ -21,6 +21,9 @@ public:
virtual void accept() override;
signals:
void applied(Tileset *tileset);
private:
Ui::NewTilesetDialog *ui;
Project *project = nullptr;

10
src/mainwindow.cpp
View File

@ -1347,10 +1347,6 @@ void MainWindow::onMapSectionDisplayNameChanged(const QString &idName, const QSt
void MainWindow::onNewTilesetCreated(Tileset *tileset) {
logInfo(QString("Created a new tileset named %1.").arg(tileset->name));
// Unlike creating a new map or layout (which immediately opens the new item)
// creating a new tileset has no visual feedback that it succeeded, so we show a message.
InfoMessage::show(QString("New tileset created at '%1'!").arg(tileset->getExpectedDir()), this);
// Refresh tileset combo boxes
if (!tileset->is_secondary) {
int index = this->editor->project->primaryTilesetLabels.indexOf(tileset->name);
@ -1409,6 +1405,12 @@ void MainWindow::openDuplicateLayoutDialog(const QString &layoutId) {
void MainWindow::on_actionNew_Tileset_triggered() {
auto dialog = new NewTilesetDialog(editor->project, this);
connect(dialog, &NewTilesetDialog::applied, [this](Tileset *tileset) {
// Unlike creating a new map or layout (which immediately opens the new item)
// creating a new tileset has no visual feedback that it succeeded, so we show a message.
// It's important that we do this after the dialog has closed (sheet modal dialogs on macOS don't seem to play nice together).
InfoMessage::show(QString("New tileset created at '%1'!").arg(tileset->getExpectedDir()), this);
});
dialog->open();
}

1
src/ui/newtilesetdialog.cpp
View File

@ -76,4 +76,5 @@ void NewTilesetDialog::accept() {
ui->label_GenericError->setVisible(false);
QDialog::accept();
emit applied(tileset);
}