Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-06-22 07:39:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some redundant event pixmap loading

Browse Source
This commit is contained in:
GriffinR 2025-04-04 23:33:38 -04:00
parent 17949055f6
commit 374a2b67b8
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/editor.cpp
View File

@ -1987,31 +1987,36 @@ qreal Editor::getEventOpacity(const Event *event) const {
}
void Editor::redrawEventPixmapItem(DraggablePixmapItem *item) {
if (item && item->event && !item->event->getPixmap().isNull()) {
item->setOpacity(getEventOpacity(item->event));
project->loadEventPixmap(item->event, true);
item->setPixmap(item->event->getPixmap());
item->setShapeMode(porymapConfig.eventSelectionShapeMode);
if (!item || !item->event)
return;
if (this->editMode == EditMode::Events) {
if (this->selectedEvents.contains(item->event)) {
// Draw the selection rectangle
QImage image = item->pixmap().toImage();
QPainter painter(&image);
painter.setPen(QColor(255, 0, 255));
painter.drawRect(0, 0, image.width() - 1, image.height() - 1);
painter.end();
item->setPixmap(QPixmap::fromImage(image));
}
item->setAcceptedMouseButtons(Qt::AllButtons);
} else {
// Can't interact with event pixmaps outside of event editing mode.
// We could do setEnabled(false), but rather than ignoring the mouse events this
// would reject them, which would prevent painting on the map behind the events.
item->setAcceptedMouseButtons(Qt::NoButton);
project->loadEventPixmap(item->event, true);
QPixmap pixmap = item->event->getPixmap();
if (pixmap.isNull())
return;
qreal zValue = item->event->getY();
if (this->editMode == EditMode::Events) {
if (this->selectedEvents.contains(item->event)) {
// Draw the selection rectangle
QPainter painter(&pixmap);
painter.setPen(Qt::magenta);
painter.drawRect(0, 0, pixmap.width() - 1, pixmap.height() - 1);
zValue++;
}
item->updatePosition();
item->setAcceptedMouseButtons(Qt::AllButtons);
} else {
// Can't interact with event pixmaps outside of event editing mode.
// We could do setEnabled(false), but rather than ignoring the mouse events this
// would reject them, which would prevent painting on the map behind the events.
item->setAcceptedMouseButtons(Qt::NoButton);
}
item->setPixmap(pixmap);
item->setZValue(zValue);
item->setOpacity(getEventOpacity(item->event));
item->setShapeMode(porymapConfig.eventSelectionShapeMode);
item->updatePosition();
}
// Warp events display a warning if they're not positioned on a metatile with a warp behavior.

7
src/ui/draggablepixmapitem.cpp
View File

@ -12,11 +12,6 @@ void DraggablePixmapItem::updatePosition() {
int y = this->event->getPixelY();
setX(x);
setY(y);
if (this->editor->selectedEvents.contains(this->event)) {
setZValue(event->getY() + 1);
} else {
setZValue(event->getY());
}
editor->updateWarpEventWarning(event);
}
@ -26,8 +21,6 @@ void DraggablePixmapItem::emitPositionChanged() {
}
void DraggablePixmapItem::updatePixmap() {
editor->project->loadEventPixmap(event, true);
this->updatePosition();
editor->redrawEventPixmapItem(this);
emit spriteChanged(event->getPixmap());
}