8263389: IGV: Zooming changes the point that is currently centered

Reviewed-by: rrich, neliasso
openjdk · Jul 5, 2021 · 164eff8c8a8f96efc5bfb659d8b02de420b8416b · 164eff8 · openjdk-notifier · Jul 5, 2021
1 parent 371d996
commit 164eff8c8a8f96efc5bfb659d8b02de420b8416b
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
@@ -151,28 +151,31 @@ private static boolean intersects(Set<? extends Object> s1, Set<? extends Object
     @Override
     public void zoomOut() {
         double zoom = getZoomFactor();
-        Point viewPosition = getScrollPane().getViewport().getViewPosition();
         double newZoom = zoom / DiagramScene.ZOOM_INCREMENT;
         if (newZoom > DiagramScene.ZOOM_MIN_FACTOR) {
-            setZoomFactor(newZoom);
-            validate();
-            getScrollPane().getViewport().setViewPosition(new Point((int) (viewPosition.x / DiagramScene.ZOOM_INCREMENT), (int) (viewPosition.y / DiagramScene.ZOOM_INCREMENT)));
+            zoom(newZoom);
         }
     }
 
     @Override
     public void zoomIn() {
 
         double zoom = getZoomFactor();
-        Point viewPosition = getScrollPane().getViewport().getViewPosition();
         double newZoom = zoom * DiagramScene.ZOOM_INCREMENT;
         if (newZoom < DiagramScene.ZOOM_MAX_FACTOR) {
-            setZoomFactor(newZoom);
-            validate();
-            getScrollPane().getViewport().setViewPosition(new Point((int) (viewPosition.x * DiagramScene.ZOOM_INCREMENT), (int) (viewPosition.y * DiagramScene.ZOOM_INCREMENT)));
+            zoom(newZoom);
         }
     }
 
+    private void zoom(double newZoom) {
+        double currentZoom = getZoomFactor();
+        Point viewPosition = getScrollPane().getViewport().getViewPosition();
+        Rectangle viewRect = getScrollPane().getViewport().getViewRect();
+        setZoomFactor(newZoom);
+        validate();
+        getScrollPane().getViewport().validate();
+        getScrollPane().getViewport().setViewPosition(new Point((int) ((viewPosition.x + viewRect.width / 2) * newZoom / currentZoom - viewRect.width / 2), (int) ((viewPosition.y + viewRect.height / 2) * newZoom / currentZoom - viewRect.height / 2)));
+    }
 
     @Override
     public void centerFigures(List<Figure> list) {