[449870] Zoom relative to the mouse pointer location.

eclipse · Dec 19, 2014 · a646ad8 · a646ad8
1 parent d1f17ca
commit a646ad8
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXZoomOnScrollPolicy.java b/org.eclipse.gef4.mvc.fx/src/org/eclipse/gef4/mvc/fx/policies/FXZoomOnScrollPolicy.java
@@ -35,18 +35,16 @@ public void scroll(ScrollEvent event) {
 	public void zoomRelative(double relativeZoom, double sceneX, double sceneY) {
 		ViewportModel viewportModel = getHost().getRoot().getViewer()
 				.getAdapter(ViewportModel.class);
-		FXRootPart root = (FXRootPart) getHost().getRoot();
-		Point2D contentLayerPivot = root.getContentLayer().sceneToLocal(sceneX,
-				sceneY);
-		// TODO: pivot
+		Point2D contentGroupPivot = ((FXRootPart) getHost().getRoot())
+				.getScrollPane().getContentGroup().sceneToLocal(sceneX, sceneY);
 		viewportModel.setContentsTransform(viewportModel.getContentsTransform()
 				.concatenate(
 						new AffineTransform()
-								.translate(-contentLayerPivot.getX(),
-										-contentLayerPivot.getY())
+								.translate(contentGroupPivot.getX(),
+										contentGroupPivot.getY())
 								.scale(relativeZoom, relativeZoom)
-								.translate(contentLayerPivot.getX(),
-										contentLayerPivot.getY())));
+								.translate(-contentGroupPivot.getX(),
+										-contentGroupPivot.getY())));
 	}
 
 }