Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml,v diff -u -r1.17 -r1.18 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 30 Mar 2010 02:06:49 -0000 1.17 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 30 Mar 2010 02:43:35 -0000 1.18 @@ -132,7 +132,7 @@ activityComponent.mouseOffSetX = point.x; activityComponent.mouseOffSetY = point.y; - DragManager.doDrag(activityComponent, ds, event, AuthorUtil.getImage(activityComponent), 0, 0, 1.0, false); + DragManager.doDrag(activityComponent, ds, event, AuthorUtil.getImage(activityComponent.getChildAt(0)), 0, 0, 1.0, false); activityComponent.visible = false; } } Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml,v diff -u -r1.8 -r1.9 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml 29 Mar 2010 02:16:01 -0000 1.8 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml 30 Mar 2010 02:43:35 -0000 1.9 @@ -36,7 +36,7 @@ Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml,v diff -u -r1.6 -r1.7 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml 29 Mar 2010 02:16:01 -0000 1.6 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml 30 Mar 2010 02:43:35 -0000 1.7 @@ -60,7 +60,7 @@ horizontalAlign="center" paddingTop="5" paddingRight="5" paddingBottom="5" paddingLeft="5" backgroundColor="#C2D5FE" verticalGap="2" - borderStyle="solid" cornerRadius="10" dropShadowEnabled="true" shadowDirection="right" + borderStyle="solid" cornerRadius="4" dropShadowEnabled="true" shadowDirection="right" minWidth="90" minHeight="100" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);" Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml,v diff -u -r1.8 -r1.9 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml 29 Mar 2010 02:16:01 -0000 1.8 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml 30 Mar 2010 02:43:35 -0000 1.9 @@ -39,7 +39,7 @@ ]]> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml,v diff -u -r1.4 -r1.5 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml 29 Mar 2010 02:16:02 -0000 1.4 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml 30 Mar 2010 02:43:35 -0000 1.5 @@ -25,7 +25,7 @@ borderStyle="solid" dropShadowEnabled="true" shadowDirection="right" - cornerRadius="10" + cornerRadius="4" backgroundColor="#C2D5FE" minHeight="50" minWidth="60"> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml,v diff -u -r1.2 -r1.3 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml 29 Mar 2010 02:16:01 -0000 1.2 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml 30 Mar 2010 02:43:35 -0000 1.3 @@ -10,6 +10,10 @@ // This is just fro grouping, public var groupingType:int; + // Point of mouse during drag + public var mouseOffSetX:int; + public var mouseOffSetY:int; + ]]> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml,v diff -u -r1.6 -r1.7 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml 29 Mar 2010 02:16:00 -0000 1.6 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml 30 Mar 2010 02:43:35 -0000 1.7 @@ -90,8 +90,15 @@ break; } */ + // Need to get stage coords and convert since localX,Y is returning wrong values + var point:Point = new Point(event.stageX, event.stageY); + point = dragInitiator.globalToLocal(point); + + dragInitiator.mouseOffSetX = 40; + dragInitiator.mouseOffSetY = 30; + ds.addData(activityComponent, "dragActivity"); - DragManager.doDrag(dragInitiator, ds, event, activityComponent, 25, 15, 1.00, false); + DragManager.doDrag(dragInitiator, ds, event, activityComponent, - point.x + 40, - point.y + 30, 1.00, false); } ]]> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as,v diff -u -r1.16 -r1.17 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 30 Mar 2010 02:06:49 -0000 1.16 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 30 Mar 2010 02:43:35 -0000 1.17 @@ -13,7 +13,6 @@ import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent; import org.lamsfoundation.lams.author.components.activity.*; import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent; - import org.lamsfoundation.lams.author.components.transition.TransitionComponent; import org.lamsfoundation.lams.author.model.activity.GroupActivity; import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry; import org.lamsfoundation.lams.author.util.Constants; @@ -129,14 +128,24 @@ } else if (event.dragInitiator is LearningLibraryEntryComponent || event.dragInitiator is SystemToolComponent) { // Adding a new activity to the canvas - var learningLibraryEntryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent - // Get the next UIID var nextActivityUIID:int = generateUIID(); - var newActivityComponent:ActivityComponent = ActivityComponentFactory.getActivityComponentInstanceFromDrag(learningLibraryEntryComponent, nextActivityUIID); - newActivityComponent.rootActivity.xCoord = currentMousePoint.x - learningLibraryEntryComponent.mouseOffSetX; - newActivityComponent.rootActivity.yCoord = currentMousePoint.y - learningLibraryEntryComponent.mouseOffSetY; + // Get the offset point to place the activity + var point:Point = new Point(0,0); + if (event.dragInitiator is LearningLibraryEntryComponent) { + var learningLibraryEntryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent + point.x = learningLibraryEntryComponent.mouseOffSetX + point.y = learningLibraryEntryComponent.mouseOffSetY; + } else { + var systemToolComponent:SystemToolComponent = event.dragInitiator as SystemToolComponent + point.x = systemToolComponent.mouseOffSetX + point.y = systemToolComponent.mouseOffSetY; + } + + var newActivityComponent:ActivityComponent = ActivityComponentFactory.getActivityComponentInstanceFromDrag(event.dragInitiator, nextActivityUIID); + newActivityComponent.rootActivity.xCoord = currentMousePoint.x - point.x; + newActivityComponent.rootActivity.yCoord = currentMousePoint.y - point.y; canvasBox.addChild(newActivityComponent); selectActivityComponent(newActivityComponent); activities[nextActivityUIID] = newActivityComponent.rootActivity;