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 2018/08/18 18:04:43 UTC
[royale-asjs] 02/05: allow buttonbar buttons to have 'natural
width' for TabBar
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 580b69f98e28930c14885bf56a218223b1723b78
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Aug 18 11:00:15 2018 -0700
allow buttonbar buttons to have 'natural width' for TabBar
---
.../org/apache/royale/html/beads/layouts/ButtonBarLayout.as | 9 +++++----
.../royale/org/apache/royale/html/beads/models/ButtonBarModel.as | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
index 80450c6..5bf485f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
@@ -115,7 +115,7 @@ package org.apache.royale.html.beads.layouts
if (widthValue != null) ilc.percentWidth = Number(widthValue);
IStyleableObject(ilc).style.flexGrow = 0;
}
- } else {
+ } else if (!_widthType == ButtonBarModel.NATURAL_WIDTHS) {
IStyleableObject(ilc).style.flexGrow = 1;
}
}
@@ -134,11 +134,12 @@ package org.apache.royale.html.beads.layouts
else if (_widthType == ButtonBarModel.PERCENT_WIDTHS) {
if (widthValue != null) ilc.percentWidth = Number(widthValue);
}
- } else {
+ } else if (!_widthType == ButtonBarModel.NATURAL_WIDTHS) {
ilc.element.style["flex-grow"] = "1";
}
-
- ilc.height = contentView.height;
+
+ if (!host.isHeightSizedToContent())
+ ilc.height = contentView.height;
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
index e4639c8..235c17d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
@@ -41,6 +41,7 @@ package org.apache.royale.html.beads.models
public static const PIXEL_WIDTHS:Number = 0;
public static const PROPORTIONAL_WIDTHS:Number = 1;
public static const PERCENT_WIDTHS:Number = 2;
+ public static const NATURAL_WIDTHS:Number = 3;
/**
* Constructor.