Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -r75f0bf5107c50b5a61dc5a310f05baff8e2e700e -r049adbba5b4124226990409c18922b1e320e287d --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 75f0bf5107c50b5a61dc5a310f05baff8e2e700e) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 049adbba5b4124226990409c18922b1e320e287d) @@ -56,7 +56,11 @@ private var _newToolContentID:Number; private var _newChildToolContentID:Number; private var _undoStack:Array; - private var _redoStack:Array; + private var _redoStack:Array; + private var toolActWidth:Number = 123; + private var toolActHeight:Number = 50; + private var complexActWidth:Number = 143; + //private var _pi:MovieClip; //Property inspector @@ -373,12 +377,13 @@ var actToCopy:Activity = ta.mainActivity; //loosly typed this var as it might be any type of activity var actToAdd:Activity; - + var actType:String; Debugger.log('actToCopy.activityTypeID:'+actToCopy.activityTypeID,Debugger.GEN,'setDroppedTemplateActivity','Canvas'); //_global.breakpoint(); switch(actToCopy.activityTypeID){ case(Activity.TOOL_ACTIVITY_TYPE): + actType = "Tool" actToAdd = ToolActivity(actToCopy.clone()); //give it a new UIID: actToAdd.activityUIID = _ddm.newUIID(); @@ -389,7 +394,7 @@ actToAdd.activityUIID = _ddm.newUIID(); case(Activity.PARALLEL_ACTIVITY_TYPE): - + actType = "Parallel" actToAdd = Activity(actToCopy.clone()); //give it a new UIID: @@ -434,8 +439,14 @@ actToAdd.learningDesignID = _ddm.learningDesignID; //give it the mouse co-ords - actToAdd.xCoord = canvasView.getViewMc()._xmouse; - actToAdd.yCoord = canvasView.getViewMc()._ymouse; + if (actType = "Parallel"){ + actToAdd.xCoord = canvasView.getViewMc()._xmouse - (complexActWidth/2); + actToAdd.yCoord = canvasView.getViewMc()._ymouse; + } + if(actType = "Tool"){ + actToAdd.xCoord = canvasView.getViewMc()._xmouse - (toolActWidth/2); + actToAdd.yCoord = canvasView.getViewMc()._ymouse - (toolActHeight/2); + } Debugger.log('actToAdd:'+actToAdd.title+':'+actToAdd.activityUIID,4,'setDroppedTemplateActivity','Canvas'); @@ -766,7 +777,9 @@ public function startTransitionTool():Void{ //Debugger.log('Starting transition tool',Debugger.GEN,'startTransitionTool','Canvas'); Cursor.showCursor(Application.C_TRANSITION); + canvasModel.lockAllComplexActivities(); canvasModel.startTransitionTool(); + } /** @@ -777,6 +790,7 @@ public function stopTransitionTool():Void{ //Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','Canvas'); Cursor.showCursor(Application.C_DEFAULT); + canvasModel.unlockAllComplexActivities(); canvasModel.stopTransitionTool(); } @@ -1042,9 +1056,19 @@ } + public function get toolActivityWidth():Number{ + return toolActWidth; + } + public function get toolActivityHeight():Number{ + return toolActHeight; + } + public function get complexActivityWidth():Number{ + return complexActWidth; + } + /** * Used by application to set the Position * @param x