Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r9ec26ce99fad04e7c7c1f89f58b887950c35052a -re3d15492e3a10571a06d11436773309490ab5706 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 9ec26ce99fad04e7c7c1f89f58b887950c35052a) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision e3d15492e3a10571a06d11436773309490ab5706) @@ -4,9 +4,13 @@ import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.authoring.cv.*; import org.lamsfoundation.lams.common.style.* + import com.polymercode.Draw; +import mx.managers.* +import mx.containers.*; +import mx.events.* +import mx.utils.* - /** * CanvasActivity - */ @@ -28,10 +32,12 @@ private var _activity:Activity; private var _isSelected:Boolean; - + private var app:Application; //locals private var icon_mc:MovieClip; - private var icon_mcl:MovieClipLoader; + private var icon_mcl:MovieClipLoader; + private var bkg_pnl:MovieClip; + private var act_pnl:MovieClip; private var title_lbl:MovieClip; private var groupIcon_mc:MovieClip; private var stopSign_mc:MovieClip; @@ -50,6 +56,8 @@ function CanvasActivity(){ //Debugger.log("_activity:"+_activity.title,4,'Constructor','CanvasActivity'); _tm = ThemeManager.getInstance(); + //Get reference to application and design data model + app = Application.getInstance(); //let it wait one frame to set up the components. //this has to be set b4 the do later :) if(_activity.isGateActivity()){ @@ -94,6 +102,7 @@ private function showAssets(isVisible:Boolean){ groupIcon_mc._visible = isVisible; title_lbl._visible = isVisible; + act_pnl._visible = isVisible; icon_mc._visible = isVisible; stopSign_mc._visible = isVisible; canvasActivity_mc._visible = isVisible; @@ -190,8 +199,8 @@ */ private function draw(){ Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); + setStyles(); - var theIcon_mc:MovieClip; title_lbl._visible = true; @@ -200,7 +209,8 @@ if(_activity.isGateActivity()){ stopSign_mc._visible = true; canvasActivity_mc._visible=false; - title_lbl.visible=false; + title_lbl._visible=false; + act_pnl._visible = false; clickTarget_mc._width = CanvasActivity.GATE_ACTIVITY_WIDTH; clickTarget_mc._height= CanvasActivity.GATE_ACTIVITY_HEIGHT; stopSign_mc._height= CanvasActivity.GATE_ACTIVITY_HEIGHT; @@ -274,11 +284,11 @@ var now:Number = new Date().getTime(); if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ - //Debugger.log('DoubleClicking:'+this,Debugger.GEN,'onPress','CanvasActivity'); - _doubleClicking = true; - _canvasController.activityDoubleClick(this); - - + //Debugger.log('DoubleClicking: '+_canvasModel.activeTool,Debugger.GEN,'onPress','CanvasActivity'); + if (app.controlKeyPressed != "transition"){ + _doubleClicking = true; + _canvasController.activityDoubleClick(this); + } /* if(workspaceRef.inspecting){ // click to zoom in / zoom out @@ -290,7 +300,7 @@ */ }else{ - //Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity'); + Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity'); _doubleClicking = false; //Debugger.log('_canvasController:'+_canvasController,Debugger.GEN,'onPress','CanvasActivity'); @@ -324,15 +334,15 @@ private function onRelease():Void{ if(!_doubleClicking){ - //Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','CanvasActivity'); + Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','CanvasActivity'); _canvasController.activityRelease(this); } } private function onReleaseOutside():Void{ - //Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity'); + Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity'); _canvasController.activityReleaseOutside(this); } @@ -389,11 +399,10 @@ title_lbl.setStyle('styleName',styleObj); title_lbl.setStyle('textAlign', 'center'); - //title_lbl.setStyle('textAlign','center'); - - - + styleObj = _tm.getStyleObject('ACTPanel') + act_pnl.setStyle('styleName',styleObj); + }