[vassalengine-svn] SF.net SVN: vassalengine:[8125] VASSAL-src/branches/lance3.1.18/src/VASSAL/ build/module/map/PieceMover.java

[<lan...@us...>]

Revision: 8125
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8125&view=rev
Author:   lanceleu
Date:     2012-04-16 04:31:58 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Fix for Bug 4204 that keeps dragPointOffset as final

Modified Paths:
--------------
    VASSAL-src/branches/lance3.1.18/src/VASSAL/build/module/map/PieceMover.java

Modified: VASSAL-src/branches/lance3.1.18/src/VASSAL/build/module/map/PieceMover.java
===================================================================
--- VASSAL-src/branches/lance3.1.18/src/VASSAL/build/module/map/PieceMover.java	2012-04-16 03:55:57 UTC (rev 8124)
+++ VASSAL-src/branches/lance3.1.18/src/VASSAL/build/module/map/PieceMover.java	2012-04-16 04:31:58 UTC (rev 8125)
@@ -1190,22 +1190,20 @@
 
       final BufferedImage dragImage = makeDragImage(dragPieceOffCenterZoom);
 
+      int xOffset = boundingBox.x + currentPieceOffsetX - EXTRA_BORDER;
+      int yOffset = boundingBox.y + currentPieceOffsetY - EXTRA_BORDER;
+      
+      if (isDragImageSupported)
+      {
+    	  xOffset = -1 * xOffset;
+    	  yOffset = -1 * yOffset;
+      }
+
       // begin dragging
       try {
     	  
-        Point dragPointOffset = null;
+        final Point dragPointOffset = new Point(xOffset, yOffset);
         
-        if (!isDragImageSupported)
-        {
-          dragPointOffset = new Point(
-          boundingBox.x + currentPieceOffsetX - EXTRA_BORDER,
-          boundingBox.y + currentPieceOffsetY - EXTRA_BORDER);
-        }
-        else
-        	dragPointOffset = new Point(
-    	          -1 * (boundingBox.x + currentPieceOffsetX - EXTRA_BORDER),
-    	          -1 * (boundingBox.y + currentPieceOffsetY - EXTRA_BORDER));
-        
         dge.startDrag(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR),
                       dragImage, dragPointOffset,
                       new StringSelection(""), this); //$NON-NLS-1$

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.