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 4198870 jewel-itemrenderers: fix rowHeight on normal lists
(regression)
4198870 is described below
commit 4198870bb61c1165068ea8636127a59994f6cdfe
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Mar 5 20:24:28 2020 +0100
jewel-itemrenderers: fix rowHeight on normal lists (regression)
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 3 +--
frameworks/projects/Jewel/src/main/sass/components/_combobox.sass | 4 ++++
.../projects/Jewel/src/main/sass/components/_itemRenderer.sass | 5 +++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0217e9f..117e980 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -968,8 +968,7 @@ j|ImageButton {
align-items: center;
}
.jewel.item.mxmlContent, .jewel.navigationlink.mxmlContent,
.jewel.tabbarbutton.mxmlContent {
- display: flex;
- align-items: center;
+ flex: 0 0 auto;
}
.jewel.item.selectable, .jewel.navigationlink.selectable,
.jewel.tabbarbutton.selectable {
cursor: pointer;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
index 8c421b3..57ae3b3 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_combobox.sass
@@ -159,6 +159,10 @@ j|ComboBoxPopUp
// j|ComboBoxPopUp
// IBackgroundBead:
ClassReference('org.apache.royale.html.beads.SolidBackgroundBead')
+// Jewel VirtualComboBox
+
+// VirtualComboBox variables
+
j|VirtualComboBox
IPopUp:
ClassReference("org.apache.royale.jewel.supportClasses.combobox.VirtualComboBoxPopUp")
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
index 32b8054..3851586 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
@@ -35,8 +35,9 @@ $item-min-height: 34px
// used when the renderer is extended, so we change to flex display
&.mxmlContent
- display: flex
- align-items: center
+ flex: 0 0 auto
+ // display: flex
+ // align-items: center
&.selectable
cursor: pointer
