Made JS FlexibleLayouts consistent with swf ones.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a631f066 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a631f066 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a631f066 Branch: refs/heads/feature/amf Commit: a631f066eb8ae3bb9b4e4cf17060a44152156062 Parents: 0ad0cdd Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 12:15:57 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 12:15:57 2017 +0300 ---------------------------------------------------------------------- .../flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as | 3 ++- .../flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as | 3 ++- frameworks/projects/Basic/src/main/resources/defaults.css | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as index 2f81699..f0853fa 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as @@ -155,7 +155,8 @@ package org.apache.flex.html.beads.layouts // set the display on the contentView contentView.element.style["display"] = "flex"; contentView.element.style["flex-flow"] = "row"; - if (!contentView.element.style["align-items"]) + var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems"); + if (align == "center") contentView.element.style["align-items"] = "center"; var n:int = contentView.numElements; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as index 53617fb..c4d70e1 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as @@ -156,7 +156,8 @@ package org.apache.flex.html.beads.layouts // set the display on the contentView contentView.element.style["display"] = "flex"; contentView.element.style["flex-flow"] = "column"; - if (!contentView.element.style["align-items"]) + var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems"); + if (align == "center") contentView.element.style["align-items"] = "center"; var n:int = contentView.numElements; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/resources/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index 91d7932..7f7973b 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -58,6 +58,7 @@ Application { padding: 0px; margin: 0px; + align-content: flex-start; } Button
