Merge "Fix 3099036: Drag visualization appears in wrong spot" into honeycomb

2011-01-17 16:57:49 -08:00
parent 8bc22687b4 62bbb3c573
commit 1d8ad0dd3b
2 changed files with 15 additions and 0 deletions
@@ -2259,6 +2259,13 @@ public class Workspace extends SmoothPagedView
                                    dragView.getDragRegionHeight());
                        }
                    }
+                } else if (source == this) {
+                    // When dragging from the workspace, the drag view is slightly bigger than
+                    // the original view, and offset vertically. Adjust to account for this.
+                    final View origView = mDragInfo.cell;
+                    originX += (dragView.getMeasuredWidth() - origView.getWidth()) / 2;
+                    originY += (dragView.getMeasuredHeight() - origView.getHeight()) / 2
+                            + dragView.getOffsetY();
                }

                if (mDragTargetLayout != null) {