You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/17 17:07:25 UTC
[royale-asjs] branch develop updated: jewel-group: add overflow
hidden to make inner content adapt to global height
This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 fd1ac42 jewel-group: add overflow hidden to make inner content adapt to global height
fd1ac42 is described below
commit fd1ac424c41c4b83d434831390f36cbb9d99729a
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Mar 17 18:06:44 2020 +0100
jewel-group: add overflow hidden to make inner content adapt to global height
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 4 ++++
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/Grid.as | 2 +-
.../Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as | 2 +-
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as | 2 +-
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/HGroup.as | 2 +-
.../projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as | 2 +-
frameworks/projects/Jewel/src/main/sass/_global.sass | 3 +++
.../themes/JewelTheme/src/main/sass/components-primary/_card.sass | 1 +
8 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 089e0bb..bc030e2 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -74,6 +74,10 @@ j|Group {
IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
}
+.jewel.group {
+ overflow: hidden;
+}
+
j|HGroup {
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Grid.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Grid.as
index 80ab074..edea82d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Grid.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Grid.as
@@ -45,7 +45,7 @@ package org.apache.royale.jewel
{
super();
- typeNames = "jewel " + GridLayout.LAYOUT_TYPE_NAMES;
+ typeNames += " " + GridLayout.LAYOUT_TYPE_NAMES;
layout = new GridLayout();
addBead(layout);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
index b71b0d8..1efaeba 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/GridCell.as
@@ -47,7 +47,7 @@ package org.apache.royale.jewel
{
super();
- typeNames = "jewel " + GridCellLayout.LAYOUT_TYPE_NAMES;
+ typeNames += " " + GridCellLayout.LAYOUT_TYPE_NAMES;
layout = new GridCellLayout();
addBead(layout);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
index 5bf88c8..73e7f5f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
@@ -68,7 +68,7 @@ package org.apache.royale.jewel
public function Group()
{
super();
- typeNames = "";
+ typeNames = "jewel group";
}
private var _mxmlDescriptor:Array;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HGroup.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HGroup.as
index d4f503e..39571a4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HGroup.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HGroup.as
@@ -45,7 +45,7 @@ package org.apache.royale.jewel
{
super();
- typeNames = "jewel " + HorizontalLayout.LAYOUT_TYPE_NAMES;
+ typeNames += " " + HorizontalLayout.LAYOUT_TYPE_NAMES;
layout = new HorizontalLayout();
addBead(layout);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
index 1e97a83..7cf7a65 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
@@ -45,7 +45,7 @@ package org.apache.royale.jewel
{
super();
- typeNames = "jewel " + VerticalLayout.LAYOUT_TYPE_NAMES;
+ typeNames += " " + VerticalLayout.LAYOUT_TYPE_NAMES;
layout = new VerticalLayout();
addBead(layout);
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 0bdef45..70cd979 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -78,6 +78,9 @@ j|Group
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
+.jewel.group
+ overflow: hidden // make inner content adapt to the group height
+
j|HGroup
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
index 874dca2..581397f 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_card.sass
@@ -38,6 +38,7 @@
&.simple
padding: 20px
+ flex: 1 1 0%
.cardHeader
@if $flat