Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r6ab25b5b1b81cff862bfc98b2c6692433f025c72 -r80c77ce7a7b28f65e0c271c9c4ac57bbc1d790f7 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 6ab25b5b1b81cff862bfc98b2c6692433f025c72) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 80c77ce7a7b28f65e0c271c9c4ac57bbc1d790f7) @@ -37,7 +37,7 @@ private var _canvasModel:CanvasModel; private var _canvasView:CanvasView; - + private var _pi:PropertyInspectorNew; /** * Constructor * @@ -47,6 +47,7 @@ super (cm); //have to do an upcast _canvasModel = CanvasModel(getModel()); + _pi = new PropertyInspectorNew(); } @@ -99,8 +100,10 @@ _canvasModel.selectedItem = ca; if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE){ _canvasModel.openToolActivityContent(ca.activity); - }else{ - //TODO: Show the property inspector if its a parralel activity or whatever + }else if(ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SYNCH_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PERMISSION_GATE_ACTIVITY_TYPE){ + if (!_pi.isPIExpanded()){ + _canvasModel.setPIHeight(_pi.piFullHeight()); + } } }