# HG changeset patch
# User Neil Muller <drnlmuller@gmail.com>
# Date 1378559522 -7200
# Node ID fe6546d07d5e3ac22c16626c3e94b9ab510952e9
# Parent  a99e5e72454577da2af8261dfa1f2563a780b00c
Combine zoom and offset more correctly

diff -r a99e5e724545 -r fe6546d07d5e tools/area_editor.py
--- a/tools/area_editor.py	Sat Sep 07 15:08:59 2013 +0200
+++ b/tools/area_editor.py	Sat Sep 07 15:12:02 2013 +0200
@@ -430,8 +430,9 @@
         if not pos:
             return (0, 0)
         # Apply zoom_factor
+        pos = pos[0] + self.pos[0], pos[1] + self.pos[1]
         zoomed = (pos[0] * self._zoom_factor, pos[1] * self._zoom_factor)
-        return int(zoomed[0] + self.pos[0]), int(zoomed[1] + self.pos[1])
+        return int(zoomed[0]), int(zoomed[1])
 
     def _move_view(self, offset):
         new_pos = [self.pos[0] + offset[0], self.pos[1] + offset[1]]