Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-03-21 17:45:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some palette error handling

Browse Source
This commit is contained in:
GriffinR 2025-05-16 03:00:52 -04:00
parent bdf2ed3263
commit d14cca6891
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/tileset.cpp
View File

@ -503,7 +503,7 @@ bool Tileset::loadTilesImage(QImage *importedImage) {
} else if (colorCount < 16) {
QVector<QRgb> colorTable = image.colorTable();
for (int i = colorTable.length(); i < 16; i++) {
colorTable.append(Qt::black);
colorTable.append(0);
}
image.setColorTable(colorTable);
}

25
src/ui/paletteeditor.cpp
View File

@ -4,8 +4,7 @@
#include "config.h"
#include "log.h"
#include "filedialog.h"
#include <QMessageBox>
#include "message.h"
PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, int paletteId, QWidget *parent) :
@ -165,27 +164,11 @@ void PaletteEditor::on_actionImport_Palette_triggered()
bool error = false;
QList<QRgb> palette = PaletteUtil::parse(filepath, &error);
if (error) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import palette.");
QString message = QString("The palette file could not be processed. View porymap.log for specific errors.");
msgBox.setInformativeText(message);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
RecentErrorMessage::show(QStringLiteral("Failed to import palette."), this);
return;
}
if (palette.length() < this->numColors) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import palette.");
QString message = QString("The palette file has %1 colors, but it must have %2 colors.")
.arg(palette.length())
.arg(this->numColors);
msgBox.setInformativeText(message);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
return;
while (palette.length() < this->numColors) {
palette.append(0);
}
const int paletteId = ui->spinBox_PaletteId->value();