Repository: flex-asjs Updated Branches: refs/heads/refactor-sprite fc302ae42 -> 5c704c98a
refactor batch 2 Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c704c98 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c704c98 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c704c98 Branch: refs/heads/refactor-sprite Commit: 5c704c98abc60b07640c3521d24639ff4a8c36d2 Parents: fc302ae Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 27 20:15:58 2016 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 27 20:15:58 2016 +0300 ---------------------------------------------------------------------- .../flex/org/apache/flex/core/CSSTextField.as | 44 ++++++++++++++++++++ .../beads/CSSContentAndTextToggleButtonView.as | 4 +- .../flex/flat/beads/CSSScrollBarButtonView.as | 6 +-- .../apache/flex/html/beads/DropDownListView.as | 6 +-- .../apache/flex/html/beads/IScrollBarView.as | 10 ++--- .../org/apache/flex/html/beads/ISliderView.as | 6 +-- .../org/apache/flex/html/beads/ISpinnerView.as | 6 +-- .../flex/html/beads/ImageAndTextButtonView.as | 2 +- .../org/apache/flex/html/beads/ScrollBarView.as | 16 +++---- .../flex/html/beads/SingleLineBorderBead.as | 4 +- .../org/apache/flex/html/beads/SliderView.as | 36 ++++++++-------- .../org/apache/flex/html/beads/SpinnerView.as | 30 ++++++------- .../org/apache/flex/html/beads/TextAreaView.as | 20 +++++---- .../apache/flex/html/beads/TextButtonView.as | 10 +++-- .../apache/flex/html/beads/TextFieldViewBase.as | 4 +- .../org/apache/flex/html/beads/VRuleView.as | 8 ++-- .../apache/flex/html/beads/VScrollBarView.as | 24 ++++++----- .../flex/html/beads/layouts/VScrollBarLayout.as | 16 +++---- .../html/supportClasses/ContainerContentArea.as | 2 +- .../html/supportClasses/DataItemRenderer.as | 2 +- .../html/supportClasses/ScrollingViewport.as | 10 ++--- .../html/supportClasses/StringItemRenderer.as | 2 +- 22 files changed, 162 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as index a053284..944c4bd 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as @@ -277,6 +277,50 @@ package org.apache.flex.core _textField.name = value; } + public function get background():Boolean + { + return _textField.background; + } + + public function set background(value:Boolean):void + { + _textField.background = value; + } + + public function get backgroundColor():uint + { + return _textField.backgroundColor; + } + + public function set backgroundColor(value:uint):void + { + _textField.backgroundColor = value; + } + + public function get border():Boolean + { + return _textField.border; + } + + public function set border(value:Boolean):void + { + _textField.border = value; + } + + public function get borderColor():uint + { + return _textField.borderColor; + } + + public function set borderColor(value:uint):void + { + _textField.borderColor = value; + } + + public function get numLines():int + { + return _textField.numLines; + } /** * @private http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as index aa3e8b5..95d3401 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSContentAndTextToggleButtonView.as @@ -129,8 +129,8 @@ package org.apache.flex.flat.beads var icon:StyleableCSSTextField = new StyleableCSSTextField(); icon.name = "icon"; icon.className = className + suffixMap[p]; - s.addChild(icon); - s.addChild(tf); + s.addChild(icon.textField); + s.addChild(tf.textField); } _toggleButtonModel = value.getBeadByType(IToggleButtonModel) as IToggleButtonModel; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as index 09669c4..fd6d7ae 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/beads/CSSScrollBarButtonView.as @@ -66,9 +66,9 @@ package org.apache.flex.flat.beads downArrowShape = new CSSShape(); overArrowShape = new CSSShape(); overArrowShape.state = "hover"; - upSprite.addChild(upArrowShape); - downSprite.addChild(downArrowShape); - overSprite.addChild(overArrowShape); + upSprite.addChild(upArrowShape.shape); + downSprite.addChild(downArrowShape.shape); + overSprite.addChild(overArrowShape.shape); } private var textModel:ITextModel; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as index 1334227..2d944de 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as @@ -67,9 +67,9 @@ package org.apache.flex.html.beads upTextField = new CSSTextField(); downTextField = new CSSTextField(); overTextField = new CSSTextField(); - upSprite.addChild(upTextField); - overSprite.addChild(overTextField); - downSprite.addChild(downTextField); + upSprite.addChild(upTextField.textField); + overSprite.addChild(overTextField.textField); + downSprite.addChild(downTextField.textField); upTextField.parentDrawsBackground = true; downTextField.parentDrawsBackground = true; overTextField.parentDrawsBackground = true; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as index c42daa7..a2b8494 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - import flash.display.DisplayObject; + import org.apache.flex.html.Button; import org.apache.flex.core.IScrollBarModel; import org.apache.flex.core.IStrand; @@ -43,7 +43,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - function get increment():DisplayObject; + function get increment():Button; /** * The up arrow button in a vertical ScrollBar or left arrow @@ -54,7 +54,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - function get decrement():DisplayObject; + function get decrement():Button; /** * The track in a ScrollBar @@ -64,7 +64,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - function get track():DisplayObject; + function get track():Button; /** * The thumb in a ScrollBar @@ -74,7 +74,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - function get thumb():DisplayObject; + function get thumb():Button; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as index 14a51c4..7cdd702 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as @@ -20,7 +20,7 @@ package org.apache.flex.html.beads { COMPILE::SWF { - import flash.display.DisplayObject; + import org.apache.flex.html.Button; } import org.apache.flex.core.IBead; @@ -44,7 +44,7 @@ package org.apache.flex.html.beads * @productversion FlexJS 0.0 */ COMPILE::SWF - function get track():DisplayObject; + function get track():Button; /** * The component used for the thumb button of the org.apache.flex.html.Slider. @@ -55,6 +55,6 @@ package org.apache.flex.html.beads * @productversion FlexJS 0.0 */ COMPILE::SWF - function get thumb():DisplayObject; + function get thumb():Button; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as index e786db4..e3b13a8 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISpinnerView.as @@ -20,7 +20,7 @@ package org.apache.flex.html.beads { COMPILE::SWF { - import flash.display.DisplayObject; + import org.apache.flex.html.Button; } COMPILE::JS { @@ -49,7 +49,7 @@ package org.apache.flex.html.beads * @productversion FlexJS 0.0 */ COMPILE::SWF - function get increment():DisplayObject; + function get increment():Button; COMPILE::JS function get increment():SpinnerButton; @@ -62,7 +62,7 @@ package org.apache.flex.html.beads * @productversion FlexJS 0.0 */ COMPILE::SWF - function get decrement():DisplayObject; + function get decrement():Button; COMPILE::JS function get decrement():SpinnerButton; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as index 3083465..339f796 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageAndTextButtonView.as @@ -141,7 +141,7 @@ package org.apache.flex.html.beads { var loader:Loader = new Loader(); sprite.addChildAt(loader, 0); - sprite.addChild(textField); + sprite.addChild(textField.textField); var url:String = backgroundImage as String; loader.load(new URLRequest(url)); loader.contentLoaderInfo.addEventListener(flash.events.Event.COMPLETE, function (e:flash.events.Event):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as index e3f8c50..41ef624 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as @@ -128,10 +128,10 @@ package org.apache.flex.html.beads layout.layout(); } - protected var _decrement:DisplayObject; - protected var _increment:DisplayObject; - protected var _track:DisplayObject; - protected var _thumb:DisplayObject; + protected var _decrement:Button; + protected var _increment:Button; + protected var _track:Button; + protected var _thumb:Button; /** * @copy org.apache.flex.html.beads.IScrollBarView#decrement @@ -141,7 +141,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get decrement():DisplayObject + public function get decrement():Button { return _decrement; } @@ -154,7 +154,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get increment():DisplayObject + public function get increment():Button { return _increment; } @@ -167,7 +167,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get track():DisplayObject + public function get track():Button { return _track; } @@ -180,7 +180,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get thumb():DisplayObject + public function get thumb():Button { return _thumb; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as index 49f3608..12eca51 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as @@ -75,7 +75,7 @@ package org.apache.flex.html.beads private function changeHandler(event:Event):void { var host:UIBase = UIBase(_strand); - var g:Graphics = host.graphics; + var g:Graphics = host.sprite.graphics; var w:Number = host.width; var h:Number = host.height; var state:String; @@ -85,7 +85,7 @@ package org.apache.flex.html.beads var gd:IGraphicsDrawing = _strand.getBeadByType(IGraphicsDrawing) as IGraphicsDrawing; if( this == gd ) g.clear(); - CSSBorderUtils.draw(g, w, h, host, state, false, false); + CSSBorderUtils.draw(g, w, h, host.sprite, state, false, false); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as index 071dd8d..eb0417b 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as @@ -70,14 +70,15 @@ package org.apache.flex.html.beads { super.strand = value; + var s:UIBase = UIBase(_strand); _track = new Button(); - Button(_track).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead); + _track.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead); _thumb = new Button(); - Button(_thumb).addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead); + _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead); - UIBase(_strand).addChild(_track); - UIBase(_strand).addChild(_thumb); + s.sprite.addChild(_track.button); + s.sprite.addChild(_thumb.button); IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); @@ -93,20 +94,20 @@ package org.apache.flex.html.beads // set a minimum size to trigger the size change handler var needsSizing:Boolean = true; - if( UIBase(_strand).width < 100 ) { - UIBase(_strand).width = 100; + if( s.width < 100 ) { + s.width = 100; needsSizing = false; } - if( UIBase(_strand).height < 30 ) { - UIBase(_strand).height = 30; + if( s.height < 30 ) { + s.height = 30; needsSizing = false; } if( needsSizing ) sizeChangeHandler(null); } - private var _track:DisplayObject; - private var _thumb:DisplayObject; + private var _track:Button; + private var _thumb:Button; /** * The track component. @@ -116,7 +117,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get track():DisplayObject + public function get track():Button { return _track; } @@ -129,7 +130,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get thumb():DisplayObject + public function get thumb():Button { return _thumb; } @@ -139,11 +140,12 @@ package org.apache.flex.html.beads */ private function sizeChangeHandler( event:Event ) : void { - var w:Number = UIBase(_strand).width; - var h:Number = UIBase(_strand).height; + var host:UIBase = UIBase(_strand); + var w:Number = host.width; + var h:Number = host.height; _thumb.width = 20; - _thumb.height = UIBase(_strand).height; + _thumb.height = host.height; _thumb.x = 10; _thumb.y = 0; @@ -151,10 +153,10 @@ package org.apache.flex.html.beads // the track is inset 1/2 of the thumbwidth so the thumb can // overlay the track on either end with the thumb center being // on the track's edge - _track.width = UIBase(_strand).width - _thumb.width; + _track.width = host.width - _thumb.width; _track.height = 5; _track.x = _thumb.width/2; - _track.y = (UIBase(_strand).height - _track.height)/2; + _track.y = (host.height - _track.height)/2; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as index ecb2502..205ec74 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SpinnerView.as @@ -70,8 +70,8 @@ COMPILE::JS { } COMPILE::SWF { - private var _decrement:DisplayObject; - private var _increment:DisplayObject; + private var _decrement:Button; + private var _increment:Button; } /** @@ -88,19 +88,21 @@ COMPILE::JS { COMPILE::SWF { _increment = new Button(); - Button(_increment).addBead(new UpArrowButtonView()); - Button(_increment).addBead(new ButtonAutoRepeatController()); + var i:Button = _increment + i.addBead(new UpArrowButtonView()); + i.addBead(new ButtonAutoRepeatController()); _decrement = new Button(); - Button(_decrement).addBead(new DownArrowButtonView()); - Button(_decrement).addBead(new ButtonAutoRepeatController()); + var d:Button = _decrement + d.addBead(new DownArrowButtonView()); + d.addBead(new ButtonAutoRepeatController()); - Button(_increment).x = 0; - Button(_increment).y = 0; - Button(_decrement).x = 0; - Button(_decrement).y = Button(_increment).height; + i.x = 0; + i.y = 0; + d.x = 0; + d.y = i.height; - UIBase(_strand).addChild(_decrement); - UIBase(_strand).addChild(_increment); + UIBase(_strand).sprite.addChild(d.button); + UIBase(_strand).sprite.addChild(i.button); rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel; IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); @@ -132,7 +134,7 @@ COMPILE::JS { * @productversion FlexJS 0.0 */ COMPILE::SWF - public function get decrement():DisplayObject + public function get decrement():Button { return _decrement; } @@ -151,7 +153,7 @@ COMPILE::JS { * @productversion FlexJS 0.0 */ COMPILE::SWF - public function get increment():DisplayObject + public function get increment():Button { return _increment; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as index ef25539..ce795cf 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextAreaView.as @@ -21,6 +21,7 @@ package org.apache.flex.html.beads import flash.display.DisplayObject; import flash.events.Event; import flash.events.IEventDispatcher; + import flash.text.TextField; import flash.text.TextFieldType; import org.apache.flex.core.IBead; @@ -116,10 +117,10 @@ package org.apache.flex.html.beads var vb:VScrollBar = vScrollBar; // Default size - var ww:Number = DisplayObject(host).width; - if( isNaN(ww) || ww == 0 ) DisplayObject(host).width = 100; - var hh:Number = DisplayObject(host).height; - if( isNaN(hh) || hh == 0 ) DisplayObject(host).height = 42; + var ww:Number = host.width; + if( isNaN(ww) || ww == 0 ) host.width = 100; + var hh:Number = host.height; + if( isNaN(hh) || hh == 0 ) host.height = 42; // for input, listen for changes to the _textField and update // the model @@ -152,19 +153,20 @@ package org.apache.flex.html.beads private function textScrollHandler(event:Event):void { - var visibleLines:int = textField.bottomScrollV - textField.scrollV + 1; + var tf:TextField = textField.textField; + var visibleLines:int = tf.bottomScrollV - tf.scrollV + 1; var scrollableLines:int = textField.numLines - visibleLines + 1; var vsbm:ScrollBarModel = ScrollBarModel(vScrollBar.model); vsbm.minimum = 0; vsbm.maximum = textField.numLines+1; - vsbm.value = textField.scrollV; + vsbm.value = tf.scrollV; vsbm.pageSize = visibleLines; vsbm.pageStepSize = visibleLines; } private function sizeChangedHandler(event:Event):void { - var ww:Number = DisplayObject(host).width; + var ww:Number = host.width; if( !isNaN(ww) && ww > 0 ) _border.width = ww; @@ -172,7 +174,7 @@ package org.apache.flex.html.beads if( !isNaN(ww) && ww > 0 ) textField.width = ww; - var hh:Number = DisplayObject(host).height; + var hh:Number = host.height; if( !isNaN(hh) && hh > 0 ) { textField.height = hh; @@ -188,7 +190,7 @@ package org.apache.flex.html.beads private function scrollHandler(event:Event):void { var vpos:Number = IScrollBarModel(vScrollBar.model).value; - textField.scrollV = vpos; + textField.textField.scrollV = vpos; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as index b1ab648..2b5acdf 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextButtonView.as @@ -30,6 +30,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.ITextModel; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; + import org.apache.flex.html.Button; /** * The TextButtonView class is the default view for @@ -94,6 +95,7 @@ package org.apache.flex.html.beads override public function set strand(value:IStrand):void { super.strand = value; + var button:SimpleButton = Button(value).button; textModel = value.getBeadByType(ITextModel) as ITextModel; textModel.addEventListener("textChange", textChangeHandler); textModel.addEventListener("htmlChange", htmlChangeHandler); @@ -101,10 +103,10 @@ package org.apache.flex.html.beads shape.graphics.beginFill(0xCCCCCC); shape.graphics.drawRect(0, 0, 10, 10); shape.graphics.endFill(); - SimpleButton(value).upState = upTextField; - SimpleButton(value).downState = downTextField; - SimpleButton(value).overState = overTextField; - SimpleButton(value).hitTestState = shape; + button.upState = upTextField.textField; + button.downState = downTextField.textField; + button.overState = overTextField.textField; + button.hitTestState = shape; upTextField.styleParent = value; downTextField.styleParent = value; overTextField.styleParent = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as index 3ab2874..d4eebf7 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as @@ -95,7 +95,7 @@ package org.apache.flex.html.beads IEventDispatcher(_strand).addEventListener("widthChanged", widthChangeHandler); IEventDispatcher(_strand).addEventListener("heightChanged", heightChangeHandler); IEventDispatcher(_strand).addEventListener("sizeChanged", sizeChangeHandler); - DisplayObjectContainer(value).addChild(_textField); + UIBase(value).sprite.addChild(_textField.textField); if (_textModel.text !== null) text = _textModel.text; if (_textModel.html !== null) @@ -277,7 +277,7 @@ package org.apache.flex.html.beads } c = input.indexOf("<span", c1); } - _textField.styleSheet = ss; + _textField.textField.styleSheet = ss; _textField.htmlText = input; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as index 5eb6c4c..901bb96 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VRuleView.as @@ -78,10 +78,10 @@ package org.apache.flex.html.beads private function handleSizeChange(event:Object):void { var ui:UIBase = _strand as UIBase; - ui.graphics.clear(); - ui.graphics.beginFill(0); - ui.graphics.drawRect(0, 0, 1, ui.height); - ui.graphics.endFill(); + ui.sprite.graphics.clear(); + ui.sprite.graphics.beginFill(0); + ui.sprite.graphics.drawRect(0, 0, 1, ui.height); + ui.sprite.graphics.endFill(); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as index 840f7bf..b807b24 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/VScrollBarView.as @@ -72,24 +72,26 @@ package org.apache.flex.html.beads { super.strand = value; - UIBase(value).setWidth(ScrollBarView.FullSize, true); + var v:UIBase = UIBase(value); + v.setWidth(ScrollBarView.FullSize, true); // TODO: (aharui) put in values impl _increment = new Button(); - Button(_increment).addBead(new DownArrowButtonView()); - Button(_increment).addBead(new ButtonAutoRepeatController()); + + _increment.addBead(new DownArrowButtonView()); + _increment.addBead(new ButtonAutoRepeatController()); _decrement = new Button(); - Button(_decrement).addBead(new UpArrowButtonView()); - Button(_decrement).addBead(new ButtonAutoRepeatController()); + _decrement.addBead(new UpArrowButtonView()); + _decrement.addBead(new ButtonAutoRepeatController()); _track = new Button(); - Button(_track).addBead(new VScrollBarTrackView()); + _track.addBead(new VScrollBarTrackView()); _thumb = new Button(); - Button(_thumb).addBead(new VScrollBarThumbView()); + _thumb.addBead(new VScrollBarThumbView()); - UIBase(value).addChild(_decrement); - UIBase(value).addChild(_increment); - UIBase(value).addChild(_track); - UIBase(value).addChild(_thumb); + v.sprite.addChild(_decrement.button); + v.sprite.addChild(_increment.button); + v.sprite.addChild(_track.button); + v.sprite.addChild(_thumb.button); IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VScrollBarLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VScrollBarLayout.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VScrollBarLayout.as index 612519a..32ef56f 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VScrollBarLayout.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VScrollBarLayout.as @@ -18,16 +18,17 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads.layouts { - import flash.display.DisplayObject; import org.apache.flex.core.IBeadLayout; import org.apache.flex.core.IScrollBarModel; import org.apache.flex.core.IStrand; + import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.geom.Rectangle; import org.apache.flex.html.beads.IScrollBarView; import org.apache.flex.html.beads.ScrollBarView; + import org.apache.flex.html.Button; import org.apache.flex.utils.CSSContainerUtils; /** @@ -83,12 +84,13 @@ package org.apache.flex.html.beads.layouts sbModel = _strand.getBeadByType(IScrollBarModel) as IScrollBarModel var metrics:Rectangle = CSSContainerUtils.getBorderAndPaddingMetrics(_strand); - - var h:Number = DisplayObject(_strand).height + metrics.top + metrics.bottom; - var increment:DisplayObject = sbView.increment; - var decrement:DisplayObject = sbView.decrement; - var track:DisplayObject = sbView.track; - var thumb:DisplayObject = sbView.thumb; + + var host:UIBase = UIBase(_strand); + var h:Number = host.height + metrics.top + metrics.bottom; + var increment:Button = sbView.increment; + var decrement:Button = sbView.decrement; + var track:Button = sbView.track; + var thumb:Button = sbView.thumb; decrement.x = 0; decrement.y = 0; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as index 46426cd..4e44b1d 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as @@ -66,7 +66,7 @@ package org.apache.flex.html.supportClasses { COMPILE::SWF { - removeChildren(0); + sprite.removeChildren(0); } COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as index 796e6b7..63fcda5 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as @@ -126,7 +126,7 @@ package org.apache.flex.html.supportClasses super.addedToParent(); background = new Sprite(); - addChild(background); + sprite.addChild(background); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as index d7c8d71..2380960 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as @@ -261,7 +261,7 @@ package org.apache.flex.html.supportClasses _verticalScroller.x : viewportWidth, (_horizontalScroller != null && _horizontalScroller.visible) ? _horizontalScroller.y : viewportHeight); - contentArea.scrollRect = rect; + contentArea.sprite.scrollRect = rect; return contentSize; } @@ -313,9 +313,9 @@ package org.apache.flex.html.supportClasses { var host:UIBase = UIBase(_strand); var vpos:Number = ScrollBarModel(_verticalScroller.model).value; - var rect:Rectangle = contentArea.scrollRect; + var rect:Rectangle = contentArea.sprite.scrollRect; rect.y = vpos; - contentArea.scrollRect = rect; + contentArea.sprite.scrollRect = rect; _verticalScrollPosition = vpos; } @@ -325,9 +325,9 @@ package org.apache.flex.html.supportClasses { var host:UIBase = UIBase(_strand); var hpos:Number = ScrollBarModel(_horizontalScroller.model).value; - var rect:Rectangle = contentArea.scrollRect; + var rect:Rectangle = contentArea.sprite.scrollRect; rect.x = hpos; - contentArea.scrollRect = rect; + contentArea.sprite.scrollRect = rect; _horizontalScrollPosition = hpos; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c704c98/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as index b897012..91bf787 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as @@ -77,7 +77,7 @@ package org.apache.flex.html.supportClasses { super.addedToParent(); - addChild(textField); + sprite.addChild(textField.textField); adjustSize(); }
