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
commit 0ea630b2a7c730000add94d9f1acf855743f92e3 Author: Carlos Rovira <[email protected]> AuthorDate: Mon May 11 19:43:50 2020 +0200 jewel: css changes in renders --- .../projects/Jewel/src/main/resources/defaults.css | 36 ++++++++-------------- .../CollapsibleNavigationSectionRenderer.as | 7 ++--- .../royale/jewel/itemRenderers/ListItemRenderer.as | 22 ++++++++++--- .../itemRenderers/NavigationLinkItemRenderer.as | 5 --- .../src/main/sass/components/_itemRenderer.sass | 16 +++++----- .../Jewel/src/main/sass/components/_layout.sass | 14 ++++----- .../Jewel/src/main/sass/components/_list.sass | 6 ++-- .../src/main/sass/components/_navigation.sass | 1 - .../Jewel/src/main/sass/components/_table.sass | 3 +- 9 files changed, 51 insertions(+), 59 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index 6a9b04e..fc97ee8 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -979,21 +979,15 @@ j|ImageButton { } .jewel.item, .jewel.navigationlink, .jewel.tabbarbutton { - display: flex; min-height: 34px; text-decoration: none; letter-spacing: 0; line-height: normal !important; overflow: hidden; cursor: auto; -} -.jewel.item.mxmlContent, .jewel.navigationlink.mxmlContent, .jewel.tabbarbutton.mxmlContent { + flex-shrink: 0; position: relative; - flex: 0 0 auto; - align-items: center; -} -.jewel.item.mxmlContent > *, .jewel.navigationlink.mxmlContent > *, .jewel.tabbarbutton.mxmlContent > * { - position: absolute !important; + list-style: none; } .jewel.item.selectable, .jewel.navigationlink.selectable, .jewel.tabbarbutton.selectable { cursor: pointer; @@ -1002,6 +996,11 @@ j|ImageButton { cursor: inherit; } +j|ListItemRenderer { + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout"); + IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController"); +} + .jewel.label { -webkit-font-smoothing: antialiased; cursor: default; @@ -1030,7 +1029,7 @@ j|Label { position: relative; } .layout.basic > * { - position: absolute !important; + position: absolute; } .layout { @@ -1044,9 +1043,6 @@ j|Label { .layout.horizontal > * { flex: 0 1 auto; } -.layout.horizontal.variableRowHeight > * { - flex: 0 0 auto; -} .layout.horizontal.flow { flex-wrap: wrap; max-width: 100%; @@ -1146,9 +1142,6 @@ j|Label { .layout.vertical > * { flex: 0 1 auto; } -.layout.vertical.variableRowHeight > * { - flex: 0 0 auto; -} .layout.vertical.flow { flex-wrap: wrap; } @@ -3233,6 +3226,9 @@ j|Label { align-content: flex-start; -webkit-overflow-scrolling: touch; } +.jewel.list > *, .jewel.navigation > * { + flex: 0 0 auto; +} .jewel.list.no-chrome, .jewel.navigation.no-chrome { background: transparent; border: none; @@ -3259,10 +3255,6 @@ j|List { IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView"); } -j|ListItemRenderer { - IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController"); -} - @media -royale-swf { j|List { IContentView: ClassReference("org.apache.royale.jewel.supportClasses.list.DataGroup"); @@ -3289,10 +3281,6 @@ j|Navigation { IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView"); } -.jewel.navigationlink { - min-height: 48px; -} - j|NavigationLinkItemRenderer { IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController"); } @@ -3836,7 +3824,6 @@ j|Table { padding: 10px; cursor: pointer; text-decoration: none; - align-items: center; letter-spacing: 0; line-height: normal !important; overflow: hidden; @@ -3861,6 +3848,7 @@ j|Table { j|TableItemRenderer { IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController"); + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout"); } j|TBody { diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as index 1067e17..81fda21 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as @@ -57,14 +57,11 @@ package org.apache.royale.jewel.itemRenderers { super(); typeNames = "jewel navigationgroup"; + navLinkClassSelector = new ClassSelectorList(sectionNavItem); navLinkClassSelector.addNames("jewel navigationlink"); navLinkClassSelector.add("selectable"); - - if(MXMLDescriptor != null) - { - navLinkClassSelector.add("mxmlContent"); - } + open = false; addEventListener('click', onSectionNav); } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as index b41b09e..9ed7cec 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as @@ -23,12 +23,14 @@ package org.apache.royale.jewel.itemRenderers import org.apache.royale.core.WrappedHTMLElement; import org.apache.royale.html.util.addElementToWrapper; } + import org.apache.royale.core.IBeadLayout; import org.apache.royale.core.StyledMXMLItemRenderer; import org.apache.royale.events.Event; import org.apache.royale.html.util.getLabelFromData; import org.apache.royale.jewel.beads.controls.TextAlign; import org.apache.royale.jewel.beads.itemRenderers.IAlignItemRenderer; import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer; + import org.apache.royale.utils.loadBeadFromValuesManager; /** * The ListItemRenderer defines the basic Item Renderer for a Jewel List Component. @@ -53,11 +55,6 @@ package org.apache.royale.jewel.itemRenderers super(); typeNames = "jewel item"; - - if(MXMLDescriptor != null) - { - addClass("mxmlContent"); - } } private var _text:String = ""; @@ -143,5 +140,20 @@ package org.apache.royale.jewel.itemRenderers // tabIndex = -1; return element; } + + + /** + * The method called when added to a parent. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9.6 + */ + override public function addedToParent():void + { + super.addedToParent(); + loadBeadFromValuesManager(IBeadLayout, "iBeadLayout", this); + } } } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as index 9508cae..c514e4a 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as @@ -51,11 +51,6 @@ package org.apache.royale.jewel.itemRenderers super(); typeNames = "jewel navigationlink"; - - if(MXMLDescriptor != null) - { - addClass("mxmlContent"); - } } // private var _href:String = "#"; diff --git a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass index db20ecd..b3058a9 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass @@ -23,22 +23,19 @@ $item-min-height: 34px .jewel.item, .jewel.navigationlink, .jewel.tabbarbutton - display: flex + // display: flex min-height: $item-min-height text-decoration: none letter-spacing: 0 line-height: normal !important overflow: hidden cursor: auto + flex-shrink: 0 // align-items: center -> this need to be in mxmlContent to not modify basic list renders // pointer-events: none // used when the renderer is extended, so we change to flex display - &.mxmlContent - position: relative - flex: 0 0 auto - align-items: center - > * - position: absolute !important + position: relative + list-style: none &.selectable cursor: pointer @@ -47,5 +44,8 @@ $item-min-height: 34px .fonticon cursor: inherit - +j|ListItemRenderer + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout") + IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController") + diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass index 1227acd..37664a7 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass @@ -40,7 +40,7 @@ $gap-size: 10px !default .layout.basic position: relative > * - position: absolute !important + position: absolute .layout display: flex @@ -54,9 +54,9 @@ $gap-size: 10px !default > * flex: 0 1 auto - &.variableRowHeight - > * - flex: 0 0 auto + // &.variableRowHeight + // > * + // flex: 0 0 auto &.flow flex-wrap: wrap @@ -110,9 +110,9 @@ $gap-size: 10px !default > * flex: 0 1 auto - &.variableRowHeight - > * - flex: 0 0 auto + // &.variableRowHeight + // > * + // flex: 0 0 auto &.flow flex-wrap: wrap diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass index fe08705..e6aae70 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass @@ -24,6 +24,9 @@ align-items: stretch align-content: flex-start -webkit-overflow-scrolling: touch //Momentum (innercial) Scrolling on iOS + + > * + flex: 0 0 auto &.no-chrome background: transparent @@ -51,9 +54,6 @@ j|List //IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel") //IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData") -j|ListItemRenderer - IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController") - @media -royale-swf j|List diff --git a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass index 17947ca..45e88d7 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass @@ -43,7 +43,6 @@ j|Navigation // NavigationLinkItemRenderer variables .jewel.navigationlink - min-height: 48px j|NavigationLinkItemRenderer IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController") \ No newline at end of file diff --git a/frameworks/projects/Jewel/src/main/sass/components/_table.sass b/frameworks/projects/Jewel/src/main/sass/components/_table.sass index b9d5bc4..d7a106f 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_table.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_table.sass @@ -119,7 +119,7 @@ j|Table padding: 10px cursor: pointer text-decoration: none - align-items: center + // align-items: center letter-spacing: 0 line-height: normal !important overflow: hidden @@ -143,6 +143,7 @@ j|Table j|TableItemRenderer IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController") + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
