This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4f207cb4de Code cleanup
4f207cb4de is described below
commit 4f207cb4defc4953687931bba64cd21c91cd9e15
Author: Harbs <[email protected]>
AuthorDate: Sun Mar 8 13:01:36 2026 +0200
Code cleanup
---
.../apache/royale/html/beads/ColorPickerView.as | 144 +++++++++++----------
.../apache/royale/html/beads/ColorSpectrumView.as | 96 +++++++-------
.../org/apache/royale/html/beads/DateFieldView.as | 66 +++++-----
.../royale/html/beads/DecrementButtonView.as | 22 ++--
.../royale/html/beads/DividedContainerView.as | 4 +
.../org/apache/royale/html/beads/GroupView.as | 96 +++++++-------
.../royale/html/beads/IncrementButtonView.as | 23 ++--
.../apache/royale/html/beads/NumericStepperView.as | 27 ++--
.../apache/royale/html/beads/RangeStepperView.as | 24 ++--
.../apache/royale/html/beads/SimpleAlertView.as | 100 +++++++-------
.../org/apache/royale/html/beads/SliderView.as | 106 +++++++--------
.../org/apache/royale/html/beads/SpinnerView.as | 63 +++++----
12 files changed, 422 insertions(+), 349 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorPickerView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorPickerView.as
index 0ddff907ed..299503443f 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorPickerView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorPickerView.as
@@ -24,31 +24,29 @@ package org.apache.royale.html.beads
import org.apache.royale.core.IStyleableObject;
import org.apache.royale.core.IUIBase;
import org.apache.royale.core.UIBase;
- import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.geom.Point;
import org.apache.royale.html.Group;
import org.apache.royale.html.TextButton;
- COMPILE::JS
+ COMPILE::JS
{
import org.apache.royale.utils.CSSUtils;
import org.apache.royale.core.IRenderedObject;
}
- import org.apache.royale.utils.loadBeadFromValuesManager;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.utils.PointUtils;
import org.apache.royale.utils.UIUtils;
- import org.apache.royale.core.IStrandWithModel;
import org.apache.royale.html.supportClasses.IColorPickerPopUp;
import org.apache.royale.core.IColorModel;
- import org.apache.royale.core.IPopUp;
- import org.apache.royale.html.util.getModelByType;
-
+ import org.apache.royale.core.IPopUp;
+ import org.apache.royale.html.util.getModelByType;
+
/**
- * The ColorPickerView class creates the visual elements of the
org.apache.royale.html.ColorPicker
+ * The ColorPickerView class creates the visual elements of the
org.apache.royale.html.ColorPicker
* component. The job of the view bead is to put together the parts of
the ComboBox such as the color container
* and org.apache.royale.html.Button to trigger the pop-up.
- *
+ *
* @viewbead
* @langversion 3.0
* @playerversion Flash 10.2
@@ -61,12 +59,12 @@ package org.apache.royale.html.beads
{
super();
}
-
+
protected var selectedColorDisplay:IUIBase;
-
+
/**
* The TextInput component of the ComboBox.
- *
+ *
* @copy org.apache.royale.html.beads.IComboBoxView#text
*
* @langversion 3.0
@@ -78,12 +76,12 @@ package org.apache.royale.html.beads
{
return selectedColorDisplay;
}
-
+
private var button:TextButton;
-
+
/**
* The Button component of the ComboBox.
- *
+ *
* @copy org.apache.royale.html.beads.IComboBoxView#text
*
* @langversion 3.0
@@ -95,12 +93,12 @@ package org.apache.royale.html.beads
{
return button;
}
-
+
private var list:IUIBase;
-
+
/**
* The pop-up component of the ComboBox.
- *
+ *
* @copy org.apache.royale.html.beads.IComboBoxView#text
*
* @langversion 3.0
@@ -112,31 +110,34 @@ package org.apache.royale.html.beads
{
return list;
}
-
+
/**
* @private
* @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
* @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion org.apache.royale.core.IStyleableObject
+ * @royaleignorecoercion
org.apache.royale.html.supportClasses.IColorPickerPopUp
*/
override public function set strand(value:IStrand):void
{
super.strand = value;
-
+
var host:UIBase = value as UIBase;
-
+
selectedColorDisplay = new Group();
- (selectedColorDisplay as IStyleableObject).className =
"ColorPickerDisplayedColor";
-
+ (selectedColorDisplay as IStyleableObject).className =
"ColorPickerDisplayedColor";
+
button = new TextButton();
button.style = {
- "padding": 0,
- "margin": 0
- };
+ "padding": 0,
+ "margin": 0
+ };
button.text = '\u25BC';
-
- if (isNaN(host.width)) selectedColorDisplay.width = 25;
-
- COMPILE::JS
+
+ if (isNaN(host.width))
+ selectedColorDisplay.width = 25;
+
+ COMPILE::JS
{
// inner components are absolutely positioned
so we want to make sure the host is the offset parent
if (!host.element.style.position)
@@ -146,25 +147,25 @@ package org.apache.royale.html.beads
}
host.addElement(selectedColorDisplay);
host.addElement(button);
-
- loadBeadFromValuesManager(IPopUp, "iPopUp", _strand);
+
+ loadBeadFromValuesManager(IPopUp, "iPopUp", _strand);
list = _strand.getBeadByType(IColorPickerPopUp) as
IUIBase;
list.visible = false;
-
- var model:IEventDispatcher = (_strand as
IStrandWithModel).model as IEventDispatcher;
+
+ var model:IEventDispatcher = host.model as
IEventDispatcher;
(list as IColorPickerPopUp).model = model;
model.addEventListener("change", handleColorChange);
-
-
IEventDispatcher(_strand).addEventListener("sizeChanged", handleSizeChange);
-
+
+ host.addEventListener("sizeChanged", handleSizeChange);
+
// set initial value and positions using default sizes
colorChangeAction();
sizeChangeAction();
}
-
+
/**
* Returns whether or not the pop-up is visible.
- *
+ *
* @copy org.apache.royale.html.beads.IComboBoxView#text
*
* @langversion 3.0
@@ -174,38 +175,45 @@ package org.apache.royale.html.beads
*/
public function get popUpVisible():Boolean
{
- if (list) return list.visible;
- else return false;
+ if (list)
+ return list.visible;
+ else
+ return false;
}
/**
* @royaleignorecoercion org.apache.royale.core.IComboBoxModel
* @royaleignorecoercion org.apache.royale.core.IUIBase
+ * @royaleignorecoercion org.apache.royale.core.IRenderedObject
+ * @royaleignorecoercion
org.apache.royale.html.supportClasses.IColorPickerPopUp
*/
public function set popUpVisible(value:Boolean):void
{
- if (value && !list.visible) {
- var model:IColorModel = getModelByType(_strand,IColorModel) as
IColorModel;
+ if (value && !list.visible)
+ {
+ var model:IColorModel = getModelByType(_strand,
IColorModel) as IColorModel;
(list as IColorPickerPopUp).model = model;
list.visible = true;
-
- var origin:Point = new Point(0,
button.y+button.height);
- var relocated:Point =
PointUtils.localToGlobal(origin,_strand);
- list.x = relocated.x
+
+ var origin:Point = new Point(0, button.y +
button.height);
+ var relocated:Point =
PointUtils.localToGlobal(origin, _strand);
+ list.x = relocated.x;
list.y = relocated.y;
- COMPILE::JS {
+ COMPILE::JS
+ {
(list as
IRenderedObject).element.style.position = "absolute";
}
-
+
var popupHost:IPopUpHost =
UIUtils.findPopUpHost(_strand as IUIBase);
popupHost.popUpParent.addElement(list);
}
- else if (list.visible) {
+ else if (list.visible)
+ {
UIUtils.removePopUp(list);
list.visible = false;
}
}
-
+
/**
* @private
*/
@@ -213,7 +221,7 @@ package org.apache.royale.html.beads
{
sizeChangeAction();
}
-
+
/**
* @private
*/
@@ -221,34 +229,37 @@ package org.apache.royale.html.beads
{
colorChangeAction();
}
-
+
/**
* @private
* @royaleignorecoercion org.apache.royale.core.IColorModel
*/
protected function colorChangeAction():void
{
- var model:IColorModel = getModelByType(_strand,IColorModel) as
IColorModel;
- COMPILE::JS
+ var model:IColorModel = getModelByType(_strand,
IColorModel) as IColorModel;
+ COMPILE::JS
{
selectedColorDisplay.element.style.backgroundColor =
CSSUtils.attributeFromColor(model.color);
}
}
-
+
/**
* @private
* @royaleignorecoercion org.apache.royale.core.UIBase
*/
protected function sizeChangeAction():void
{
- var host:UIBase = UIBase(_strand);
-
+ var host:UIBase = _strand as UIBase;
+
selectedColorDisplay.x = 0;
selectedColorDisplay.y = 0;
selectedColorDisplay.height = 20;
- if (host.isWidthSizedToContent()) {
+ if (host.isWidthSizedToContent())
+ {
selectedColorDisplay.width = 25;
- } else {
+ }
+ else
+ {
selectedColorDisplay.width = host.width - 20;
}
@@ -256,16 +267,19 @@ package org.apache.royale.html.beads
button.y = 0;
button.width = 20;
button.height = selectedColorDisplay.height;
-
- COMPILE::JS {
+
+ COMPILE::JS
+ {
selectedColorDisplay.element.style.position =
"absolute";
button.element.style.position = "absolute";
}
-
- if (host.isHeightSizedToContent()) {
+
+ if (host.isHeightSizedToContent())
+ {
host.height = selectedColorDisplay.height;
}
- if (host.isWidthSizedToContent()) {
+ if (host.isWidthSizedToContent())
+ {
host.width = selectedColorDisplay.width +
button.width;
}
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorSpectrumView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorSpectrumView.as
index ac7b8ab241..8b4681886a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorSpectrumView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ColorSpectrumView.as
@@ -1,3 +1,4 @@
+////////////////////////////////////////////////////////////////////////////////
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
@@ -17,67 +18,69 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.BeadViewBase;
- import org.apache.royale.core.IColorSpectrumModel;
- import org.apache.royale.core.IParent;
- import org.apache.royale.core.IRenderedObject;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IStrandWithModel;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.Button;
- import org.apache.royale.html.TextButton;
- import org.apache.royale.utils.CSSUtils;
- import org.apache.royale.utils.HSV;
- import org.apache.royale.utils.rgbToHsv;
-
- /**
- * The ColorSpectrumView class is the view for
- * the org.apache.royale.html.ColorSpectrum
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
+ import org.apache.royale.core.BeadViewBase;
+ import org.apache.royale.core.IColorSpectrumModel;
+ import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IRenderedObject;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IStrandWithModel;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.TextButton;
+ import org.apache.royale.utils.CSSUtils;
+ import org.apache.royale.utils.HSV;
+ import org.apache.royale.utils.rgbToHsv;
+
+ /**
+ * The ColorSpectrumView class is the view for
+ * the org.apache.royale.html.ColorSpectrum
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.6
+ */
public class ColorSpectrumView extends BeadViewBase implements
ISliderView
{
private var _thumb:TextButton;
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
+
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.6
+ */
public function ColorSpectrumView()
{
super();
}
-
- /**
- * @private
- */
+
+ /**
+ * @private
+ * @royaleignorecoercion org.apache.royale.core.IParent
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ */
override public function set strand(value:IStrand):void
{
super.strand = value;
_thumb = new TextButton();
_thumb.className = "SliderThumb";
- _thumb.style = {"position" : "absolute", "padding" : 0};
+ _thumb.style = {"position": "absolute", "padding": 0};
_thumb.text = '\u29BF';
(value as IParent).addElement(_thumb);
(colorModel as
IEventDispatcher).addEventListener("baseColorChange", changeHandler);
(colorModel as
IEventDispatcher).addEventListener("hsvModifiedColorChange", changeHandler);
updateSpectrum();
}
-
+
private function changeHandler(e:Event):void
{
updateSpectrum();
}
-
+
/**
* The track component.
*
@@ -103,7 +106,9 @@ package org.apache.royale.html.beads
{
return _thumb;
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IRenderedObject
+ */
protected function updateSpectrum():void
{
var color:String =
CSSUtils.attributeFromColor(colorModel.baseColor);
@@ -112,14 +117,17 @@ package org.apache.royale.html.beads
(host as
IRenderedObject).element.style.background = "linear-gradient(to top, #000000,
transparent), linear-gradient(to left, " + color + ", #ffffff)";
}
var hsvModifiedColor:uint = colorModel.hsvModifiedColor
|| colorModel.baseColor;
- var r:uint = (hsvModifiedColor >> 16 ) & 255;
- var g:uint = (hsvModifiedColor >> 8 ) & 255;
+ var r:uint = (hsvModifiedColor >> 16) & 255;
+ var g:uint = (hsvModifiedColor >> 8) & 255;
var b:uint = hsvModifiedColor & 255;
- var hsv:HSV = rgbToHsv(r,g,b);
+ var hsv:HSV = rgbToHsv(r, g, b);
_thumb.x = (hsv.s / 100) * host.width - _thumb.width /
2;
_thumb.y = host.height - hsv.v * host.height / 100 -
_thumb.height / 2;
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IStrandWithModel
+ * @royaleignorecoercion
org.apache.royale.core.IColorSpectrumModel
+ */
private function get colorModel():IColorSpectrumModel
{
return (host as IStrandWithModel).model as
IColorSpectrumModel;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
index e178d8f477..6ead3ad381 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
@@ -18,25 +18,23 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.BeadViewBase;
+ import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IDateChooserModel;
- import org.apache.royale.core.IDateChooserModelWithChangeCheck;
+ import org.apache.royale.core.IDateChooserModelWithChangeCheck;
import org.apache.royale.core.IFormatter;
- import org.apache.royale.core.IParent;
import org.apache.royale.core.IPopUpHost;
import org.apache.royale.core.IStrand;
- import org.apache.royale.core.ITextInput;
+ import org.apache.royale.core.ITextInput;
import org.apache.royale.core.UIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.UIUtils;
import org.apache.royale.utils.PointUtils;
- import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.geom.Point;
- import org.apache.royale.html.beads.IComboBoxView;
+ import org.apache.royale.html.beads.IComboBoxView;
import org.apache.royale.html.supportClasses.IDateChooser;
import org.apache.royale.html.TextButton;
import org.apache.royale.html.TextInput;
@@ -105,10 +103,10 @@ package org.apache.royale.html.beads
/**
* @royaleignorecoercion org.apache.royale.core.UIBase
*/
- protected function getHost():UIBase
- {
- return _strand as UIBase;
- }
+ protected function getHost():UIBase
+ {
+ return _strand as UIBase;
+ }
/**
* @copy org.apache.royale.core.IBead#strand
@@ -122,22 +120,23 @@ package org.apache.royale.html.beads
{
super.strand = value;
- if (!_textInput)
- _textInput = new TextInput();
+ if (!_textInput)
+ _textInput = new TextInput();
getHost().addElement(_textInput);
_textInput.width = 100;
_textInput.height = 18;
_button = new TextButton();
- //_button.text = "⬇︎";
- _button.text = "\uD83D\uDCC5"
+ // _button.text = "⬇︎";
+ _button.text = "\uD83D\uDCC5";
getHost().addElement(_button);
- COMPILE::SWF {
+ COMPILE::SWF
+ {
_button.x = _textInput.width;
_button.y = _textInput.y;
var view:TextInputView =
_strand.getBeadByType(IBeadView) as TextInputView;
- if(view)
+ if (view)
view.textField.type =
TextFieldType.DYNAMIC;
}
@@ -146,21 +145,21 @@ package org.apache.royale.html.beads
_textInput.element.setAttribute('readonly',
'true');
}
-
getHost().addEventListener("initComplete",handleInitComplete);
+ getHost().addEventListener("initComplete",
handleInitComplete);
}
+
/**
- * @royaleignorecoercion org.apache.royale.core.IBeadModel
* @royaleignorecoercion org.apache.royale.core.IStrandWithModel
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
*/
private function handleInitComplete(event:Event):void
{
_textInput.height = _button.height;
- var model:IBeadModel = (_strand as
IStrandWithModel).model as IBeadModel;
-
IEventDispatcher(model).addEventListener("selectedDateChanged",
selectionChangeHandler);
+ var model:IEventDispatcher = (_strand as
IStrandWithModel).model as IEventDispatcher;
+ model.addEventListener("selectedDateChanged",
selectionChangeHandler);
}
-
protected var _popUp:IDateChooser;
/**
@@ -191,13 +190,19 @@ package org.apache.royale.html.beads
return _popUpVisible;
}
protected var _showingPopup:Boolean;
+ /**
+ * @royaleignorecoercion
org.apache.royale.html.supportClasses.IDateChooser
+ * @royaleignorecoercion
org.apache.royale.core.IDateChooserModel
+ * @royaleignorecoercion
org.apache.royale.core.IDateChooserModelWithChangeCheck
+ * @royaleignorecoercion org.apache.royale.core.IPopUpHost
+ */
public function set popUpVisible(value:Boolean):void
{
// prevent resursive calls
// setting _popUp.selectedDate below triggers a change
event
// which tries to close the popup causing a recursive
call.
// There might be a better way to resolve this problem,
but this works for now...
- if(_showingPopup)
+ if (_showingPopup)
return;
if (value != _popUpVisible)
@@ -207,14 +212,14 @@ package org.apache.royale.html.beads
if (value)
{
if (!_popUp)
- {
- _popUp = ValuesManager.valuesImpl.newInstance(_strand,
"iPopUp") as IDateChooser;
- }
+ {
+ _popUp =
ValuesManager.valuesImpl.newInstance(_strand, "iPopUp") as IDateChooser;
+ }
- var model:IDateChooserModel =
getModelByType(_strand,IDateChooserModel) as IDateChooserModel;
+ var model:IDateChooserModel =
getModelByType(_strand, IDateChooserModel) as IDateChooserModel;
_popUp.selectedDate =
model.selectedDate;
- var popUpModel:IDateChooserModelWithChangeCheck =
getModelByType(_popUp,IDateChooserModelWithChangeCheck) as
IDateChooserModelWithChangeCheck;
- popUpModel.disableChangeCheck = true;
+ var
popUpModel:IDateChooserModelWithChangeCheck = getModelByType(_popUp,
IDateChooserModelWithChangeCheck) as IDateChooserModelWithChangeCheck;
+ popUpModel.disableChangeCheck = true;
var host:IPopUpHost =
UIUtils.findPopUpHost(getHost());
var point:Point = new
Point(_textInput.width, _button.height);
@@ -222,7 +227,8 @@ package org.apache.royale.html.beads
var p3:Point =
PointUtils.globalToLocal(p2, host);
_popUp.x = p3.x;
_popUp.y = p3.y;
- COMPILE::JS {
+ COMPILE::JS
+ {
_popUp.element.style.position =
"absolute";
}
@@ -238,6 +244,8 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion
org.apache.royale.core.IDateChooserModel
+ * @royaleignorecoercion org.apache.royale.core.IFormatter
*/
private function selectionChangeHandler(event:Event):void
{
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DecrementButtonView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DecrementButtonView.as
index 13aba3bcdc..3a6e5b39a0 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DecrementButtonView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DecrementButtonView.as
@@ -40,6 +40,7 @@ package org.apache.royale.html.beads
/**
* @copy org.apache.royale.core.IBead#strand
+ * @royaleignorecoercion org.apache.royale.core.UIBase
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -54,17 +55,20 @@ package org.apache.royale.html.beads
var host:UIBase = _strand as UIBase;
_backRect = new Rect();
- _backRect.fill = new SolidColor();
- (_backRect.fill as SolidColor).color = 0xFFFFFF;
- _backRect.stroke = new SolidColorStroke();
- (_backRect.stroke as SolidColorStroke).color = 0x000000;
- (_backRect.stroke as SolidColorStroke).weight = 1.0;
+ var fill:SolidColor = new SolidColor();
+ fill.color = 0xf8f8f8;
+ _backRect.fill = fill;
+ var stroke:SolidColorStroke = new SolidColorStroke();
+ stroke.color = 0x000000;
+ stroke.weight = 1.0;
+ _backRect.stroke = stroke;
host.addElement(_backRect);
// arrow
_arrow = new Path();
- _arrow.fill = new SolidColor();
- (_arrow.fill as SolidColor).color = 0x000000;
+ fill = new SolidColor();
+ fill.color = 0x000000;
+ _arrow.fill = fill;
host.addElement(_arrow);
host.addEventListener("widthChanged", sizeHandler);
@@ -72,7 +76,9 @@ package org.apache.royale.html.beads
sizeHandler(null);
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ */
private function sizeHandler(event:Event):void
{
var host:UIBase = _strand as UIBase;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
index 6a9d367242..a2fab131bf 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
@@ -72,6 +72,10 @@ package org.apache.royale.html.beads
/**
* Handles the "childrenAdded" event and generates the
separators between them
* based on the direction of the box.
+ *
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion
org.apache.royale.html.supportClasses.IDividedContainerDivider
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.DividedContainerModel
*
* @langversion 3.0
* @playerversion Flash 10.2
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
index afc9dcefc0..3bcb058c7a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
@@ -20,45 +20,46 @@ package org.apache.royale.html.beads
{
import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBeadView;
- import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
import org.apache.royale.core.ILayoutChild;
import org.apache.royale.core.ILayoutHost;
import org.apache.royale.core.ILayoutView;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.layout.EdgeData;
+ import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.core.UIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.utils.loadBeadFromValuesManager;
- COMPILE::SWF {
+ COMPILE::SWF
+ {
import org.apache.royale.geom.Size;
}
/**
* The GroupView is a bead that manages the layout bead (if any)
attached to a Group. This class
* also provides support for background and border styles for a Group
on the SWF platform.
- *
+ *
* @viewbead
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
*/
public class GroupView extends BeadViewBase implements ILayoutHost
{
/**
- * The GroupView class is the default view for
- * the org.apache.royale.html.Group class.
- * It lets you use some CSS styles to manage the border, background
- * and padding around the content area.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
- */
+ * The GroupView class is the default view for
+ * the org.apache.royale.html.Group class.
+ * It lets you use some CSS styles to manage the border,
background
+ * and padding around the content area.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
public function GroupView()
{
super();
@@ -94,7 +95,6 @@ package org.apache.royale.html.beads
return host;
}
-
private var layoutRunning:Boolean;
/**
@@ -109,7 +109,8 @@ package org.apache.royale.html.beads
{
super.strand = value;
- COMPILE::SWF {
+ COMPILE::SWF
+ {
displayBackgroundAndBorder(host as UIBase);
}
@@ -130,18 +131,20 @@ package org.apache.royale.html.beads
*/
protected function handleInitComplete(event:Event):void
{
- var ilc:ILayoutChild = host as ILayoutChild;
+ var ilc:ILayoutChild = host as ILayoutChild;
// Complete the setup if the height is sized to content
or has been explicitly set
- // and the width is sized to content or has been explicitly set
+ // and the width is sized to content or has been
explicitly set
if ((ilc.isHeightSizedToContent() ||
!isNaN(ilc.explicitHeight) || !isNaN(ilc.percentHeight)) &&
- (ilc.isWidthSizedToContent() || !isNaN(ilc.explicitWidth) ||
!isNaN(ilc.percentWidth))) {
+ (ilc.isWidthSizedToContent() ||
!isNaN(ilc.explicitWidth) || !isNaN(ilc.percentWidth)))
+ {
completeSetup();
}
- else {
+ else
+ {
// otherwise, wait until the unknown sizes have
been set and then finish
host.addEventListener("sizeChanged",
deferredSizeHandler);
- host.addEventListener("widthChanged", deferredSizeHandler);
- host.addEventListener("heightChanged", deferredSizeHandler);
+ host.addEventListener("widthChanged",
deferredSizeHandler);
+ host.addEventListener("heightChanged",
deferredSizeHandler);
}
}
@@ -156,10 +159,10 @@ package org.apache.royale.html.beads
*/
protected function deferredSizeHandler(event:Event):void
{
- host.removeEventListener("sizeChanged", deferredSizeHandler);
- host.removeEventListener("widthChanged", deferredSizeHandler);
- host.removeEventListener("heightChanged", deferredSizeHandler);
-
+ host.removeEventListener("sizeChanged",
deferredSizeHandler);
+ host.removeEventListener("widthChanged",
deferredSizeHandler);
+ host.removeEventListener("heightChanged",
deferredSizeHandler);
+
completeSetup();
}
@@ -179,7 +182,7 @@ package org.apache.royale.html.beads
host.addEventListener("widthChanged", resizeHandler);
host.addEventListener("heightChanged", resizeHandler);
}
-
+
/**
* Invoked in response to the strand being resized.
*
@@ -193,7 +196,7 @@ package org.apache.royale.html.beads
// override in subclasses in case there is something
besides running
// the layout (which is handled automatically by the
layout itself).
}
-
+
/**
* Provides a place for pre-layout actions.
*
@@ -230,7 +233,7 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
- * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
*/
COMPILE::SWF
protected function calculateContentSize():Size
@@ -239,9 +242,11 @@ package org.apache.royale.html.beads
var maxHeight:Number = 0;
var num:Number = contentView.numElements;
- for (var i:int=0; i < num; i++) {
+ for (var i:int = 0; i < num; i++)
+ {
var child:IUIBase = contentView.getElementAt(i)
as IUIBase;
- if (child == null || !child.visible) continue;
+ if (child == null || !child.visible)
+ continue;
var childXMax:Number = child.x + child.width;
var childYMax:Number = child.y + child.height;
maxWidth = Math.max(maxWidth, childXMax);
@@ -253,7 +258,7 @@ package org.apache.royale.html.beads
// return the content size as the max plus right/bottom
padding. the x,y position of
// each child is already offset by the left/top padding
by the layout algorithm.
- return new Size(maxWidth + padding.right -
(border.left+border.right), maxHeight + padding.bottom -
(border.top+border.bottom));
+ return new Size(maxWidth + padding.right - (border.left
+ border.right), maxHeight + padding.bottom - (border.top + border.bottom));
}
/**
@@ -263,7 +268,7 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
- * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
*/
COMPILE::SWF
public function afterLayout():void
@@ -276,11 +281,11 @@ package org.apache.royale.html.beads
var padding:EdgeData = (ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getPaddingMetrics(this._strand as IUIBase);
// add padding.left since it wasn't considered in
contentSize,
// and add border.right so the border can be drawn in
that column of pixels
- contentSize.width += padding.left + border.right;
+ contentSize.width += padding.left + border.right;
contentSize.height += padding.top + border.top;
-
- if (host.isWidthSizedToContent() &&
host.isHeightSizedToContent()) {
+ if (host.isWidthSizedToContent() &&
host.isHeightSizedToContent())
+ {
host.setWidthAndHeight(contentSize.width,
contentSize.height, true);
}
else if (!host.isWidthSizedToContent() &&
host.isHeightSizedToContent())
@@ -292,7 +297,7 @@ package org.apache.royale.html.beads
host.setWidth(contentSize.width, true);
}
}
-
+
COMPILE::JS
public function afterLayout():void
{
@@ -301,10 +306,11 @@ package org.apache.royale.html.beads
/**
* @private
- * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
*/
COMPILE::SWF
- protected function displayBackgroundAndBorder(host:UIBase) :
void
+
+ protected function displayBackgroundAndBorder(host:UIBase):void
{
var backgroundColor:Object =
ValuesManager.valuesImpl.getValue(host, "background-color");
var backgroundImage:Object =
ValuesManager.valuesImpl.getValue(host, "background-image");
@@ -312,8 +318,8 @@ package org.apache.royale.html.beads
{
loadBeadFromValuesManager(IBackgroundBead,
"iBackgroundBead", _strand);
}
-
- var border:EdgeData = (ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(this._strand as IUIBase);
+
+ var border:EdgeData = (ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(this._strand as IUIBase);
if (border.left + border.right + border.top +
border.bottom > 0)
{
loadBeadFromValuesManager(IBorderBead,
"iBorderBead", _strand);
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IncrementButtonView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IncrementButtonView.as
index 5459623dcc..132033aa3e 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IncrementButtonView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IncrementButtonView.as
@@ -40,6 +40,8 @@ package org.apache.royale.html.beads
/**
* @copy org.apache.royale.core.IBead#strand
+ *
+ * @royaleignorecoercion org.apache.royale.core.UIBase
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -54,17 +56,20 @@ package org.apache.royale.html.beads
var host:UIBase = _strand as UIBase;
_backRect = new Rect();
- _backRect.fill = new SolidColor();
- (_backRect.fill as SolidColor).color = 0xFFFFFF;
- _backRect.stroke = new SolidColorStroke();
- (_backRect.stroke as SolidColorStroke).color = 0x000000;
- (_backRect.stroke as SolidColorStroke).weight = 1.0;
+ var fill:SolidColor = new SolidColor();
+ fill.color = 0xFFFFFF;
+ _backRect.fill = fill;
+ var stroke:SolidColorStroke = new SolidColorStroke();
+ stroke.color = 0x000000;
+ stroke.weight = 1.0;
+ _backRect.stroke = stroke;
host.addElement(_backRect);
// arrow
_arrow = new Path();
- _arrow.fill = new SolidColor();
- (_arrow.fill as SolidColor).color = 0x000000;
+ fill = new SolidColor();
+ fill.color = 0x000000;
+ _arrow.fill = fill;
host.addElement(_arrow);
host.addEventListener("widthChanged", sizeHandler);
@@ -72,7 +77,9 @@ package org.apache.royale.html.beads
sizeHandler(null);
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ */
private function sizeHandler(event:Event):void
{
var host:UIBase = _strand as UIBase;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
index 3a19021c97..689a12a38c 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
@@ -22,7 +22,6 @@ package org.apache.royale.html.beads
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.ILayoutChild;
- import org.apache.royale.core.IParent;
import org.apache.royale.core.IParentIUIBase;
import org.apache.royale.core.IRangeModel;
import org.apache.royale.core.IStrand;
@@ -30,12 +29,12 @@ package org.apache.royale.html.beads
import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.events.ValueChangeEvent
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.Label;
import org.apache.royale.html.Spinner;
import org.apache.royale.html.TextInput;
import org.apache.royale.html.supportClasses.Border;
import org.apache.royale.utils.sendStrandEvent;
+ import org.apache.royale.core.IBeadModel;
/**
* The NumericStepperView class creates the visual elements of the
@@ -74,19 +73,19 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.9
* @royaleignorecoercion org.apache.royale.core.UIBase
- * @royaleignorecoercion org.apache.royale.core.IBead
- * @royaleignorecoercion org.apache.royale.core.IParent
- * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion org.apache.royale.core.IBeadModel
*/
override public function set strand(value:IStrand):void
{
super.strand = value;
+ var host:UIBase = value as UIBase;
+ var model:IBeadModel = host.model as IBeadModel;
// add an input field
input = new TextInput();
input.className = "NumericStepperInput";
input.typeNames = "NumericStepperInput";
- (value as IParent).addElement(input);
+ host.addElement(input);
COMPILE::JS
{
input.positioner.style.display = 'inline-block';
@@ -94,8 +93,8 @@ package org.apache.royale.html.beads
}
// add a spinner
spinner = new Spinner();
- spinner.addBead( (value as UIBase).model as IBead );
- (value as IParent).addElement(spinner);
+ spinner.addBead(model);
+ host.addElement(spinner);
// delay this until the resize event in JS
COMPILE::SWF
{
@@ -122,17 +121,16 @@ package org.apache.royale.html.beads
listenOnStrand("sizeChanged",sizeChangeHandler);
// listen for changes to the model itself and update
the UI accordingly
-
IEventDispatcher(UIBase(value).model).addEventListener("valueChange",modelChangeHandler);
-
IEventDispatcher(UIBase(value).model).addEventListener("minimumChange",modelChangeHandler);
-
IEventDispatcher(UIBase(value).model).addEventListener("maximumChange",modelChangeHandler);
-
IEventDispatcher(UIBase(value).model).addEventListener("stepSizeChange",modelChangeHandler);
-
IEventDispatcher(UIBase(value).model).addEventListener("snapIntervalChange",modelChangeHandler);
+
model.addEventListener("valueChange",modelChangeHandler);
+
model.addEventListener("minimumChange",modelChangeHandler);
+
model.addEventListener("maximumChange",modelChangeHandler);
+
model.addEventListener("stepSizeChange",modelChangeHandler);
+
model.addEventListener("snapIntervalChange",modelChangeHandler);
input.text = String(spinner.value);
COMPILE::SWF
{
- var host:ILayoutChild = ILayoutChild(value);
// Complete the setup if the height is sized to
content or has been explicitly set
// and the width is sized to content or has
been explicitly set
@@ -183,7 +181,6 @@ package org.apache.royale.html.beads
/**
* @private
- * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
*/
private function spinnerValueChanged(event:ValueChangeEvent) :
void
{
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RangeStepperView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RangeStepperView.as
index 2eaae2620b..29277a61fe 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RangeStepperView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RangeStepperView.as
@@ -25,7 +25,6 @@ package org.apache.royale.html.beads
import org.apache.royale.svg.Rect;
import org.apache.royale.graphics.SolidColorStroke;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.ImageButton;
import org.apache.royale.html.Label;
import org.apache.royale.html.beads.models.RangeModelExtended;
@@ -88,6 +87,10 @@ package org.apache.royale.html.beads
/**
* @copy org.apache.royale.core.IBead#strand
+ *
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion
org.apache.royale.beads.models.RangeModelExtended
+ *
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -102,9 +105,10 @@ package org.apache.royale.html.beads
var host:UIBase = _strand as UIBase;
_labelBox = new Rect();
- _labelBox.stroke = new SolidColorStroke();
- (_labelBox.stroke as SolidColorStroke).color = 0x000000;
- (_labelBox.stroke as SolidColorStroke).weight = 1.0;
+ var stroke:SolidColorStroke = new SolidColorStroke();
+ stroke.color = 0x000000;
+ stroke.weight = 1.0;
+ _labelBox.stroke = stroke;
_incrementButton = new ImageButton();
_incrementButton.src = "assets/up-arrow.png";
@@ -112,8 +116,8 @@ package org.apache.royale.html.beads
_decrementButton = new ImageButton();
_decrementButton.src = "assets/down-arrow.png";
-
IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-
IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
+ host.addEventListener("widthChanged",sizeChangeHandler);
+
host.addEventListener("heightChanged",sizeChangeHandler);
_label = new Label();
@@ -127,7 +131,9 @@ package org.apache.royale.html.beads
sizeChangeHandler(null);
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ */
private function sizeChangeHandler(event:Event):void
{
var host:UIBase = _strand as UIBase;
@@ -148,7 +154,9 @@ package org.apache.royale.html.beads
_decrementButton.y = host.height - 20;
_decrementButton.setWidthAndHeight(host.width, 20);
}
-
+ /**
+ * @royaleignorecoercion
org.apache.royale.beads.models.RangeModelExtended
+ */
private function handleValueChange(event:Event):void
{
var model:RangeModelExtended = (_strand as
UIBase).model as RangeModelExtended;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
index f6fa841c72..d09c073723 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
@@ -18,33 +18,33 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.BeadViewBase;
- import org.apache.royale.core.IAlertModel;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadView;
- import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
- import org.apache.royale.core.IMeasurementBead;
- import org.apache.royale.core.IParent;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.layout.EdgeData;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.MouseEvent;
- import org.apache.royale.geom.Rectangle;
- import org.apache.royale.html.Label;
- import org.apache.royale.html.TextButton;
+ import org.apache.royale.core.BeadViewBase;
+ import org.apache.royale.core.IAlertModel;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadView;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
+ import org.apache.royale.core.IMeasurementBead;
+ import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.layout.EdgeData;
+ import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.geom.Rectangle;
+ import org.apache.royale.html.Label;
+ import org.apache.royale.html.TextButton;
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.html.beads.IBackgroundBead;
import org.apache.royale.html.beads.IBorderBead;
import org.apache.royale.html.util.getModelByType;
-
+
/**
- * The SimpleAlertView class creates the visual elements of the
+ * The SimpleAlertView class creates the visual elements of the
* org.apache.royale.html.SimpleAlert component.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -63,13 +63,17 @@ package org.apache.royale.html.beads
public function SimpleAlertView()
{
}
-
+
private var messageLabel:Label;
private var okButton:TextButton;
-
+
/**
* @copy org.apache.royale.core.IBead#strand
- *
+ *
+ * @royaleignorecoercion String
+ * @royaleignorecoercion org.apache.royale.core.IAlertModel
+ * @royaleignorecoercion org.apache.royale.core.IParent
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -78,14 +82,14 @@ package org.apache.royale.html.beads
override public function set strand(value:IStrand):void
{
super.strand = value;
-
+
var backgroundColor:Object =
ValuesManager.valuesImpl.getValue(value, "background-color");
var backgroundImage:Object =
ValuesManager.valuesImpl.getValue(value, "background-image");
if (backgroundColor != null || backgroundImage != null)
{
loadBeadFromValuesManager(IBackgroundBead,
"iBackgroundBead", value);
}
-
+
var borderStyle:String;
var borderStyles:Object =
ValuesManager.valuesImpl.getValue(value, "border");
if (borderStyles is Array)
@@ -100,49 +104,51 @@ package org.apache.royale.html.beads
{
loadBeadFromValuesManager(IBorderBead,
"iBorderBead", value);
}
-
- var model:IAlertModel =
getModelByType(_strand,IAlertModel) as IAlertModel;
-
model.addEventListener("messageChange",handleMessageChange);
-
model.addEventListener("htmlMessageChange",handleMessageChange);
- messageLabel = new Label();
+ var model:IAlertModel = getModelByType(_strand,
IAlertModel) as IAlertModel;
+ model.addEventListener("messageChange",
handleMessageChange);
+ model.addEventListener("htmlMessageChange",
handleMessageChange);
+
+ messageLabel = new Label();
messageLabel.text = model.message;
messageLabel.html = model.htmlMessage;
- (host as IParent).addElement(messageLabel);
-
+ (host as IParent).addElement(messageLabel);
+
okButton = new TextButton();
okButton.text = model.okLabel;
- (host as IParent).addElement(okButton);
- okButton.addEventListener("click",handleOK);
-
+ (host as IParent).addElement(okButton);
+ okButton.addEventListener("click", handleOK);
+
handleMessageChange(null);
}
-
+
/**
* @private
- * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion
org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion org.apache.royale.core.IMeasurementBead
*/
private function handleMessageChange(event:Event):void
{
var ruler:IMeasurementBead =
messageLabel.getBeadByType(IMeasurementBead) as IMeasurementBead;
- if( ruler == null ) {
+ if (ruler == null)
+ {
messageLabel.addBead(ruler = new
(ValuesManager.valuesImpl.getValue(messageLabel, "iMeasurementBead")) as
IMeasurementBead);
}
- var maxWidth:Number =
Math.max(host.width,ruler.measuredWidth);
-
- var metrics:EdgeData = (ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderAndPaddingMetrics(_strand as IUIBase);
-
+ var maxWidth:Number = Math.max(host.width,
ruler.measuredWidth);
+
+ var metrics:EdgeData = (ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderAndPaddingMetrics(host);
+
messageLabel.x = metrics.left;
messageLabel.y = metrics.top;
messageLabel.width = maxWidth;
-
- okButton.x = (maxWidth - okButton.width)/2;
+
+ okButton.x = (maxWidth - okButton.width) / 2;
okButton.y = messageLabel.y + messageLabel.height + 20;
-
+
host.width = maxWidth + metrics.left + metrics.right;
host.height = okButton.y + okButton.height +
metrics.bottom;
}
-
+
/**
* @private
*/
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderView.as
index 794bbc5431..9e58ed5827 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SliderView.as
@@ -18,34 +18,35 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- COMPILE::SWF {
+ COMPILE::SWF
+ {
import flash.display.DisplayObject;
import flash.display.Sprite;
}
-
- import org.apache.royale.core.BeadViewBase;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadLayout;
- import org.apache.royale.core.IBeadModel;
- import org.apache.royale.core.IBeadView;
- import org.apache.royale.core.IRangeModel;
- import org.apache.royale.core.IParent;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.Button;
- import org.apache.royale.html.TextButton;
- import org.apache.royale.utils.sendStrandEvent;
- import org.apache.royale.utils.loadBeadFromValuesManager;
- import org.apache.royale.core.IStrandWithModel;
-
+
+ import org.apache.royale.core.BeadViewBase;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadLayout;
+ import org.apache.royale.core.IBeadModel;
+ import org.apache.royale.core.IBeadView;
+ import org.apache.royale.core.IRangeModel;
+ import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.Button;
+ import org.apache.royale.html.TextButton;
+ import org.apache.royale.utils.sendStrandEvent;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
+ import org.apache.royale.core.IStrandWithModel;
+
/**
- * The SliderView class creates the visual elements of the
org.apache.royale.html.Slider
+ * The SliderView class creates the visual elements of the
org.apache.royale.html.Slider
* component. The Slider has a track and a thumb control which are
also created with view beads.
- *
+ *
* @viewbead
* @langversion 3.0
* @playerversion Flash 10.2
@@ -65,17 +66,17 @@ package org.apache.royale.html.beads
public function SliderView()
{
}
-
+
private var rangeModel:IRangeModel;
-
+
/**
* @copy org.apache.royale.core.IBead#strand
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
- *
+ *
* @royaleignorecoercion org.apache.royale.core.IParent
* @royaleignorecoercion org.apache.royale.core.IRangeModel
* @royaleignorecoercion
org.apache.royale.core.IStrandWithModel
@@ -84,53 +85,54 @@ package org.apache.royale.html.beads
override public function set strand(value:IStrand):void
{
super.strand = value;
-
loadBeadFromValuesManager(IBeadLayout,"iBeadLayout",_strand);
-
- COMPILE::SWF {
+ loadBeadFromValuesManager(IBeadLayout, "iBeadLayout",
_strand);
+
+ COMPILE::SWF
+ {
var s:UIBase = UIBase(_strand);
-
+
_track = new Button();
_track.addBead(new
(ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead);
_track.className = "SliderTrack";
s.addElement(_track);
-
+
_thumb = new TextButton();
_thumb.text = '\u29BF';
_thumb.addBead(new
(ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead);
_thumb.className = "SliderThumb";
s.addElement(_thumb);
-
+
}
- COMPILE::JS {
+ COMPILE::JS
+ {
_track = new Button();
_track.className = "SliderTrack";
- _track.style = {"position": "absolute",
"padding" : 0};
+ _track.style = {"position": "absolute",
"padding": 0};
(host as IParent).addElement(_track);
-
+
_thumb = new TextButton();
_thumb.className = "SliderThumb";
- _thumb.style = {"position" : "absolute",
"padding" : 0};
+ _thumb.style = {"position": "absolute",
"padding": 0};
_thumb.text = '\u29BF';
(host as IParent).addElement(_thumb);
}
-
+
rangeModel = (_strand as IStrandWithModel).model as
IRangeModel;
var rm:IEventDispatcher = rangeModel as
IEventDispatcher;
-
+
// listen for changes to the model and adjust the UI
accordingly.
- rm.addEventListener("valueChange",modelChangeHandler);
- rm.addEventListener("minimumChange",modelChangeHandler);
- rm.addEventListener("maximumChange",modelChangeHandler);
-
rm.addEventListener("stepSizeChange",modelChangeHandler);
-
rm.addEventListener("snapIntervalChange",modelChangeHandler);
- sendStrandEvent(_strand,"layoutNeeded");
+ rm.addEventListener("valueChange", modelChangeHandler);
+ rm.addEventListener("minimumChange",
modelChangeHandler);
+ rm.addEventListener("maximumChange",
modelChangeHandler);
+ rm.addEventListener("stepSizeChange",
modelChangeHandler);
+ rm.addEventListener("snapIntervalChange",
modelChangeHandler);
+ sendStrandEvent(_strand, "layoutNeeded");
}
-
+
private var _track:Button;
private var _thumb:TextButton;
-
-
+
/**
* The track component.
*
@@ -143,7 +145,7 @@ package org.apache.royale.html.beads
{
return _track;
}
-
+
/**
* The thumb component.
*
@@ -156,13 +158,13 @@ package org.apache.royale.html.beads
{
return _thumb;
}
-
+
/**
* @private
*/
- private function modelChangeHandler( event:Event ) : void
+ private function modelChangeHandler(event:Event):void
{
- sendStrandEvent(_strand,"layoutNeeded");
+ sendStrandEvent(_strand, "layoutNeeded");
}
}
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
index 2cf47c7318..e69481c5e6 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
@@ -18,12 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
-COMPILE::SWF {
- import flash.display.DisplayObject;
- import org.apache.royale.html.beads.controllers.ButtonAutoRepeatController;
-}
+ COMPILE::SWF
+ {
+ import flash.display.DisplayObject;
+ import
org.apache.royale.html.beads.controllers.ButtonAutoRepeatController;
+ }
- import org.apache.royale.core.BeadViewBase;
+ import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IRangeModel;
@@ -34,12 +35,13 @@ COMPILE::SWF {
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.Button;
- COMPILE::JS {
+ COMPILE::JS
+ {
import
org.apache.royale.html.beads.controllers.SpinnerMouseController;
import org.apache.royale.html.supportClasses.SpinnerButton;
}
- import org.apache.royale.html.util.getModelByType;
- import org.apache.royale.core.IStrandWithModel;
+ import org.apache.royale.html.util.getModelByType;
+ import org.apache.royale.core.IStrandWithModel;
/**
* The SpinnerView class creates the visual elements of the
org.apache.royale.html.Spinner
@@ -66,15 +68,17 @@ COMPILE::SWF {
private var rangeModel:IRangeModel;
- COMPILE::JS {
- public var _increment:SpinnerButton;
- public var _decrement:SpinnerButton;
- private var controller:SpinnerMouseController;
+ COMPILE::JS
+ {
+ public var _increment:SpinnerButton;
+ public var _decrement:SpinnerButton;
+ private var controller:SpinnerMouseController;
}
- COMPILE::SWF {
- private var _decrement:DisplayObject;
- private var _increment:DisplayObject;
+ COMPILE::SWF
+ {
+ private var _decrement:DisplayObject;
+ private var _increment:DisplayObject;
}
/**
@@ -91,7 +95,8 @@ COMPILE::SWF {
{
super.strand = value;
- COMPILE::SWF {
+ COMPILE::SWF
+ {
_increment = new Button();
Button(_increment).addBead(new
UpArrowButtonView());
Button(_increment).addBead(new
ButtonAutoRepeatController());
@@ -108,9 +113,10 @@ COMPILE::SWF {
UIBase(_strand).$sprite_addChild(_increment);
rangeModel = (_strand as
IStrandWithModel).model as IRangeModel;
}
-
IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
-
IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
- COMPILE::JS {
+ (value as
IEventDispatcher).addEventListener("widthChanged", sizeChangeHandler);
+ (value as
IEventDispatcher).addEventListener("heightChanged", sizeChangeHandler);
+ COMPILE::JS
+ {
var host:UIBase = value as UIBase;
// depending on the surrounding layout, the
element can be offset without this.
host.element.style.position = "absolute";
@@ -125,19 +131,19 @@ COMPILE::SWF {
host.addElement(_increment);
host.addElement(_decrement);
-// add this in CSS!
+ // add this in CSS!
controller = new SpinnerMouseController();
host.addBead(controller);
}
-
+
COMPILE::SWF
{
var host:ILayoutChild = ILayoutChild(value);
-
+
// Complete the setup if the height is sized to
content or has been explicitly set
// and the width is sized to content or has
been explicitly set
if ((host.isHeightSizedToContent() ||
!isNaN(host.explicitHeight)) &&
- (host.isWidthSizedToContent() ||
!isNaN(host.explicitWidth)))
+ (host.isWidthSizedToContent()
|| !isNaN(host.explicitWidth)))
sizeChangeHandler(null);
}
COMPILE::JS
@@ -180,6 +186,7 @@ COMPILE::SWF {
return _increment;
}
COMPILE::JS
+
public function get increment():SpinnerButton
{
return _increment;
@@ -189,21 +196,21 @@ COMPILE::SWF {
* @private
* @royaleignorecoercion org.apache.royale.core.UIBase
*/
- private function sizeChangeHandler( event:Event ) : void
+ private function sizeChangeHandler(event:Event):void
{
- var w:Number = UIBase(_strand).width;
- var h:Number = UIBase(_strand).height / 2;
+ var w:Number = (_strand as UIBase).width;
+ var h:Number = (_strand as UIBase).height / 2;
_increment.width = w;
_increment.height = h;
COMPILE::SWF
{
- _increment.y = 0;
+ _increment.y = 0;
}
_decrement.width = w;
_decrement.height = h;
COMPILE::SWF
{
- _decrement.y = h;
+ _decrement.y = h;
}
}
}
