From 16926144da4334c843f6478e338d977daecaaa1b Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sat, 29 Oct 2022 11:29:38 -0500
Subject: [PATCH] Fix event offsets in map image exporting

---
 src/ui/mapimageexporter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ui/mapimageexporter.cpp b/src/ui/mapimageexporter.cpp
index 5c5e4b78..a54b72a3 100644
--- a/src/ui/mapimageexporter.cpp
+++ b/src/ui/mapimageexporter.cpp
@@ -407,6 +407,10 @@ QPixmap MapImageExporter::getFormattedMapPixmap(Map *map, bool ignoreBorder) {
     // draw events
     QPainter eventPainter(&pixmap);
     QList<Event *> events = map->getAllEvents();
+    int pixelOffset = 0;
+    if (!ignoreBorder && showBorder) {
+        pixelOffset = this->mode == ImageExporterMode::Normal ? BORDER_DISTANCE * 16 : STITCH_MODE_BORDER_DISTANCE * 16;
+    }
     for (Event *event : events) {
         editor->project->setEventPixmap(event);
         Event::Group group = event->getEventGroup();
@@ -415,7 +419,7 @@ QPixmap MapImageExporter::getFormattedMapPixmap(Map *map, bool ignoreBorder) {
          || (showBGs && group == Event::Group::Bg)
          || (showTriggers && group == Event::Group::Coord)
          || (showHealSpots && group == Event::Group::Heal))
-            eventPainter.drawImage(QPoint(event->getPixelX(), event->getPixelY()), event->getPixmap().toImage());
+            eventPainter.drawImage(QPoint(event->getPixelX() + pixelOffset, event->getPixelY() + pixelOffset), event->getPixmap().toImage());
     }
     eventPainter.end();