X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapCanvas.java;h=acac7a186dc6d923f1fec056479ae893dd015511;hp=2308facb099668175044103480110e81b605574f;hb=eebbb64b5d63f9eea43a0dff908c30361a376768;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa

diff --git a/tim/prune/gui/map/MapCanvas.java b/tim/prune/gui/map/MapCanvas.java
index 2308fac..acac7a1 100644
--- a/tim/prune/gui/map/MapCanvas.java
+++ b/tim/prune/gui/map/MapCanvas.java
@@ -276,6 +276,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 		zoomInItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e)
 			{
+				panMap((_popupMenuX - getWidth()/2)/2, (_popupMenuY - getHeight()/2)/2);
 				zoomIn();
 			}});
 		_popup.add(zoomInItem);
@@ -283,6 +284,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 		zoomOutItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e)
 			{
+				panMap(-(_popupMenuX - getWidth()/2), -(_popupMenuY - getHeight()/2));
 				zoomOut();
 			}});
 		_popup.add(zoomOutItem);
@@ -1090,10 +1092,14 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 	public void mouseWheelMoved(MouseWheelEvent inE)
 	{
 		int clicks = inE.getWheelRotation();
-		if (clicks < 0)
+		if (clicks < 0) {
+			panMap((inE.getX() - getWidth()/2)/2, (inE.getY() - getHeight()/2)/2);
 			zoomIn();
-		else if (clicks > 0)
+		}
+		else if (clicks > 0) {
+			panMap(-(inE.getX() - getWidth()/2), -(inE.getY() - getHeight()/2));
 			zoomOut();
+		}
 	}
 
 	/**