Merge pull request #56 from FIUS/feature/reset-zoom

Add reset for zoom on task switch
FIUS · Oct 2, 2019 · d07c9ef · d07c9ef
2 parents d3c25b8 + 0fdf713
commit d07c9ef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/...ava/de/unistuttgart/informatik/fius/icge/simulation/internal/StandardSimulationProxy.java b/...ava/de/unistuttgart/informatik/fius/icge/simulation/internal/StandardSimulationProxy.java
@@ -197,6 +197,7 @@ public void setTaskSelectorListener(TaskSelectorListener listener) {
     @Override
     public void selectedTaskChange(String element) {
         if (!element.equals(this.currentTaskName)) {
+            this.gameWindow.getPlayfieldDrawer().resetZoomAndPan();
             this.switchTask(element);
         }
     }

diff --git a/ICGE-Ui/src/main/java/de/unistuttgart/informatik/fius/icge/ui/PlayfieldDrawer.java b/ICGE-Ui/src/main/java/de/unistuttgart/informatik/fius/icge/ui/PlayfieldDrawer.java
@@ -36,4 +36,9 @@ public interface PlayfieldDrawer {
      *     The number of the current tick
      */
     void draw(long tickCount);
+
+    /**
+     * Reset Zoom and Pan applied by the user to the default values.
+     */
+    public void resetZoomAndPan();
 }
diff --git a/.../src/main/java/de/unistuttgart/informatik/fius/icge/ui/internal/SwingPlayfieldDrawer.java b/.../src/main/java/de/unistuttgart/informatik/fius/icge/ui/internal/SwingPlayfieldDrawer.java
@@ -227,6 +227,13 @@ public void draw(long tickCount) {
         this.repaintManager.setDoubleBufferingEnabled(bufferEnabled);
     }
 
+    @Override
+    public void resetZoomAndPan() {
+        this.scale = 1.0;
+        this.offsetX = SwingPlayfieldDrawer.CELL_SIZE;
+        this.offsetY = SwingPlayfieldDrawer.CELL_SIZE;
+    }
+
     @Override
     public Dimension getPreferredSize() {
         return new Dimension(800, 600);