Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as =================================================================== diff -u -r28cb89c7a2c83239db0370b3911eee3195de4f23 -rb9b3c709cb91a986353699a2b860cc9d84d51025 --- lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision 28cb89c7a2c83239db0370b3911eee3195de4f23) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision b9b3c709cb91a986353699a2b860cc9d84d51025) @@ -53,7 +53,8 @@ public static var LESSON_X:Number = 0; public static var LESSON_Y:Number = 82; public static var SPAD_X:Number = 0; - public static var SPAD_H:Number = 200; + public static var SPAD_Y:Number = 554; + public static var SPAD_H:Number = 220; private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root @@ -212,7 +213,7 @@ _lesson = new Lesson(_appRoot_mc,LESSON_X,LESSON_Y); _lesson.addEventListener('load',Proxy.create(this,UIElementLoaded)); - _scratchpad_mc = _appRoot_mc.createChildAtDepth('LScratchPad', DepthManager.kTop, {_x:SPAD_X, _y:Stage.height-SPAD_H}); + _scratchpad_mc = _container_mc.createChildAtDepth('LScratchPad', DepthManager.kTop, {_x:SPAD_X, _y:SPAD_Y, _lessonModel:_lesson.model, _lessonController:_lesson.view.getController()}); _scratchpad_mc.addEventListener('load', Proxy.create(this, UIElementLoaded)); } @@ -304,13 +305,18 @@ var someListener:Object = new Object(); someListener.onMouseUp = function () { - _lesson.setSize(w,h); + _lesson.setSize(w,h-(LESSON_Y+_lesson.model.getSpadHeight())); + + _scratchpad_mc._y = h - _lesson.model.getSpadHeight(); } Header(_header_mc).resize(w); - Scratchpad(_scratchpad_mc).resize(w); - _lesson.setSize(w,h-LESSON_Y-SPAD_H); + _lesson.setSize(w,h-(LESSON_Y+_lesson.model.getSpadHeight())); + //Property Inspector + //_pi_mc.setSize(w-_toolkit.width,_pi_mc._height) + _scratchpad_mc._y = h - _lesson.model.getSpadHeight(); + } /** Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as =================================================================== diff -u -red35881d1862bc4c0594588815e995b2bb28aca0 -rb9b3c709cb91a986353699a2b860cc9d84d51025 --- lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision ed35881d1862bc4c0594588815e995b2bb28aca0) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision b9b3c709cb91a986353699a2b860cc9d84d51025) @@ -20,23 +20,36 @@ * http://www.gnu.org/licenses/gpl.txt * ************************************************************************ */ - -import mx.controls.* -import mx.utils.* -import mx.managers.* -import mx.events.* - -import org.lamsfoundation.lams.learner.*; +import org.lamsfoundation.lams.learner.*; +import org.lamsfoundation.lams.learner.ls.*; import org.lamsfoundation.lams.common.Sequence; import org.lamsfoundation.lams.common.ToolTip; import org.lamsfoundation.lams.common.util.*; import org.lamsfoundation.lams.common.dict.*; -import org.lamsfoundation.lams.common.style.*; +import org.lamsfoundation.lams.common.style.*; +import mx.controls.* +import mx.utils.* +import mx.managers.* +import mx.events.* + class Scratchpad extends MovieClip { - private var _scratchpad_mc:MovieClip; - private var _container:MovieClip; // Holding Container + //Height Properties + private var spadHeightHide:Number = 20; + private var spadHeightFull:Number = 217; + + //Open Close Identifier + private var _spadIsExpended:Boolean; + + //Component properties + private var _scratchpad_mc:MovieClip; + private var spadHead_pnl:MovieClip; + private var spadTitle_lbl:Label; + private var _container:MovieClip; // Holding Container + private var minIcon:MovieClip; + private var maxIcon:MovieClip; + private var clickTarget_mc:MovieClip; private var view_btn:MovieClip; // buttons private var save_btn:MovieClip; private var view_lbl:TextField; @@ -51,7 +64,8 @@ private var entry_txa:TextArea; private var panel:MovieClip; //The underlaying panel base - + private var _lessonModel:LessonModel; + private var _lessonController:LessonController; private var _tm:ThemeManager; private var _dictionary:Dictionary; @@ -86,9 +100,12 @@ //Delete the enterframe dispatcher delete this.onEnterFrame; - + _lessonModel = _lessonModel; + _lessonController = _lessonController; _scratchpad_mc = this; - + _spadIsExpended = false; + maxIcon._visible = false; + _lessonModel.setSpadHeight(spadHeightHide); setLabels(); resize(Stage.width); @@ -111,11 +128,44 @@ save_btn.onRollOver = Proxy.create(this,this['showToolTip'], save_btn, "sp_save_tooltip"); save_btn.onRollOut = Proxy.create(this,this['hideToolTip']); - + clickTarget_mc.onRelease = Proxy.create (this, localOnRelease); + clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside); this.onEnterFrame = setLabels; } + public function localOnRelease():Void{ + + if (_spadIsExpended){ + trace("P Pressed in 'localOnRelease' and _spadIsExpended is: "+_spadIsExpended) + _spadIsExpended = false + minIcon._visible = true; + maxIcon._visible = false; + _lessonModel.setSpadHeight(spadHeightHide); + + }else { + trace("P Pressed in 'localOnRelease' and _spadIsExpended is: "+_spadIsExpended) + _spadIsExpended = true + minIcon._visible = false; + maxIcon._visible = true; + _lessonModel.setSpadHeight(spadHeightFull); + //Application.getInstance().onResize(); + } + } + + public function isSpadExpanded():Boolean{ + return _spadIsExpended; + } + + public function spadFullHeight():Number{ + return spadHeightFull; + } + + + public function localOnReleaseOutside():Void{ + Debugger.log('Release outside so no event has been fired, current state is: ' + _spadIsExpended,Debugger.GEN,'localOnReleaseOutside','Scratch Pad'); + + } public function showToolTip(btnObj, btnTT:String):Void{ var Xpos = Application.HEADER_X+ 5; @@ -138,15 +188,23 @@ styleObj = _tm.getStyleObject('textarea'); title_txi.setStyle('styleName', styleObj); entry_txa.setStyle('styleName', styleObj); + spadTitle_lbl.setStyle('styleName', styleObj); + //For Panels + styleObj = _tm.getStyleObject('BGPanel'); + spadHead_pnl.setStyle('styleName',styleObj); } private function setLabels(){ //Set the text for buttons view_lbl.text = Dictionary.getValue('sp_view_lbl'); save_lbl.text = Dictionary.getValue('sp_save_lbl'); + + //Set text for Scratch pad labels + spadTitle_lbl.text = Dictionary.getValue('sp_panel_lbl'); _title.text = Dictionary.getValue('sp_title_lbl'); + setStyles(); delete this.onEnterFrame;