Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -re7f5d035eb29a63a65efeecb8cc4c90b43beb88a -r8582bb3b3412620db230c2bfca0fd0c3f5dc27be --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision e7f5d035eb29a63a65efeecb8cc4c90b43beb88a) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 8582bb3b3412620db230c2bfca0fd0c3f5dc27be) @@ -1260,6 +1260,14 @@ return _ddm; } + public function get taWidth():Number{ + return toolActWidth + } + + public function get taHeight():Number{ + return toolActHeight + } + /* public function getPropertyInspector():MovieClip{ return _pi; Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r7fa0f4aa602f523f623dc5bb1a6a6a57cd18bb71 -r8582bb3b3412620db230c2bfca0fd0c3f5dc27be --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 7fa0f4aa602f523f623dc5bb1a6a6a57cd18bb71) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 8582bb3b3412620db230c2bfca0fd0c3f5dc27be) @@ -576,15 +576,15 @@ }else { var parentAct = mm.getMonitor().ddm.getActivityByUIID(this.activity.parentUIID) } - if(parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){ - trace("called by view") - styleObj = _tm.getStyleObject('ACTPanel1') - act_pnl.setStyle('styleName',styleObj); - }else { + //if(parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){ + //trace("called by view") + //styleObj = _tm.getStyleObject('ACTPanel1') + //act_pnl.setStyle('styleName',styleObj); + //}else { styleObj = getAssociatedStyle() //_tm.getStyleObject('ACTPanel') act_pnl.setStyle('styleName',styleObj); - } + //} }else { styleObj = getAssociatedStyle() //_tm.getStyleObject('ACTPanel') act_pnl.setStyle('styleName',styleObj); Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r02fb4c577051e70d964f6cc40b16bc23d4077226 -r8582bb3b3412620db230c2bfca0fd0c3f5dc27be --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 02fb4c577051e70d964f6cc40b16bc23d4077226) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 8582bb3b3412620db230c2bfca0fd0c3f5dc27be) @@ -129,8 +129,9 @@ if (ca._x > 142 || ca._x < -129 || ca._y < -55 || ca._y > optionalOnCanvas[i].getpanelHeight){ trace (ca.activity.activityUIID+" had a hitTest with canvas.") //give it the new co-ords and 'drop' it - ca.activity.xCoord = _xmouse - _canvasModel.getPosition().x; - ca.activity.yCoord = _ymouse - _canvasModel.getPosition().y; + + ca.activity.xCoord = (_xmouse - _canvasModel.getPosition().x) - (_canvasModel.getCanvas().taWidth/2); + ca.activity.yCoord = (_ymouse - _canvasModel.getPosition().y) - (_canvasModel.getCanvas().taHeight/2); _canvasModel.removeOptionalCA(ca, optionalOnCanvas[i].activity.activityUIID); } else { activitySnapBack(ca);