This is an automated email from the ASF dual-hosted git repository.
pent pushed a commit to branch feature/DividedBox
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/DividedBox by this
push:
new fa2c39e Refactored DividedBox et al into DividedContainer to make
more general.
fa2c39e is described below
commit fa2c39e5db31de7de717822454371e1681f5a5ea
Author: Peter Ent <p...@apache.org>
AuthorDate: Wed Feb 14 15:59:20 2018 -0500
Refactored DividedBox et al into DividedContainer to make more general.
---
.../README.txt | 8 +--
.../asconfig.json | 2 +-
.../build.xml | 6 +-
.../pom.xml | 6 +-
.../src/main/royale/DividedContainerExample.mxml} | 0
.../src/main/royale/MyInitialView.mxml | 18 +++---
.../Basic/src/main/resources/basic-manifest.xml | 8 +--
.../projects/Basic/src/main/resources/defaults.css | 38 +++++------
.../projects/Basic/src/main/royale/BasicClasses.as | 18 +++---
.../html/{DividedBox.as => DividedContainer.as} | 28 ++++----
.../html/{HDividedBox.as => HDividedContainer.as} | 8 +--
.../html/{VDividedBox.as => VDividedContainer.as} | 8 +--
.../{DividedBoxView.as => DividedContainerView.as} | 50 +++++++--------
...ller.as => HDividedContainerMouseController.as} | 58 ++++++++---------
...ller.as => VDividedContainerMouseController.as} | 60 +++++++++---------
...idedBoxLayout.as => HDividedContainerLayout.as} | 74 +++++++++++-----------
...idedBoxLayout.as => VDividedContainerLayout.as} | 74 +++++++++++-----------
...DividedBoxModel.as => DividedContainerModel.as} | 32 +++++-----
...dedBoxDivider.as => DividedContainerDivider.as} | 32 +++++-----
...edBoxDivider.as => HDividedContainerDivider.as} | 18 +++---
...edBoxGripper.as => HDividedContainerGripper.as} | 28 ++++----
...edBoxDivider.as => IDividedContainerDivider.as} | 14 ++--
...edBoxGripper.as => IDividedContainerGripper.as} | 12 ++--
...edBoxDivider.as => VDividedContainerDivider.as} | 22 +++----
...edBoxGripper.as => VDividedContainerGripper.as} | 28 ++++----
25 files changed, 325 insertions(+), 325 deletions(-)
diff --git a/examples/royale/DividedBoxExample/README.txt
b/examples/royale/DividedContainerExample/README.txt
similarity index 74%
rename from examples/royale/DividedBoxExample/README.txt
rename to examples/royale/DividedContainerExample/README.txt
index 44afa0a..1f8c101 100644
--- a/examples/royale/DividedBoxExample/README.txt
+++ b/examples/royale/DividedContainerExample/README.txt
@@ -19,13 +19,13 @@
DESCRIPTION
-The DividedBoxExample demonstrates the Royale DividedBox components:
HDividedBox and
-VDividedBox. These contains separate their children using interactive
dividers, allowing
+The DividedContainerExample demonstrates the Royale DividedContainer
components: HDividedContainer and
+VDividedContainer. These contains separate their children using interactive
dividers, allowing
you to resize them.
-The HDividedBox arranges its children into columns while the VDividedBox
arranges its
+The HDividedContainer arranges its children into columns while the
VDividedContainer arranges its
children into rows.
-The DividedBox is built from sub-components and beads, most of which can be
substituted
+The DividedContainer is built from sub-components and beads, most of which can
be substituted
with other compatible beads or even custom beads you write. The substitutions
can be
made in MXML but are most often done in CSS.
diff --git a/examples/royale/DividedBoxExample/asconfig.json
b/examples/royale/DividedContainerExample/asconfig.json
similarity index 95%
rename from examples/royale/DividedBoxExample/asconfig.json
rename to examples/royale/DividedContainerExample/asconfig.json
index c5bf2bb..c8bc576 100644
--- a/examples/royale/DividedBoxExample/asconfig.json
+++ b/examples/royale/DividedContainerExample/asconfig.json
@@ -26,6 +26,6 @@
"additionalOptions": "-remove-circulars
-js-output-optimization=skipAsCoercions",
"files":
[
- "src/main/royale/DividedBoxExample.mxml"
+ "src/main/royale/DividedContainerExample.mxml"
]
}
diff --git a/examples/royale/DividedBoxExample/build.xml
b/examples/royale/DividedContainerExample/build.xml
similarity index 90%
rename from examples/royale/DividedBoxExample/build.xml
rename to examples/royale/DividedContainerExample/build.xml
index 0fea074..29ef5d4 100644
--- a/examples/royale/DividedBoxExample/build.xml
+++ b/examples/royale/DividedContainerExample/build.xml
@@ -19,9 +19,9 @@
-->
-<project name="dividedboxexample" default="main" basedir=".">
+<project name="dividedcontainerexample" default="main" basedir=".">
<property name="ROYALE_HOME" location="../../.."/>
- <property name="example" value="DividedBoxExample" />
+ <property name="example" value="DividedContainerExample" />
<property file="${ROYALE_HOME}/env.properties"/>
<property environment="env"/>
@@ -42,7 +42,7 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
- <echo message="Drag on the dividers of the DividedBoxes"/>
+ <echo message="Drag on the dividers of the DividedContainers"/>
<exec executable="${browser}" dir="${basedir}/bin-${which}"
failonerror="true">
<arg value="${basedir}/bin-${which}/${example}.html"/>
</exec>
diff --git a/examples/royale/DividedBoxExample/pom.xml
b/examples/royale/DividedContainerExample/pom.xml
similarity index 91%
rename from examples/royale/DividedBoxExample/pom.xml
rename to examples/royale/DividedContainerExample/pom.xml
index c6e4700..6b5e1f9 100644
--- a/examples/royale/DividedBoxExample/pom.xml
+++ b/examples/royale/DividedContainerExample/pom.xml
@@ -30,11 +30,11 @@
<version>0.9.2-SNAPSHOT</version>
</parent>
- <artifactId>DividedBoxExample</artifactId>
+ <artifactId>DividedContainerExample</artifactId>
<version>0.9.2-SNAPSHOT</version>
<packaging>swf</packaging>
- <name>Apache Royale: Examples: Royale: DividedBoxExample</name>
+ <name>Apache Royale: Examples: Royale: DividedContainerExample</name>
<build>
<plugins>
@@ -43,7 +43,7 @@
<artifactId>royale-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <mainClass>DividedBoxExample.mxml</mainClass>
+ <mainClass>DividedContainerExample.mxml</mainClass>
</configuration>
</plugin>
</plugins>
diff --git
a/examples/royale/DividedBoxExample/src/main/royale/DividedBoxExample.mxml
b/examples/royale/DividedContainerExample/src/main/royale/DividedContainerExample.mxml
similarity index 100%
rename from
examples/royale/DividedBoxExample/src/main/royale/DividedBoxExample.mxml
rename to
examples/royale/DividedContainerExample/src/main/royale/DividedContainerExample.mxml
diff --git
a/examples/royale/DividedBoxExample/src/main/royale/MyInitialView.mxml
b/examples/royale/DividedContainerExample/src/main/royale/MyInitialView.mxml
similarity index 84%
rename from examples/royale/DividedBoxExample/src/main/royale/MyInitialView.mxml
rename to
examples/royale/DividedContainerExample/src/main/royale/MyInitialView.mxml
index 61aa3c1..7205d7d 100644
--- a/examples/royale/DividedBoxExample/src/main/royale/MyInitialView.mxml
+++ b/examples/royale/DividedContainerExample/src/main/royale/MyInitialView.mxml
@@ -41,8 +41,8 @@ limitations under the License.
background-color: #CCCC00;
}
- /* Give the outer HDividedBox some padding */
- js|HDividedBox {
+ /* Give the outer HDividedContainer some padding */
+ js|HDividedContainer {
padding: 10px;
}
@@ -52,24 +52,24 @@ limitations under the License.
}
</fx:Style>
- <js:HDividedBox width="600" height="600">
+ <js:HDividedContainer width="600" height="600">
<js:VGroup className="Group1" width="175" height="100%">
<js:Label text="Group One" />
<js:Spacer height="30" />
<js:Label text="Menu or tool palette perhaps" />
</js:VGroup>
- <!-- Because VDividedBox has no default width it will occupy
- the remaining width of the HDividedBox.
+ <!-- Because VDividedContainer has no default width it will
occupy
+ the remaining width of the HDividedContainer.
-->
- <js:VDividedBox>
+ <js:VDividedContainer>
<js:Group id="group2" className="Group2" height="100" >
<js:Label text="Group Two" />
</js:Group>
<!-- Because Group has no default height and group3 is
not given
an explicit height, it will occupy the remaining
space in the
- VDividedBox.
+ VDividedContainer.
-->
<js:Group id="group3" className="Group3">
<js:Label text="Group 3" />
@@ -79,8 +79,8 @@ limitations under the License.
<js:Label text="Group 4" />
</js:Group>
- </js:VDividedBox>
+ </js:VDividedContainer>
- </js:HDividedBox>
+ </js:HDividedContainer>
</js:View>
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 218ef21..80af44d 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -27,8 +27,8 @@
<component id="Button" class="org.apache.royale.html.Button"/>
<component id="CloseButton" class="org.apache.royale.html.CloseButton"/>
<component id="ButtonBar" class="org.apache.royale.html.ButtonBar"/>
- <component id="HDividedBox" class="org.apache.royale.html.HDividedBox" />
- <component id="VDividedBox" class="org.apache.royale.html.VDividedBox" />
+ <component id="HDividedContainer"
class="org.apache.royale.html.HDividedContainer" />
+ <component id="VDividedContainer"
class="org.apache.royale.html.VDividedContainer" />
<component id="DropDownList" class="org.apache.royale.html.DropDownList"/>
<component id="DropDownListList"
class="org.apache.royale.html.supportClasses.DropDownListList"/>
<component id="Image" class="org.apache.royale.html.Image"/>
@@ -133,8 +133,8 @@
<component id="HRule" class="org.apache.royale.html.HRule" />
<component id="VRule" class="org.apache.royale.html.VRule" />
<component id="Spacer" class="org.apache.royale.html.Spacer" />
- <component id="HDividedBoxDivider"
class="org.apache.royale.html.supportClasses.HDividedBoxDivider" />
- <component id="VDividedBoxDivider"
class="org.apache.royale.html.supportClasses.VDividedBoxDivider" />
+ <component id="HDividedContainerDivider"
class="org.apache.royale.html.supportClasses.HDividedContainerDivider" />
+ <component id="VDividedContainerDivider"
class="org.apache.royale.html.supportClasses.VDividedContainerDivider" />
<!--
<component id="ImageAndTextButtonView"
class="org.apache.royale.html.beads.ImageAndTextButtonView" />
-->
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css
b/frameworks/projects/Basic/src/main/resources/defaults.css
index 80f2cca..bd53f52 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -307,31 +307,31 @@ DateField {
IFormatBead:
ClassReference("org.apache.royale.html.accessories.DateFormatYYYYMMDD");
}
-/** DividedBox */
+/** DividedContainer */
-HDividedBox {
- IBeadView:
ClassReference("org.apache.royale.html.beads.DividedBoxView");
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.DividedBoxModel");
- IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.HDividedBoxLayout");
- IDividerFactory:
ClassReference("org.apache.royale.html.supportClasses.HDividedBoxDivider");
+HDividedContainer {
+ IBeadView:
ClassReference("org.apache.royale.html.beads.DividedContainerView");
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.DividedContainerModel");
+ IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.HDividedContainerLayout");
+ IDividerFactory:
ClassReference("org.apache.royale.html.supportClasses.HDividedContainerDivider");
}
-VDividedBox {
- IBeadView:
ClassReference("org.apache.royale.html.beads.DividedBoxView");
- IBeadModel:
ClassReference("org.apache.royale.html.beads.models.DividedBoxModel");
- IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.VDividedBoxLayout");
- IDividerFactory:
ClassReference("org.apache.royale.html.supportClasses.VDividedBoxDivider");
+VDividedContainer {
+ IBeadView:
ClassReference("org.apache.royale.html.beads.DividedContainerView");
+ IBeadModel:
ClassReference("org.apache.royale.html.beads.models.DividedContainerModel");
+ IBeadLayout:
ClassReference("org.apache.royale.html.beads.layouts.VDividedContainerLayout");
+ IDividerFactory:
ClassReference("org.apache.royale.html.supportClasses.VDividedContainerDivider");
}
-HDividedBoxDivider {
- IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.HDividedBoxMouseController");
- IGripperBead:
ClassReference("org.apache.royale.html.supportClasses.HDividedBoxGripper");
+HDividedContainerDivider {
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.HDividedContainerMouseController");
+ IGripperBead:
ClassReference("org.apache.royale.html.supportClasses.HDividedContainerGripper");
background-color: transparent;
}
-VDividedBoxDivider {
- IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.VDividedBoxMouseController");
- IGripperBead:
ClassReference("org.apache.royale.html.supportClasses.VDividedBoxGripper");
+VDividedContainerDivider {
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.VDividedContainerMouseController");
+ IGripperBead:
ClassReference("org.apache.royale.html.supportClasses.VDividedContainerGripper");
background-color: transparent;
}
@@ -818,12 +818,12 @@ global
padding: 5px;
}
- HDividedBoxDivider {
+ HDividedContainerDivider {
iBackgroundBead:
ClassReference('org.apache.royale.html.beads.SolidBackgroundBead');
iBorderBead:
ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
}
- VDividedBoxDivider {
+ VDividedContainerDivider {
iBackgroundBead:
ClassReference('org.apache.royale.html.beads.SolidBackgroundBead');
iBorderBead:
ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
}
diff --git a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
index 437ae86..80775ad 100644
--- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
@@ -41,15 +41,15 @@ internal class BasicClasses
import org.apache.royale.html.beads.AlertView; AlertView;
import org.apache.royale.html.beads.controllers.AlertController;
AlertController;
- import org.apache.royale.html.beads.DividedBoxView; DividedBoxView;
- import org.apache.royale.html.beads.models.DividedBoxModel;
DividedBoxModel;
- import org.apache.royale.html.beads.layouts.HDividedBoxLayout;
HDividedBoxLayout;
- import org.apache.royale.html.beads.layouts.VDividedBoxLayout;
VDividedBoxLayout;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
DividedBoxDivider;
- import org.apache.royale.html.supportClasses.HDividedBoxGripper;
HDividedBoxGripper;
- import org.apache.royale.html.supportClasses.VDividedBoxGripper;
VDividedBoxGripper;
- import
org.apache.royale.html.beads.controllers.HDividedBoxMouseController;
HDividedBoxMouseController;
- import
org.apache.royale.html.beads.controllers.VDividedBoxMouseController;
VDividedBoxMouseController;
+ import org.apache.royale.html.beads.DividedContainerView;
DividedContainerView;
+ import org.apache.royale.html.beads.models.DividedContainerModel;
DividedContainerModel;
+ import org.apache.royale.html.beads.layouts.HDividedContainerLayout;
HDividedContainerLayout;
+ import org.apache.royale.html.beads.layouts.VDividedContainerLayout;
VDividedContainerLayout;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
DividedContainerDivider;
+ import org.apache.royale.html.supportClasses.HDividedContainerGripper;
HDividedContainerGripper;
+ import org.apache.royale.html.supportClasses.VDividedContainerGripper;
VDividedContainerGripper;
+ import
org.apache.royale.html.beads.controllers.HDividedContainerMouseController;
HDividedContainerMouseController;
+ import
org.apache.royale.html.beads.controllers.VDividedContainerMouseController;
VDividedContainerMouseController;
COMPILE::SWF
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedBox.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedContainer.as
similarity index 82%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedBox.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedContainer.as
index 79f58e3..6812a61 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedBox.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DividedContainer.as
@@ -28,8 +28,8 @@ package org.apache.royale.html
import org.apache.royale.core.UIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
- import org.apache.royale.html.beads.layouts.HDividedBoxLayout;
- import org.apache.royale.html.beads.models.DividedBoxModel;
+ import org.apache.royale.html.beads.layouts.HDividedContainerLayout;
+ import org.apache.royale.html.beads.models.DividedContainerModel;
import org.apache.royale.utils.MXMLDataInterpreter;
import org.apache.royale.utils.loadBeadFromValuesManager;
@@ -38,18 +38,18 @@ package org.apache.royale.html
[DefaultProperty("mxmlContent")]
/**
- * The DividedBox lays out its children (either horizontally or
vertically, depending on
+ * The DividedContainer lays out its children (either horizontally or
vertically, depending on
* which layout is used) separated by dividers. The dividers can be
moved to grow and shrink
* the children.
*
- * This is the base class. See HDividedBox and VDividedBox for useful
implementations.
+ * This is the base class. See HDividedContainer and VDividedContainer
for useful implementations.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class DividedBox extends UIBase implements IContainer,
ILayoutParent, ILayoutHost, ILayoutView, IMXMLDocument
+ public class DividedContainer extends UIBase implements IContainer,
ILayoutParent, ILayoutHost, ILayoutView, IMXMLDocument
{
/**
* Constructor
@@ -59,23 +59,23 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function DividedBox()
+ public function DividedContainer()
{
super();
- typeNames = "DividedBox";
+ typeNames = "DividedContainer";
}
- // DividedBoxLayout takes care of sizing and positioning the
children and the
- // the separators. The layout listens to changes to the
DividedBoxModel and uses
+ // DividedContainerLayout takes care of sizing and positioning
the children and the
+ // the separators. The layout listens to changes to the
DividedContainerModel and uses
// the model to determine the exact size of each child.
- // DividedBoxModel contains the identities of the children and
the separators as
+ // DividedContainerModel contains the identities of the
children and the separators as
// well as the amount to increase or decrease each child. Once
the layout completes,
// the adjustments are reset to zero (their default values).
- // DividedBoxDivider is a control that sits between the
children and has a mouse
- // controller (DividedBoxMouseController) that lets the user
interact with the
- // DividedBox. By pressing the mouse down over the separator
and moving it, the
+ // DividedContainerDivider is a control that sits between the
children and has a mouse
+ // controller (DividedContainerMouseController) that lets the
user interact with the
+ // DividedContainer. By pressing the mouse down over the
separator and moving it, the
// mouse controller tracks the changes to the mouse position
and updates the model
// which will then trigger a new layout, adjusting the size and
position of the
// children.
@@ -93,7 +93,7 @@ package org.apache.royale.html
super.addedToParent();
- var layoutBead:IBeadLayout =
loadBeadFromValuesManager(HDividedBoxLayout, "iBeadLayout", this) as
IBeadLayout;
+ var layoutBead:IBeadLayout =
loadBeadFromValuesManager(HDividedContainerLayout, "iBeadLayout", this) as
IBeadLayout;
if (!_initialized)
{
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedBox.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedContainer.as
similarity index 85%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedBox.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedContainer.as
index dac743f..850167a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedBox.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HDividedContainer.as
@@ -19,7 +19,7 @@
package org.apache.royale.html
{
/**
- * This sub-class of DividedBox organizes its children into columns
separated by
+ * This sub-class of DividedContainer organizes its children into
columns separated by
* movable dividers.
*
* @langversion 3.0
@@ -27,7 +27,7 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class HDividedBox extends DividedBox
+ public class HDividedContainer extends DividedContainer
{
/**
* Constructor
@@ -37,10 +37,10 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function HDividedBox()
+ public function HDividedContainer()
{
super();
- typeNames = "HDividedBox";
+ typeNames = "HDividedContainer";
}
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedBox.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedContainer.as
similarity index 86%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedBox.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedContainer.as
index 2c6773b..57f714b 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedBox.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/VDividedContainer.as
@@ -19,7 +19,7 @@
package org.apache.royale.html
{
/**
- * This sub-class of DividedBox organizes its children into rows
separated by
+ * This sub-class of DividedContainer organizes its children into rows
separated by
* movable dividers.
*
* @langversion 3.0
@@ -27,7 +27,7 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class VDividedBox extends DividedBox
+ public class VDividedContainer extends DividedContainer
{
/**
* Constructor.
@@ -37,10 +37,10 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function VDividedBox()
+ public function VDividedContainer()
{
super();
- typeNames = "VDividedBox";
+ typeNames = "VDividedContainer";
}
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedBoxView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
similarity index 80%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedBoxView.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
index 56f61cd..18acf2e 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedBoxView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DividedContainerView.as
@@ -25,49 +25,49 @@ package org.apache.royale.html.beads
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.DividedBox;
- import org.apache.royale.html.beads.models.DividedBoxModel;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
- import org.apache.royale.html.supportClasses.IDividedBoxDivider;
+ import org.apache.royale.html.DividedContainer;
+ import org.apache.royale.html.beads.models.DividedContainerModel;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
+ import org.apache.royale.html.supportClasses.IDividedContainerDivider;
import org.apache.royale.utils.loadBeadFromValuesManager;
-
+
/**
- * The DividedBoxView class is responsible for generating the
- * DividedBoxSeparators between the children and placing them
+ * The DividedContainerView class is responsible for generating the
+ * DividedContainerSeparators between the children and placing them
* in the z-order between the children.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class DividedBoxView implements IBeadView
+ public class DividedContainerView implements IBeadView
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function DividedBoxView()
+ public function DividedContainerView()
{
}
-
+
private var _strand:IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
public function set strand(value:IStrand):void
{
_strand = value;
-
+
(_strand as
IEventDispatcher).addEventListener("childrenAdded", handleChildrenAdded);
(_strand as
UIBase).model.addEventListener("pairAdjustmentChanged",
handlePairAdjustmentChanged);
}
-
+
/**
* @private
*/
@@ -75,11 +75,11 @@ package org.apache.royale.html.beads
{
return _strand as IUIBase;
}
-
+
/**
* Handles the "childrenAdded" event and generates the
separators between them
* based on the direction of the box.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -88,27 +88,27 @@ package org.apache.royale.html.beads
protected function handleChildrenAdded(event:Event):void
{
var n:int = (host as UIBase).numElements;
-
+
// add in n-1 separators and adjustments
var seps:Array = [];
var adjustments:Array = [];
if (n > 1) {
for(var i:int=0; i < (n-1); i++) {
- var sep:IDividedBoxDivider =
ValuesManager.valuesImpl.newInstance(_strand, "iDividerFactory") as
IDividedBoxDivider;
+ var sep:IDividedContainerDivider =
ValuesManager.valuesImpl.newInstance(_strand, "iDividerFactory") as
IDividedContainerDivider;
(host as UIBase).addElement(sep);
seps.push(sep);
adjustments.push(0);
-
+
sep.model = (_strand as UIBase).model;
sep.pairIndex = i;
}
}
-
- ((host as UIBase).model as
DividedBoxModel).pairAdjustments = adjustments;
-
+
+ ((host as UIBase).model as
DividedContainerModel).pairAdjustments = adjustments;
+
(_strand as IEventDispatcher).dispatchEvent(new
Event("layoutNeeded"));
}
-
+
/**
* @private
*/
@@ -117,4 +117,4 @@ package org.apache.royale.html.beads
(_strand as IEventDispatcher).dispatchEvent(new
Event("layoutNeeded"));
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedBoxMouseController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedContainerMouseController.as
similarity index 75%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedBoxMouseController.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedContainerMouseController.as
index 15e2684..69551db 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedBoxMouseController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/HDividedContainerMouseController.as
@@ -25,30 +25,30 @@ package org.apache.royale.html.beads.controllers
import org.apache.royale.core.UIBase;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
- import org.apache.royale.html.beads.models.DividedBoxModel;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
-
+ import org.apache.royale.html.beads.models.DividedContainerModel;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
+
/**
- * This is the mouse controller for the HDividedBox. This bead class
tracks the
- * mouse over a HDividedBoxDivider (its strand) causing the columns on
either side
+ * This is the mouse controller for the HDividedContainer. This bead
class tracks the
+ * mouse over a HDividedContainerDivider (its strand) causing the
columns on either side
* of the divider to grow and shrink.
*/
- public class HDividedBoxMouseController implements IBead,
IBeadController
+ public class HDividedContainerMouseController implements IBead,
IBeadController
{
/**
* Constructor
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function HDividedBoxMouseController()
+ public function HDividedContainerMouseController()
{
}
-
+
private var _strand:IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
@@ -57,10 +57,10 @@ package org.apache.royale.html.beads.controllers
_strand = value;
(_strand as
IEventDispatcher).addEventListener(MouseEvent.MOUSE_DOWN, handleMouseDown);
}
-
+
private var deltaMove:Number = 0;
private var lastPosition:Number = 0;
-
+
/**
* @private
*/
@@ -72,13 +72,13 @@ package org.apache.royale.html.beads.controllers
}
lastPosition = event.screenX;
deltaMove = 0;
- //trace("* HDividedBoxMouseController: anchor at
"+lastPosition);
-
+ //trace("* HDividedContainerMouseController: anchor at
"+lastPosition);
+
IUIBase(_strand).topMostEventDispatcher.addEventListener(MouseEvent.MOUSE_MOVE,
handleMouseMove);
IUIBase(_strand).topMostEventDispatcher.addEventListener(MouseEvent.MOUSE_UP,
handleMouseUp);
-
+
}
-
+
/**
* @private
*/
@@ -86,30 +86,30 @@ package org.apache.royale.html.beads.controllers
{
//trace("--- mouse moving by "+(event.screenX -
lastPosition));
deltaMove = event.screenX - lastPosition;
-
- var model:DividedBoxModel = (_strand as UIBase).model
as DividedBoxModel;
- var pairIndex:int = (_strand as
DividedBoxDivider).pairIndex;
-
+
+ var model:DividedContainerModel = (_strand as
UIBase).model as DividedContainerModel;
+ var pairIndex:int = (_strand as
DividedContainerDivider).pairIndex;
+
model.addPairAdjustment(deltaMove, pairIndex);
-
+
lastPosition = event.screenX;
}
-
+
/**
* @private
*/
private function handleMouseUp(event:MouseEvent):void
{
deltaMove = event.screenX - lastPosition;
- //trace("* HDividedBoxMouseController: up at
"+event.screenX+" delta of "+deltaMove);
-
+ //trace("* HDividedContainerMouseController: up at
"+event.screenX+" delta of "+deltaMove);
+
IUIBase(_strand).topMostEventDispatcher.removeEventListener(MouseEvent.MOUSE_MOVE,
handleMouseMove);
IUIBase(_strand).topMostEventDispatcher.removeEventListener(MouseEvent.MOUSE_UP,
handleMouseUp);
-
- var model:DividedBoxModel = (_strand as UIBase).model
as DividedBoxModel;
- var pairIndex:int = (_strand as
DividedBoxDivider).pairIndex;
-
+
+ var model:DividedContainerModel = (_strand as
UIBase).model as DividedContainerModel;
+ var pairIndex:int = (_strand as
DividedContainerDivider).pairIndex;
+
model.addPairAdjustment(deltaMove, pairIndex);
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedBoxMouseController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedContainerMouseController.as
similarity index 76%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedBoxMouseController.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedContainerMouseController.as
index 46920d2..83d66e6 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedBoxMouseController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/VDividedContainerMouseController.as
@@ -17,7 +17,7 @@
//
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads.controllers
-{
+{
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.IStrand;
@@ -25,35 +25,35 @@ package org.apache.royale.html.beads.controllers
import org.apache.royale.core.UIBase;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
- import org.apache.royale.html.beads.models.DividedBoxModel;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
-
+ import org.apache.royale.html.beads.models.DividedContainerModel;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
+
/**
- * This is the mouse controller for the VDividedBox. This bead class
tracks
- * the mouse over a VDividedBoxDivider (its strand) causing the rows
above
+ * This is the mouse controller for the VDividedContainer. This bead
class tracks
+ * the mouse over a VDividedContainerDivider (its strand) causing the
rows above
* and below it to grow and shrink.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class VDividedBoxMouseController implements IBead,
IBeadController
+ public class VDividedContainerMouseController implements IBead,
IBeadController
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function VDividedBoxMouseController()
+ public function VDividedContainerMouseController()
{
}
-
+
private var _strand:IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
@@ -62,10 +62,10 @@ package org.apache.royale.html.beads.controllers
_strand = value;
(_strand as
IEventDispatcher).addEventListener(MouseEvent.MOUSE_DOWN, handleMouseDown);
}
-
+
private var deltaMove:Number = 0;
private var lastPosition:Number = 0;
-
+
/**
* @private
*/
@@ -77,12 +77,12 @@ package org.apache.royale.html.beads.controllers
}
lastPosition = event.screenY;
deltaMove = 0;
- //trace("* VDividedBoxMouseController: anchor at
"+lastPosition);
-
+ //trace("* VDividedContainerMouseController: anchor at
"+lastPosition);
+
IUIBase(_strand).topMostEventDispatcher.addEventListener(MouseEvent.MOUSE_MOVE,
handleMouseMove);
IUIBase(_strand).topMostEventDispatcher.addEventListener(MouseEvent.MOUSE_UP,
handleMouseUp);
}
-
+
/**
* @private
*/
@@ -90,30 +90,30 @@ package org.apache.royale.html.beads.controllers
{
//trace("--- mouse moving by "+(event.screenY -
lastPosition));
deltaMove = event.screenY - lastPosition;
-
- var model:DividedBoxModel = (_strand as UIBase).model
as DividedBoxModel;
- var pairIndex:int = (_strand as
DividedBoxDivider).pairIndex;
-
+
+ var model:DividedContainerModel = (_strand as
UIBase).model as DividedContainerModel;
+ var pairIndex:int = (_strand as
DividedContainerDivider).pairIndex;
+
model.addPairAdjustment(deltaMove, pairIndex);
-
+
lastPosition = event.screenY;
}
-
+
/**
* @private
*/
private function handleMouseUp(event:MouseEvent):void
{
deltaMove = event.screenY - lastPosition;
- //trace("* VDividedBoxMouseController: up at
"+event.screenY+" delta of "+deltaMove);
-
+ //trace("* VDividedContainerMouseController: up at
"+event.screenY+" delta of "+deltaMove);
+
IUIBase(_strand).topMostEventDispatcher.removeEventListener(MouseEvent.MOUSE_MOVE,
handleMouseMove);
IUIBase(_strand).topMostEventDispatcher.removeEventListener(MouseEvent.MOUSE_UP,
handleMouseUp);
-
- var model:DividedBoxModel = (_strand as UIBase).model
as DividedBoxModel;
- var pairIndex:int = (_strand as
DividedBoxDivider).pairIndex;
-
+
+ var model:DividedContainerModel = (_strand as
UIBase).model as DividedContainerModel;
+ var pairIndex:int = (_strand as
DividedContainerDivider).pairIndex;
+
model.addPairAdjustment(deltaMove, pairIndex);
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedBoxLayout.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedContainerLayout.as
similarity index 84%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedBoxLayout.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedContainerLayout.as
index e24f310..524df3e 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedBoxLayout.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/HDividedContainerLayout.as
@@ -25,51 +25,51 @@ package org.apache.royale.html.beads.layouts
import org.apache.royale.core.UIBase;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.geom.Rectangle;
- import org.apache.royale.html.beads.models.DividedBoxModel;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
+ import org.apache.royale.html.beads.models.DividedContainerModel;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
import org.apache.royale.utils.CSSContainerUtils;
import org.apache.royale.utils.CSSUtils;
-
+
/**
- * This sub-class of DividedBoxLayout class is responsible for sizing
and
- * positioning the children of the DividedBox into columns with
separators
- * between them.
- *
- * In order to correctly size and place the children, the
DividedBoxLayout
- * relies on additional information contained in the DividedBoxModel.
These
+ * This sub-class of DividedContainerLayout class is responsible for
sizing and
+ * positioning the children of the DividedContainer into columns with
separators
+ * between them.
+ *
+ * In order to correctly size and place the children, the
DividedContainerLayout
+ * relies on additional information contained in the
DividedContainerModel. These
* adjustments (which default to zero) can be changed by interacting
with
- * the DividedBoxSeparators and their mouse controllers.
- *
+ * the DividedContainerSeparators and their mouse controllers.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class HDividedBoxLayout extends LayoutBase implements IBeadLayout
+ public class HDividedContainerLayout extends LayoutBase implements
IBeadLayout
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function HDividedBoxLayout()
+ public function HDividedContainerLayout()
{
}
-
+
private var _strand: IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
override public function set strand(value:IStrand):void
{
_strand = value;
- super.strand = value;
+ super.strand = value;
}
-
+
/**
* @private
*/
@@ -78,29 +78,29 @@ package org.apache.royale.html.beads.layouts
var host:UIBase = _strand as UIBase;
var n:int = host.numElements;
if (n == 0) return false;
-
+
COMPILE::JS {
host.element.style['position'] = 'absolute';
}
-
+
var useWidth:Number = host.width;
var useHeight:Number = host.height;
-
+
var paddingMetrics:Rectangle =
CSSContainerUtils.getPaddingMetrics(host);
var borderMetrics:Rectangle =
CSSContainerUtils.getBorderMetrics(host);
useWidth -= paddingMetrics.left + paddingMetrics.right
+ borderMetrics.left + borderMetrics.right;
useHeight -= paddingMetrics.top + paddingMetrics.bottom
+ borderMetrics.top + borderMetrics.bottom;
-
+
// Separate the children from the dividers and
determine left over width
var remainingWidth:Number = useWidth;
var remainingCount:Number = 0;
var actualChildren:Array = [];
var separators:Array = [];
-
+
for(var i:int=0; i < n; i++) {
var child:UIBase = host.getElementAt(i) as
UIBase;
- if (child is DividedBoxDivider) {
+ if (child is DividedContainerDivider) {
separators.push(child);
} else {
actualChildren.push(child);
@@ -111,7 +111,7 @@ package org.apache.royale.html.beads.layouts
}
}
}
-
+
// calculate defaults
var numSeparators:Number = separators.length;
remainingWidth -= numSeparators*10;
@@ -122,15 +122,15 @@ package org.apache.royale.html.beads.layouts
var xpos:Number = borderMetrics.left +
paddingMetrics.left;
var ypos:Number = borderMetrics.top +
paddingMetrics.top;
var j:int = 0;
-
- var adjustments:Array = (host.model as
DividedBoxModel).pairAdjustments;
+
+ var adjustments:Array = (host.model as
DividedContainerModel).pairAdjustments;
var childWidths:Array = [];
-
+
// size and position a child followed by a separator
for(i=0; i < actualChildren.length; i++)
{
child = actualChildren[i] as UIBase;
-
+
var childWidth:Number = childInitialWidth;
var childHeight:Number = useHeight;
if (!isNaN(child.percentWidth)) {
@@ -139,16 +139,16 @@ package org.apache.royale.html.beads.layouts
else if (!isNaN(child.explicitWidth)) {
childWidth = child.explicitWidth;
}
- //trace("1 - HDividedBoxLayout: Setting child
to "+childWidth+" x "+childHeight);
+ //trace("1 - HDividedContainerLayout: Setting
child to "+childWidth+" x "+childHeight);
childWidths.push(childWidth);
}
-
- //trace("2 - HDividedBoxLayout: adjusting");
+
+ //trace("2 - HDividedContainerLayout: adjusting");
for(j=0, i=0; j < adjustments.length; j++, i++) {
childWidths[i] += adjustments[j];
childWidths[i+1] -= adjustments[j];
}
-
+
for(i=0, j=0; i < actualChildren.length; i++)
{
child = actualChildren[i] as UIBase;
@@ -160,7 +160,7 @@ package org.apache.royale.html.beads.layouts
COMPILE::JS {
child.element.style['position'] =
'absolute';
}
-
+
if (j < separators.length) {
var sep:UIBase = separators[j] as
UIBase;
sep.width = 10;
@@ -172,11 +172,11 @@ package org.apache.royale.html.beads.layouts
}
j += 1;
}
-
+
xpos += child.width + 10;
}
-
+
return true;
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedBoxLayout.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedContainerLayout.as
similarity index 84%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedBoxLayout.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedContainerLayout.as
index 9ec7ea7..a298fb0 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedBoxLayout.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VDividedContainerLayout.as
@@ -25,51 +25,51 @@ package org.apache.royale.html.beads.layouts
import org.apache.royale.core.UIBase;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.geom.Rectangle;
- import org.apache.royale.html.beads.models.DividedBoxModel;
- import org.apache.royale.html.supportClasses.DividedBoxDivider;
+ import org.apache.royale.html.beads.models.DividedContainerModel;
+ import org.apache.royale.html.supportClasses.DividedContainerDivider;
import org.apache.royale.utils.CSSContainerUtils;
import org.apache.royale.utils.CSSUtils;
-
+
/**
- * This sub-class of DividedBoxLayout class is responsible for sizing
and
- * positioning the children of the DividedBox into rows with separators
- * between them.
- *
- * In order to correctly size and place the children, the
DividedBoxLayout
- * relies on additional information contained in the DividedBoxModel.
These
+ * This sub-class of DividedContainerLayout class is responsible for
sizing and
+ * positioning the children of the DividedContainer into rows with
separators
+ * between them.
+ *
+ * In order to correctly size and place the children, the
DividedContainerLayout
+ * relies on additional information contained in the
DividedContainerModel. These
* adjustments (which default to zero) can be changed by interacting
with
- * the DividedBoxSeparators and their mouse controllers.
- *
+ * the DividedContainerSeparators and their mouse controllers.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class VDividedBoxLayout extends LayoutBase implements IBeadLayout
+ public class VDividedContainerLayout extends LayoutBase implements
IBeadLayout
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function VDividedBoxLayout()
+ public function VDividedContainerLayout()
{
}
-
+
private var _strand: IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
override public function set strand(value:IStrand):void
{
_strand = value;
- super.strand = value;
+ super.strand = value;
}
-
+
/**
* @private
*/
@@ -78,29 +78,29 @@ package org.apache.royale.html.beads.layouts
var host:UIBase = _strand as UIBase;
var n:int = host.numElements;
if (n == 0) return false;
-
+
COMPILE::JS {
host.element.style['position'] = 'absolute';
}
-
+
var useWidth:Number = host.width;
var useHeight:Number = host.height;
-
+
var paddingMetrics:Rectangle =
CSSContainerUtils.getPaddingMetrics(host);
var borderMetrics:Rectangle =
CSSContainerUtils.getBorderMetrics(host);
useWidth -= paddingMetrics.left + paddingMetrics.right
+ borderMetrics.left + borderMetrics.right;
useHeight -= paddingMetrics.top + paddingMetrics.bottom
+ borderMetrics.top + borderMetrics.bottom;
-
+
// Separate the children from the dividers
var remainingHeight:Number = useHeight;
var remainingCount:Number = 0;
var actualChildren:Array = [];
var separators:Array = [];
-
+
for(var i:int=0; i < n; i++) {
var child:UIBase = host.getElementAt(i) as
UIBase;
- if (child is DividedBoxDivider) {
+ if (child is DividedContainerDivider) {
separators.push(child);
} else {
actualChildren.push(child);
@@ -111,7 +111,7 @@ package org.apache.royale.html.beads.layouts
}
}
}
-
+
// calculate defaults
var numSeparators:Number = separators.length;
remainingHeight -= numSeparators*10;
@@ -122,15 +122,15 @@ package org.apache.royale.html.beads.layouts
var xpos:Number = borderMetrics.left +
paddingMetrics.left;
var ypos:Number = borderMetrics.top +
paddingMetrics.top;
var j:int = 0;
-
- var adjustments:Array = (host.model as
DividedBoxModel).pairAdjustments;
+
+ var adjustments:Array = (host.model as
DividedContainerModel).pairAdjustments;
var childHeights:Array = [];
-
+
// size and position a child followed by a separator
for(i=0; i < actualChildren.length; i++)
{
child = actualChildren[i] as UIBase;
-
+
var childWidth:Number = useWidth;
var childHeight:Number = childInitialHeight;
if (!isNaN(child.percentHeight)) {
@@ -139,16 +139,16 @@ package org.apache.royale.html.beads.layouts
else if (!isNaN(child.explicitHeight)) {
childHeight = child.explicitHeight;
}
- //trace("1 - VDividedBoxLayout: Setting child
to "+childWidth+" x "+childHeight);
+ //trace("1 - VDividedContainerLayout: Setting
child to "+childWidth+" x "+childHeight);
childHeights.push(childHeight);
}
-
- //trace("2 - VDividedBoxLayout: adjusting");
+
+ //trace("2 - VDividedContainerLayout: adjusting");
for(j=0, i=0; j < adjustments.length; j++, i++) {
childHeights[i] += adjustments[j];
childHeights[i+1] -= adjustments[j];
}
-
+
for(i=0, j=0; i < actualChildren.length; i++)
{
child = actualChildren[i] as UIBase;
@@ -160,7 +160,7 @@ package org.apache.royale.html.beads.layouts
COMPILE::JS {
child.element.style['position'] =
'absolute';
}
-
+
if (j < separators.length) {
var sep:UIBase = separators[j] as
UIBase;
sep.height = 10;
@@ -172,11 +172,11 @@ package org.apache.royale.html.beads.layouts
}
j += 1;
}
-
+
ypos += child.height + 10;
}
-
+
return true;
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedBoxModel.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedContainerModel.as
similarity index 87%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedBoxModel.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedContainerModel.as
index 398d50c..2ab11ab 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedBoxModel.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DividedContainerModel.as
@@ -22,33 +22,33 @@ package org.apache.royale.html.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
-
+
/**
- * The DividedBoxModel holds the information necessary for the
DividedBox
+ * The DividedContainerModel holds the information necessary for the
DividedContainer
* to size and layout its children as well as to respond to changes in
- * those sizes made by the DividedBoxDividers.
- *
+ * those sizes made by the DividedContainerDividers.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class DividedBoxModel extends EventDispatcher implements
IBeadModel
+ public class DividedContainerModel extends EventDispatcher implements
IBeadModel
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function DividedBoxModel()
+ public function DividedContainerModel()
{
}
-
+
private var _strand:IStrand;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
*/
@@ -56,14 +56,14 @@ package org.apache.royale.html.beads.models
{
_strand = value;
}
-
+
private var _pairAdjustments:Array = [0];
-
+
/**
* An array of integers indicating the size change for a pair
- * of children in the DividedBox. There are the same number
+ * of children in the DividedContainer. There are the same
number
* elements in this array as their are separators.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -77,11 +77,11 @@ package org.apache.royale.html.beads.models
{
_pairAdjustments = value;
}
-
+
/**
* Modifies a specific pairAdjustment indicated by an index and
* by the amount given.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -93,4 +93,4 @@ package org.apache.royale.html.beads.models
dispatchEvent(new Event("pairAdjustmentChanged"));
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedBoxDivider.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedContainerDivider.as
similarity index 84%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedBoxDivider.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedContainerDivider.as
index 339509b..21fd669 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedBoxDivider.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DividedContainerDivider.as
@@ -19,50 +19,50 @@
package org.apache.royale.html.supportClasses
{
import org.apache.royale.core.UIBase;
-
+
COMPILE::SWF {
import org.apache.royale.html.beads.SolidBackgroundBead;
import org.apache.royale.html.beads.SingleLineBorderBead;
import org.apache.royale.utils.loadBeadFromValuesManager;
}
-
+
/**
- * The DividedBoxSeparator is a control that lays between the children
of
- * a DividedBox. This is the base class for the HDividedBoxDivider and
- * VDividedBoxDivider.
- *
+ * The DividedContainerSeparator is a control that lays between the
children of
+ * a DividedContainer. This is the base class for the
HDividedContainerDivider and
+ * VDividedContainerDivider.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class DividedBoxDivider extends UIBase implements
IDividedBoxDivider
+ public class DividedContainerDivider extends UIBase implements
IDividedContainerDivider
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function DividedBoxDivider()
+ public function DividedContainerDivider()
{
super();
- typeNames = "DividedBoxDivider";
-
+ typeNames = "DividedContainerDivider";
+
COMPILE::SWF {
loadBeadFromValuesManager(SolidBackgroundBead,
"iBackgroundBead", this);
loadBeadFromValuesManager(SingleLineBorderBead,
"iBorderBead", this);
}
}
-
+
private var _pairIndex:int = 0;
-
+
/**
* The index of this divider instance, indicating which pair of
children it
* is managing.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -72,10 +72,10 @@ package org.apache.royale.html.supportClasses
{
return _pairIndex;
}
-
+
public function set pairIndex(value:int):void
{
_pairIndex = value;
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxDivider.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerDivider.as
similarity index 84%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxDivider.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerDivider.as
index 084a576..daadfe8 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxDivider.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerDivider.as
@@ -23,29 +23,29 @@ package org.apache.royale.html.supportClasses
/**
* This sub-class of DividerBoxDivider sets up a vertical divider
between
- * the columns of an HDividedBox.
- *
+ * the columns of an HDividedContainer.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class HDividedBoxDivider extends DividedBoxDivider
+ public class HDividedContainerDivider extends DividedContainerDivider
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function HDividedBoxDivider()
+ public function HDividedContainerDivider()
{
super();
- typeNames = "HDividedBoxDivider";
+ typeNames = "HDividedContainerDivider";
}
-
+
/**
* @private
*/
@@ -53,7 +53,7 @@ package org.apache.royale.html.supportClasses
{
super.addedToParent();
- loadBeadFromValuesManager(IDividedBoxGripper,
"iGripperBead", this);
+ loadBeadFromValuesManager(IDividedContainerGripper,
"iGripperBead", this);
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxGripper.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerGripper.as
similarity index 91%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxGripper.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerGripper.as
index 3192d5c..0b734ab 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedBoxGripper.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/HDividedContainerGripper.as
@@ -27,53 +27,53 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.svg.Path;
/**
- * The HDividedBoxGripper is a bead added to the HDividedBoxDivider to
+ * The HDividedContainerGripper is a bead added to the
HDividedContainerDivider to
* provide a visual cue that the divider can be grabbed and moved.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class HDividedBoxGripper implements IBead, IDividedBoxGripper
+ public class HDividedContainerGripper implements IBead,
IDividedContainerGripper
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function HDividedBoxGripper()
+ public function HDividedContainerGripper()
{
}
-
+
private var _strand:IStrand;
private var path:Path;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
- *
+ *
* @royaleignorecoercion UIBase
*/
public function set strand(value:IStrand):void
{
_strand = value;
-
+
COMPILE::JS {
(_strand as UIBase).element.style.cursor =
'col-resize';
}
-
+
(_strand as
IEventDispatcher).addEventListener("widthChanged", handleResize);
(_strand as
IEventDispatcher).addEventListener("heightChanged", handleResize);
-
+
path = new Path();
path.stroke = new SolidColorStroke(0x555555,1);
path.data = "M 1 0 L 1 30 M 4 0 L 4 30 M 7 0 L 7 30";
(_strand as UIBase).addElement(path);
}
-
+
/**
* @private
*/
@@ -81,7 +81,7 @@ package org.apache.royale.html.supportClasses
{
var useWidth:Number = (_strand as UIBase).width;
var useHeight:Number = (_strand as UIBase).height;
-
+
path.width = 8;
path.height = 30;
path.x = (useWidth - path.width)/2;
@@ -89,4 +89,4 @@ package org.apache.royale.html.supportClasses
path.draw();
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxDivider.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerDivider.as
similarity index 93%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxDivider.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerDivider.as
index 0ac0eb3..c724d0d 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxDivider.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerDivider.as
@@ -22,17 +22,17 @@ package org.apache.royale.html.supportClasses
/**
* All DividerBoxDividers must implement this interface.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public interface IDividedBoxDivider extends IChild
+ public interface IDividedContainerDivider extends IChild
{
/**
- * The model being used with the DividedBox.
- *
+ * The model being used with the DividedContainer.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -40,10 +40,10 @@ package org.apache.royale.html.supportClasses
*/
function get model():Object;
function set model(value:Object):void;
-
+
/**
* The index of the pairs this divider is managing.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -52,4 +52,4 @@ package org.apache.royale.html.supportClasses
function get pairIndex():int;
function set pairIndex(value:int):void;
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxGripper.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerGripper.as
similarity index 89%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxGripper.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerGripper.as
index f298f66..ccf3559 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedBoxGripper.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDividedContainerGripper.as
@@ -19,17 +19,17 @@
package org.apache.royale.html.supportClasses
{
import org.apache.royale.core.IBead;
-
+
/**
- * This interface defines a gripper bead control for a DividedBox.
- *
+ * This interface defines a gripper bead control for a DividedContainer.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public interface IDividedBoxGripper extends IBead
+ public interface IDividedContainerGripper extends IBead
{
-
+
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxDivider.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerDivider.as
similarity index 80%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxDivider.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerDivider.as
index ea1cf6c..dde9bb7 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxDivider.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerDivider.as
@@ -22,38 +22,38 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.utils.loadBeadFromValuesManager;
/**
- * This sub-class of DividedBoxDivider sets up a horizontal divider
between
- * the rows of a VDividedBox.
- *
+ * This sub-class of DividedContainerDivider sets up a horizontal
divider between
+ * the rows of a VDividedContainer.
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class VDividedBoxDivider extends DividedBoxDivider
+ public class VDividedContainerDivider extends DividedContainerDivider
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function VDividedBoxDivider()
+ public function VDividedContainerDivider()
{
super();
- typeNames = "VDividedBoxDivider";
+ typeNames = "VDividedContainerDivider";
}
-
+
/**
* @private
*/
override public function addedToParent():void
{
super.addedToParent();
-
- loadBeadFromValuesManager(IDividedBoxGripper,
"iGripperBead", this);
+
+ loadBeadFromValuesManager(IDividedContainerGripper,
"iGripperBead", this);
}
}
-}
\ No newline at end of file
+}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxGripper.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerGripper.as
similarity index 91%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxGripper.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerGripper.as
index f1c46fa..cba8810 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedBoxGripper.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/VDividedContainerGripper.as
@@ -27,53 +27,53 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.svg.Path;
/**
- * The VDividedBoxGripper bead adds a visual cue to the
VDividedBoxDivider to
+ * The VDividedContainerGripper bead adds a visual cue to the
VDividedContainerDivider to
* indicate where to start dragging to change the size of the elements.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class VDividedBoxGripper implements IBead, IDividedBoxGripper
+ public class VDividedContainerGripper implements IBead,
IDividedContainerGripper
{
/**
* Constructor.
- *
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function VDividedBoxGripper()
+ public function VDividedContainerGripper()
{
}
-
+
private var _strand:IStrand;
private var path:Path;
-
+
/**
* @copy org.apache.royale.core.IStrand#strand
- *
+ *
* @royaleignorecoercion UIBase
*/
public function set strand(value:IStrand):void
{
_strand = value;
-
+
COMPILE::JS {
(_strand as UIBase).element.style.cursor =
'row-resize';
}
-
+
(_strand as
IEventDispatcher).addEventListener("widthChanged", handleResize);
(_strand as
IEventDispatcher).addEventListener("heightChanged", handleResize);
-
+
path = new Path();
path.stroke = new SolidColorStroke(0x555555,1);
path.data = "M 0 1 L 30 1 M 0 4 L 30 4 M 0 7 L 30 7";
(_strand as UIBase).addElement(path);
}
-
+
/**
* @private
*/
@@ -81,7 +81,7 @@ package org.apache.royale.html.supportClasses
{
var useWidth:Number = (_strand as UIBase).width;
var useHeight:Number = (_strand as UIBase).height;
-
+
path.width = 30;
path.height = 8;
path.x = (useWidth - path.width)/2;
@@ -89,4 +89,4 @@ package org.apache.royale.html.supportClasses
path.draw();
}
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
p...@apache.org.
