### Eclipse Workspace Patch 1.0
#P org.eclipse.draw2d
Index: src/org/eclipse/draw2d/FigureCanvas.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/FigureCanvas.java,v
retrieving revision 1.46
diff -u -r1.46 FigureCanvas.java
--- src/org/eclipse/draw2d/FigureCanvas.java	19 May 2010 20:28:18 -0000	1.46
+++ src/org/eclipse/draw2d/FigureCanvas.java	22 Sep 2010 13:08:01 -0000
@@ -402,8 +402,17 @@
 			scrollToY(y);
 		else if (y == getViewport().getViewLocation().y)
 			scrollToX(x);
-		else
-			getViewport().setViewLocation(x, y);
+		else {
+			Dimension size = viewport.getSize();
+			int deltaX = x - getViewport().getViewLocation().x;
+			int deltaY = y - getViewport().getViewLocation().y;
+			if (deltaX < size.width && deltaY < size.height) {
+				scrollToX(x);
+				scrollToY(y);
+			} else {
+				getViewport().setViewLocation(x, y);
+			}
+		}
 	}
 
 	/**