fixed fit to screen infinite loop when placing a single place

Author: mtygesen

src/main/java/pipe/gui/GuiFrame.java

@@ -276,6 +276,7 @@ public void actionPerformed(ActionEvent e) {
                     putValue(Action.NAME, FIT_TO_SCREEN_NAME);
                     putValue(Action.SHORT_DESCRIPTION, FIT_TO_SCREEN_TOOLTIP);
                     putValue(Action.SMALL_ICON, ResourceManager.getIcon(FIT_TO_SCREEN_ICON));
+                    o.setIsAlreadyFitToScreen(false);
                 }
             });
         }

src/main/java/pipe/gui/petrinet/PetriNetTab.java

@@ -1861,9 +1861,11 @@ public void fitToScreen() {
         final int margin = 50;
 
         // Loop until it converges
+        Double prevZoom = null;
         while (true) {
             Iterable<PetriNetObject> petriNetObjects = currentTemplate().guiModel().getPetriNetObjects();
             if (!petriNetObjects.iterator().hasNext()) {
+                alreadyFitToScreen = true;
                 return;
             }
 
@@ -1947,12 +1949,13 @@ public void fitToScreen() {
             double xZoomFactor = (double) viewport.getWidth() / width;
             double yZoomFactor = (double) viewport.getHeight() / height;
             double zoomFactor = Math.min(xZoomFactor, yZoomFactor);
-            double zoomPercent = Math.min(xZoomFactor, yZoomFactor) * 100;
+            double zoomPercent = zoomFactor * 100;
 
             double currentZoomPercent = drawingSurface().getZoomController().getPercent();
 
             final double zoomConvergence = 1;
-            if (Math.abs(currentZoomPercent - zoomPercent) < zoomConvergence) {
+            final double current = Math.abs(currentZoomPercent - zoomPercent);
+            if (current < zoomConvergence || (prevZoom != null && current == prevZoom)) {
                 int x = (int) (smallestX * zoomFactor) - margin;
                 int y = (int) (smallestY * zoomFactor) - margin;
 
@@ -1964,6 +1967,8 @@ public void fitToScreen() {
                 return;
             }
 
+            prevZoom = current;
+
             app.ifPresent(e -> e.updateZoomSlider((int)zoomPercent));
         }
     }