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 2019/12/12 23:47:42 UTC
[royale-asjs] 41/42: jewel-layouts: add support in layouts for new
buttonbar widthTypes (only 2 are implemented, next will come soon)
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 667f17700944648f37ed86bf31b13e47a1b09eb5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Dec 13 00:28:51 2019 +0100
jewel-layouts: add support in layouts for new buttonbar widthTypes (only 2 are implemented, next will come soon)
---
.../projects/Jewel/src/main/resources/defaults.css | 21 ++++++++++++++++++---
.../Jewel/src/main/sass/components/_layout.sass | 10 +++++++++-
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 9cd6e14..2b8383e 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -488,12 +488,18 @@ j|ComboBoxPopUp {
width: 200px;
height: 290px;
}
+.jewel.datagrid .jewel.buttonbar.header {
+ width: 100%;
+}
.jewel.datagrid .jewel.buttonbar.header .jewel.button.first {
border-bottom-left-radius: 0;
}
.jewel.datagrid .jewel.buttonbar.header .jewel.button.last {
border-bottom-right-radius: 0;
}
+.jewel.datagrid .listarea {
+ width: 100%;
+}
.jewel.datagrid .jewel.list.column {
border-radius: 0px;
border-top-width: 0px;
@@ -516,10 +522,10 @@ j|DataGrid {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DataGridView");
IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel");
IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.DataGridLayout");
- columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnList");
- columnContainerClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridButtonBar");
- columnLayoutClass: ClassReference("org.apache.royale.html.beads.layouts.ButtonBarLayout");
+ headerClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridButtonBar");
+ headerLayoutClass: ClassReference("org.apache.royale.jewel.beads.layouts.ButtonBarLayout");
listAreaClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridListArea");
+ columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnList");
}
j|DataGridListArea {
@@ -1077,9 +1083,18 @@ j|Label {
.layout.horizontal.sameWidths > * {
flex: 1 0;
}
+.layout.horizontal.pixelWidths > * {
+ flex: none;
+}
.layout.horizontal.proportinalWidths > * {
+ flex: 1 0;
+}
+.layout.horizontal.percentWidths > * {
flex: 1 0 auto;
}
+.layout.horizontal.naturalWidths > * {
+ flex: none;
+}
.layout.vertical {
flex-direction: column;
flex-wrap: nowrap;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 5d5bfcd..52e47ef 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -80,13 +80,21 @@ $gap-size: 10px !default
margin: 0px
> *
margin: 0px 0px 0px ($gap + $i * $gap-step)
-
&.sameWidths
> *
flex: 1 0
+ &.pixelWidths
+ > *
+ flex: none
&.proportinalWidths
> *
+ flex: 1 0
+ &.percentWidths
+ > *
flex: 1 0 auto
+ &.naturalWidths
+ > *
+ flex: none
// Vertical
&.vertical