From f6b38066c76fd22424ce30205ba8ce989540ce06 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Tue, 16 Dec 2014 22:06:27 -0600
Subject: [PATCH] Added logic to reset zoom of image editor when
 switching/creating images and also fixed blue rectangle showing in wrong
 place when drawing rectangles.

---
 .../outlaweditor/apple/AppleImageEditor.java         | 12 ++++++------
 .../ui/impl/ImageEditorTabControllerImpl.java        |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
index f3333d5e..43a1ea6e 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
@@ -253,8 +253,8 @@ public class AppleImageEditor extends ImageEditor implements EventHandler<MouseE
 
     private void startSelection(int x, int y) {
         selectRect = new Rectangle(1, 1, Color.NAVY);
-        selectRect.setTranslateX(x * xScale * zoom);
-        selectRect.setTranslateY(y * yScale * zoom);
+        selectRect.setTranslateX(x * xScale);
+        selectRect.setTranslateY(y * yScale);
         selectRect.setOpacity(0.5);
         selectStartX = x;
         selectStartY = y;
@@ -266,10 +266,10 @@ public class AppleImageEditor extends ImageEditor implements EventHandler<MouseE
             startSelection(x, y);
         }
 
-        double minX = Math.min(selectStartX, x) * xScale * zoom;
-        double minY = Math.min(selectStartY, y) * yScale * zoom;
-        double maxX = Math.max(selectStartX, x) * xScale * zoom;
-        double maxY = Math.max(selectStartY, y) * yScale * zoom;
+        double minX = Math.min(selectStartX, x) * xScale;
+        double minY = Math.min(selectStartY, y) * yScale;
+        double maxX = Math.max(selectStartX, x) * xScale;
+        double maxY = Math.max(selectStartY, y) * yScale;
         selectRect.setTranslateX(minX);
         selectRect.setTranslateY(minY);
         selectRect.setWidth(maxX - minX);
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/ImageEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/ImageEditorTabControllerImpl.java
index 76011b5b..92d2bbde 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/ImageEditorTabControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/ImageEditorTabControllerImpl.java
@@ -205,6 +205,8 @@ public class ImageEditorTabControllerImpl extends ImageEditorTabController {
             currentImageEditor.setEntity(i);
             currentImageEditor.buildEditorUI(imageEditorScrollAnchorPane);
             currentImageEditor.buildPatternSelector(imagePatternMenu);
+            imageEditorZoomGroup.setScaleX(1.0);
+            imageEditorZoomGroup.setScaleY(1.0);
         }
     }