Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r9f7654858183353bddf5f412a2f23b386a9862cb -rb16405a2723a7b5fe0d835a651fc001326ff56f1 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r976deca023b114ae00e73ad6583f6c8174b25372 -rb16405a2723a7b5fe0d835a651fc001326ff56f1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 976deca023b114ae00e73ad6583f6c8174b25372) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision b16405a2723a7b5fe0d835a651fc001326ff56f1) @@ -175,7 +175,7 @@ public function viewUpdate(event:Object):Void{ Debugger.log('Received an Event dispatcher UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','CanvasBranchView'); - if(!_eventsEnabled && event.updateType != 'SET_ACTIVE') { + if(!_eventsEnabled && event.updateType != 'SET_ACTIVE' && event.updateType != 'SIZE') { Debugger.log('Events disabled.'+event.target,4,'viewUpdate','CanvasBranchView'); return; } @@ -424,7 +424,7 @@ } private function close():Void { - if(model instanceof CanvasModel) model.getCanvas().hideBin(); //typo + if(model instanceof CanvasModel) model.getCanvas().hideBin(); model.selectedItem = null; var bkeys:Array = model.branchesDisplayed.keys(); @@ -770,16 +770,13 @@ * Sets the size of the canvas on stage, called from update */ private function setSize(model):Void{ - var ba = model.currentBranchingActivity; - Debugger.log("currentBranchActivity: " + ba, Debugger.CRITICAL, "setSize", "CanvasBranchView"); + var thisCA:CanvasActivity = _canvasBranchingActivity; var s:Object = model.getSize(); - var cx:Number = ba._x + ba.getVisibleWidth()/2; - var cy:Number = ba._y + ba.getVisibleHeight()/2; + var cx:Number = thisCA._x + thisCA.getVisibleWidth()/2; + var cy:Number = thisCA._y + thisCA.getVisibleHeight()/2; - var isCanvasModel = model instanceof CanvasModel; - s.w -= 2*hSpace; s.h -= 2*vSpace; @@ -825,7 +822,7 @@ var hPosition:Number = (model instanceof CanvasModel) ? model.getCanvas().view.getScrollPaneHPosition() : model.getMonitor().getMV().getMonitorSequenceScp().hPosition; var vPosition:Number = (model instanceof CanvasModel) ? model.getCanvas().view.getScrollPaneVPosition() : model.getMonitor().getMV().getMonitorSequenceScp().vPosition; - + canvas_scp._x = (_isBranchChild) ? -cx : -cx + hSpace + hPosition; canvas_scp._y = (_isBranchChild) ? -cy : -cy + vSpace + vPosition; Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r3738f9fc1f6631f1fac6c0d3e9d51af850b91283 -rb16405a2723a7b5fe0d835a651fc001326ff56f1 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r3738f9fc1f6631f1fac6c0d3e9d51af850b91283 -rb16405a2723a7b5fe0d835a651fc001326ff56f1 Binary files differ