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/19 18:39:49 UTC
[royale-asjs] branch develop updated: jewel-card: make card extends
container instead group to compose clipping
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 8b23cfb jewel-card: make card extends container instead group to compose clipping
8b23cfb is described below
commit 8b23cfb7755aa57bf2bfc55c72a73e11648374da
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Mar 19 19:25:12 2020 +0100
jewel-card: make card extends container instead group to compose clipping
---
.../projects/Jewel/src/main/resources/defaults.css | 23 +++++++++++++++++++---
.../main/royale/org/apache/royale/jewel/Card.as | 4 +---
.../jewel/supportClasses/card/CardActions.as | 6 ++----
.../royale/jewel/supportClasses/card/CardHeader.as | 6 +++---
.../supportClasses/card/CardPrimaryContent.as | 4 ++--
.../Jewel/src/main/sass/components/_card.sass | 11 ++++++++---
6 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index d120080..ee8f325 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -311,7 +311,6 @@ j|ToggleButtonBar {
.jewel.card {
min-width: 240px;
min-height: 52px;
- overflow: hidden;
position: relative;
}
.jewel.card .cardHeader {
@@ -324,7 +323,6 @@ j|ToggleButtonBar {
outline: none;
color: inherit;
text-decoration: none;
- overflow: hidden;
flex: 1 1 0%;
}
.jewel.card .cardActions {
@@ -333,7 +331,26 @@ j|ToggleButtonBar {
outline: none;
color: inherit;
text-decoration: none;
- overflow: hidden;
+}
+
+j|Card {
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
+}
+
+j|CardHeader {
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
+}
+
+j|CardPrimaryContent {
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
+}
+
+j|CardActions {
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
.jewel.checkbox {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
index 3fcf61d..da0d4df 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Card.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.jewel.VGroup;
-
/**
* The Card class is a container that surronds other components.
* Card has a default "panel" style and can compose other containers like
@@ -30,7 +28,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Card extends VGroup
+ public class Card extends VContainer
{
/**
* constructor.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardActions.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardActions.as
index 7cf42d6..d26a3a7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardActions.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardActions.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.supportClasses.card
{
- import org.apache.royale.jewel.HGroup;
+ import org.apache.royale.jewel.HContainer;
/**
* The CardActions class is a footer for Cards where actions (i.e: buttons, icons)
@@ -29,7 +29,7 @@ package org.apache.royale.jewel.supportClasses.card
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class CardActions extends HGroup
+ public class CardActions extends HContainer
{
/**
* constructor.
@@ -45,7 +45,5 @@ package org.apache.royale.jewel.supportClasses.card
typeNames = "cardActions";
}
-
-
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardHeader.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardHeader.as
index 59ec482..d17ee48 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardHeader.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardHeader.as
@@ -18,8 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.supportClasses.card
{
- import org.apache.royale.jewel.HGroup;
-
+ import org.apache.royale.jewel.HContainer;
+
/**
* The CardHeader class is a header for Cards where Title and actions (i.e: buttons, icons)
* can be located.
@@ -29,7 +29,7 @@ package org.apache.royale.jewel.supportClasses.card
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class CardHeader extends HGroup
+ public class CardHeader extends HContainer
{
/**
* constructor.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardPrimaryContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardPrimaryContent.as
index a1d9361..08d87ae 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardPrimaryContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/card/CardPrimaryContent.as
@@ -19,7 +19,7 @@
package org.apache.royale.jewel.supportClasses.card
{
import org.apache.royale.jewel.Card;
- import org.apache.royale.jewel.VGroup;
+ import org.apache.royale.jewel.VContainer;
/**
* The CardPrimaryContent class is a the main container for Cards.
@@ -30,7 +30,7 @@ package org.apache.royale.jewel.supportClasses.card
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class CardPrimaryContent extends VGroup
+ public class CardPrimaryContent extends VContainer
{
/**
* constructor.
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index 2a2edd1..9dedc14 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -31,7 +31,6 @@ $card-primary-content-minheight: 152px !default
min-height: $card-height
// width: 350px
- overflow: hidden
position: relative
//z-index: 1
@@ -46,7 +45,6 @@ $card-primary-content-minheight: 152px !default
outline: none
color: inherit
text-decoration: none
- overflow: hidden
flex: 1 1 0%
@@ -56,17 +54,24 @@ $card-primary-content-minheight: 152px !default
outline: none
color: inherit
text-decoration: none
- overflow: hidden
j|Card
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
j|CardHeader
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
j|CardPrimaryContent
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
j|CardActions
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
+ IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")