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

Fix bug where tilesets were not displaying their bottom row

Browse source
This commit is contained in:
Marcus Huderle 2018-12-20 18:26:27 -06:00
parent 220d13c335
commit dcf6b5af6b
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mainwindow.cpp
View file

@ -728,7 +728,7 @@ void MainWindow::currentMetatilesSelectionChanged()
QPoint size = editor->metatile_selector_item->getSelectionDimensions();
if (size.x() == 1 && size.y() == 1) {
QPoint pos = editor->metatile_selector_item->getMetatileIdCoordsOnWidget(editor->metatile_selector_item->getSelectedMetatiles()->at(0));
ui->scrollArea_2->ensureVisible(pos.x(), pos.y());
ui->scrollArea_2->ensureVisible(pos.x(), pos.y(), 8, 8);
}
}

3
src/ui/metatileselector.cpp
View file

@ -20,6 +20,9 @@ void MetatileSelector::draw() {
int primaryLength = this->primaryTileset->metatiles->length();
int length_ = primaryLength + this->secondaryTileset->metatiles->length();
int height_ = length_ / this->numMetatilesWide;
if (length_ % this->numMetatilesWide != 0) {
height_++;
}
QImage image(this->numMetatilesWide * 16, height_ * 16, QImage::Format_RGBA8888);
QPainter painter(&image);
for (int i = 0; i < length_; i++) {

12
src/ui/tileseteditormetatileselector.cpp
View file

@ -12,6 +12,9 @@ void TilesetEditorMetatileSelector::draw() {
int primaryLength = this->primaryTileset->metatiles->length();
int length_ = primaryLength + this->secondaryTileset->metatiles->length();
int height_ = length_ / this->numMetatilesWide;
if (length_ % this->numMetatilesWide != 0) {
height_++;
}
QImage image(this->numMetatilesWide * 32, height_ * 32, QImage::Format_RGBA8888);
QPainter painter(&image);
for (int i = 0; i < length_; i++) {
@ -47,7 +50,7 @@ void TilesetEditorMetatileSelector::setTilesets(Tileset *primaryTileset, Tileset
void TilesetEditorMetatileSelector::updateSelectedMetatile() {
QPoint origin = this->getSelectionStart();
this->selectedMetatile = this->getMetatileId(origin.x(), origin.y());
this->selectedMetatile = this->getValidMetatileId(this->getMetatileId(origin.x(), origin.y()));
}
uint16_t TilesetEditorMetatileSelector::getSelectedMetatile() {
@ -72,11 +75,8 @@ void TilesetEditorMetatileSelector::mousePressEvent(QGraphicsSceneMouseEvent *ev
void TilesetEditorMetatileSelector::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
SelectablePixmapItem::mouseMoveEvent(event);
this->updateSelectedMetatile();
QPoint pos = this->getCellPos(event->pos());
uint16_t metatileId = this->getMetatileId(pos.x(), pos.y());
emit hoveredMetatileChanged(metatileId);
emit selectedMetatileChanged(metatileId);
emit hoveredMetatileChanged(this->selectedMetatile);
emit selectedMetatileChanged(this->selectedMetatile);
}
void TilesetEditorMetatileSelector::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {