Fixed a bug that moving a window will trim the window out of some 4x4 dimension.

jossonsmith · jossonsmith · commit 98d88d5ccdd8 · 2007-01-25T13:53:22.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/dnd/ShellFrameDND.java
@@ -26,13 +26,14 @@
  * 2006-3-15
  */
 public class ShellFrameDND implements DragListener {
-	int sourceX = 0;
-	int sourceY = 0;
-	int sourceWidth = 0;
-	int sourceHeight = 0;
+	protected int sourceX = 0;
+	protected int sourceY = 0;
+	protected int sourceWidth = 0;
+	protected int sourceHeight = 0;
 	String resize = null;
 	Element frame = null;
 	private Element overFrameHandle;
+	
 	public boolean isDraggable(HTMLEventWrapper e) {
 		String cssName = e.target.className;
 		if (cssName != null) { 
@@ -90,6 +91,7 @@ public boolean dragBegan(DragEvent e) {
 		e.startX = e.currentX;
 		e.startY = e.currentY;
 		if  (firstTime) {
+			this.initFrameBounds(this.sourceX, this.sourceY, this.sourceWidth, this.sourceHeight);
 			this.frame.style.width = this.sourceWidth + "px";
 			this.frame.style.height = this.sourceHeight + "px";
 		}
@@ -250,6 +252,12 @@ private void clean() {
 			overFrameHandle = null;
 		}
 	};
+	/**
+	 * To initialize bounds.
+	 */
+	public boolean initFrameBounds(int x, int y, int width, int height) {
+		return true;
+	};
 	public boolean updateShellBounds(int x, int y, int width, int height) {
 		return true;
 	};
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java
@@ -588,6 +588,8 @@ public void run() {
 	if (DragAndDrop.class != null) {
 		DragAndDrop dnd = new DragAndDrop();
 		dnd.addDragListener(new ShellFrameDND() {
+			protected int deltaWidth = 0;
+			protected int deltaHeight = 0;
 			public boolean isDraggable(HTMLEventWrapper e) {
 				if (super.isDraggable(e) && !getMaximized()) {
 					String cssName = e.target.className;
@@ -600,8 +602,16 @@ public boolean isDraggable(HTMLEventWrapper e) {
 					return false;
 				}
 			}
+			public boolean initFrameBounds(int x, int y, int width, int height) {
+				Rectangle bs = getBounds();
+				this.deltaWidth = this.sourceWidth - bs.width;
+				this.deltaHeight = this.sourceHeight - bs.height;
+				return true;
+			}
 			public boolean updateShellBounds(int x, int y, int w, int h) {
 				boolean moved = (x != left || y != top);
+				w -= deltaWidth;
+				h -= deltaHeight;
 				boolean resized = (w != width || h != height);
 				setBounds(x, y, w, h);
 				if (moved) {
