You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/12/23 06:52:46 UTC
[royale-asjs] 08/09: Merge branch 'SparkForm' into develop
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 4136088668ab1b7e859985fc3fd1f3438f8a72b5
Merge: 4236a95 fff234a
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Dec 22 22:11:31 2019 -0800
Merge branch 'SparkForm' into develop
.../org/apache/royale/html/beads/ContainerView.as | 28 +-
.../MXRoyale/src/main/resources/defaults.css | 1 +
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
.../royale/mx/containers/errors/ConstraintError.as | 58 +
.../containers/utilityClasses/ConstraintColumn.as | 14 +-
.../mx/containers/utilityClasses/ConstraintRow.as | 12 +-
.../MXRoyale/src/main/royale/mx/controls/Button.as | 11 -
.../src/main/royale/mx/core/ILayoutElement.as | 5 +-
.../src/main/royale/mx/core/UIComponent.as | 109 +-
.../src/main/royale/mx/display/Graphics.as | 54 +-
.../SparkRoyale/src/main/resources/defaults.css | 14 +-
.../src/main/resources/spark-royale-manifest.xml | 4 +
.../src/main/royale/SparkRoyaleClasses.as | 5 +
.../src/main/royale/spark/components/Form.as | 2 +
.../src/main/royale/spark/components/FormItem.as | 7 +
.../src/main/royale/spark/components/Label.as | 11 +-
.../royale/spark/components/SkinnableContainer.as | 23 +-
.../royale/spark/components/beads/GroupView.as | 3 +
.../components/beads/SkinnableContainerView.as | 51 +-
.../beads/{GroupView.as => SparkContainerView.as} | 36 +-
.../components/beads/SparkSkinScrollingViewport.as | 174 ++
.../spark/components/supportClasses/ButtonBase.as | 9 -
.../supportClasses/SkinnableComponent.as | 118 +-
.../supportClasses/SkinnableContainerBase.as | 4 +-
.../components/supportClasses/SkinnableTextBase.as | 16 +-
.../spark/components/supportClasses/TextBase.as | 13 +-
.../main/royale/spark/layouts/ConstraintLayout.as | 1987 ++++++++++++++++++++
.../main/royale/spark/layouts/FormItemLayout.as | 10 +-
.../src/main/royale/spark/layouts/FormLayout.as | 17 +-
.../royale/spark/skins/spark/FormItemSkin.mxml | 188 ++
.../main/royale/spark/skins/spark/FormSkin.mxml | 97 +
31 files changed, 2937 insertions(+), 147 deletions(-)
diff --cc frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
index 26635dd,77e4881..25cca50
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@@ -57,7 -57,9 +57,10 @@@ internal class MXRoyaleClasse
import mx.containers.beads.CanvasLayout; CanvasLayout;
import mx.containers.beads.layouts.BasicLayout; BasicLayout;
import mx.controls.beads.AlertView; AlertView;
+ import mx.controls.beads.controllers.AlertMouseController; AlertMouseController;
+ import mx.containers.errors.ConstraintError; ConstraintError;
+ import mx.containers.utilityClasses.ConstraintColumn; ConstraintColumn;
+ import mx.containers.utilityClasses.ConstraintRow; ConstraintRow;
import mx.containers.gridClasses.GridColumnInfo; GridColumnInfo;
import mx.containers.gridClasses.GridRowInfo; GridRowInfo;
import mx.events.CloseEvent; CloseEvent;