From a6a757bf8390d1ca9c03a793fad5202393f1fd2f Mon Sep 17 00:00:00 2001
From: Rebecca Breu <rebecca@rbreu.de>
Date: Mon, 19 Apr 2021 20:28:57 +0200
Subject: [PATCH] Automatically arrange newly loaded images

---
 beeref/fileio/__init__.py | 2 --
 beeref/view.py            | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/beeref/fileio/__init__.py b/beeref/fileio/__init__.py
index ccf7637..bff9379 100644
--- a/beeref/fileio/__init__.py
+++ b/beeref/fileio/__init__.py
@@ -66,8 +66,6 @@ def load_images(filenames, pos, scene, worker):
             continue
         item = BeePixmapItem(img, filename)
         item.set_pos_center(pos)
-        pos.setX(pos.x() + 50)
-        pos.setY(pos.y() + 50)
         scene.add_item_later(item, selected=True)
         items.append(item)
         if worker.canceled:
diff --git a/beeref/view.py b/beeref/view.py
index cb5a1aa..9bd1df5 100644
--- a/beeref/view.py
+++ b/beeref/view.py
@@ -313,6 +313,8 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin):
                 self,
                 'Problem loading images',
                 msg + errornames)
+        self.scene.arrange_optimal()
+        self.undo_stack.endMacro()
 
     def on_action_insert_images(self):
         formats = self.get_supported_image_formats(QtGui.QImageReader)
@@ -322,6 +324,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin):
             filter=f'Images ({formats})')
 
         self.scene.clearSelection()
+        self.undo_stack.beginMacro('Insert Images')
         self.worker = fileio.ThreadedIO(
             fileio.load_images,
             filenames,