Merge pull request #8685 from bobjacobsen/Redo-PR-8668

LayoutEditor:No minimal zoom
JMRI · Jun 15, 2020 · 6a2f7bb · 6a2f7bb
2 parents c121473 + abd5dd0
commit 6a2f7bb
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/java/src/jmri/jmrit/display/layoutEditor/LayoutEditor.java b/java/src/jmri/jmrit/display/layoutEditor/LayoutEditor.java
@@ -1985,24 +1985,6 @@ public void mouseWheelMoved(@Nonnull MouseWheelEvent event) {
         }
     }
 
-    //
-    // enable the apropreate zoom menu items based on the zoomFactor
-    //
-    private void enableZoomMenuItem(double zoomFactor) {
-        zoom025Item.setEnabled(zoomFactor <= 0.25);
-        zoom05Item.setEnabled(zoomFactor <= 0.5);
-        zoom075Item.setEnabled(zoomFactor <= 0.75);
-        noZoomItem.setEnabled(zoomFactor <= 1.0);
-        zoom15Item.setEnabled(zoomFactor <= 1.5);
-        zoom20Item.setEnabled(zoomFactor <= 2.0);
-        zoom30Item.setEnabled(zoomFactor <= 3.0);
-        zoom40Item.setEnabled(zoomFactor <= 4.0);
-        zoom50Item.setEnabled(zoomFactor <= 5.0);
-        zoom60Item.setEnabled(zoomFactor <= 6.0);
-        zoom70Item.setEnabled(zoomFactor <= 7.0);
-        zoom80Item.setEnabled(zoomFactor <= 8.0);
-    }
-
     //
     // select the apropreate zoom menu item based on the zoomFactor
     //
@@ -2042,15 +2024,6 @@ private void selectZoomMenuItem(double zoomFactor) {
      * @return the new scale amount (not necessarily the same as zoomFactor)
      */
     public double setZoom(double zoomFactor) {
-        // re-calculate minZoom (so panel never smaller than view)
-        JScrollPane scrollPane = getPanelScrollPane();
-        Rectangle2D scrollBounds = scrollPane.getViewportBorderBounds();
-        Rectangle2D panelBounds = getPanelBounds();
-        Dimension panelSize = MathUtil.getSize(panelBounds);
-        minZoom = Math.min(scrollBounds.getWidth() / panelSize.getWidth(),
-                scrollBounds.getHeight() / panelSize.getHeight());
-        enableZoomMenuItem(minZoom);
-
         double newZoom = MathUtil.pin(zoomFactor, minZoom, maxZoom);
         selectZoomMenuItem(newZoom);