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

Merge branch 'master' into pokefirered

Browse source
This commit is contained in:
GriffinR 2020-03-29 13:15:23 -04:00 committed by GitHub
commit e9210f96aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ui/paletteeditor.h
View file

@ -23,7 +23,7 @@ public:
class PaletteEditor : public QMainWindow { class PaletteEditor : public QMainWindow {
Q_OBJECT Q_OBJECT
public: public:
explicit PaletteEditor(Project*, Tileset*, Tileset*, QWidget *parent = nullptr); explicit PaletteEditor(Project*, Tileset*, Tileset*, int paletteId, QWidget *parent = nullptr);
~PaletteEditor(); ~PaletteEditor();
void setPaletteId(int); void setPaletteId(int);
void setTilesets(Tileset*, Tileset*); void setTilesets(Tileset*, Tileset*);

5
src/ui/paletteeditor.cpp
View file

@ -5,7 +5,7 @@
#include <QMessageBox> #include <QMessageBox>
#include "log.h" #include "log.h"
PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, QWidget *parent) : PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, int paletteId, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::PaletteEditor) ui(new Ui::PaletteEditor)
{ {
@ -110,8 +110,7 @@ PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset
} }
this->initColorSliders(); this->initColorSliders();
this->refreshColorSliders(); this->setPaletteId(paletteId);
this->refreshColors();
this->commitEditHistory(this->ui->spinBox_PaletteId->value()); this->commitEditHistory(this->ui->spinBox_PaletteId->value());
} }

2
src/ui/tileseteditor.cpp
View file

@ -639,7 +639,7 @@ void TilesetEditor::on_actionChange_Metatiles_Count_triggered()
void TilesetEditor::on_actionChange_Palettes_triggered() void TilesetEditor::on_actionChange_Palettes_triggered()
{ {
if (!this->paletteEditor) { if (!this->paletteEditor) {
this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this); this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this->paletteId, this);
connect(this->paletteEditor, SIGNAL(changedPaletteColor()), this, SLOT(onPaletteEditorChangedPaletteColor())); connect(this->paletteEditor, SIGNAL(changedPaletteColor()), this, SLOT(onPaletteEditorChangedPaletteColor()));
connect(this->paletteEditor, SIGNAL(changedPalette(int)), this, SLOT(onPaletteEditorChangedPalette(int))); connect(this->paletteEditor, SIGNAL(changedPalette(int)), this, SLOT(onPaletteEditorChangedPalette(int)));
} }