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 8983873 jewel-datagrid: remove setting width in cells via code. Jewel
already make all cells 100% width by default
8983873 is described below
commit 8983873c9ce49f887ac14c748ed22bffe7351005
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Jan 2 15:51:03 2020 +0100
jewel-datagrid: remove setting width in cells via code. Jewel already make
all cells 100% width by default
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 3 +++
.../jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as | 2 +-
.../royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as | 1 -
.../jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as | 2 +-
.../beads/itemRenderers/DataItemRendererFactoryForCollectionView.as | 1 -
.../beads/itemRenderers/TableItemRendererFactoryForCollectionView.as | 1 -
frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass | 1 +
7 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 96e5bf8..2d05160 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -503,6 +503,9 @@ j|ComboBoxPopUp {
position: absolute;
width: auto;
}
+.jewel.datagrid .jewel.list.column .jewel.item.datagrid {
+ width: 100%;
+}
j|DataGrid {
IDataGridPresentationModel:
ClassReference("org.apache.royale.jewel.beads.models.DataGridPresentationModel");
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
index 08e7105..15186a9 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
@@ -224,7 +224,7 @@ package org.apache.royale.jewel.beads.itemRenderers
// style.marginBottom = presentationModel.separatorThickness;
// UIBase(itemRenderer).style = style;
UIBase(itemRenderer).height = presentationModel.rowHeight;
- UIBase(itemRenderer).percentWidth = 100;
+ //UIBase(itemRenderer).percentWidth = 100;
}
setData(itemRenderer, item, index);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
index 80e2bea..5d12f18 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
@@ -224,7 +224,6 @@ package org.apache.royale.jewel.beads.itemRenderers
if (presentationModel) {
UIBase(itemRenderer).height = presentationModel.rowHeight;
- UIBase(itemRenderer).percentWidth = 100;
}
setData(itemRenderer, item, index);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
index c3796cd..8bebbd1 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
@@ -188,7 +188,7 @@ package org.apache.royale.jewel.beads.itemRenderers
if (presentationModel) {
UIBase(ir).height =
presentationModel.rowHeight;
- UIBase(ir).percentWidth = 100;
+ // UIBase(ir).percentWidth = 100;
}
ir.data = dp[i];
dataGroup.addItemRenderer(ir, false);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
index 9c7c260..8a5840f 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
@@ -290,7 +290,6 @@ package org.apache.royale.jewel.beads.itemRenderers
if (presentationModel) {
UIBase(itemRenderer).height =
presentationModel.rowHeight;
- UIBase(itemRenderer).percentWidth = 100;
if(itemRenderer is IAlignItemRenderer)
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
index 245c29b..b9ceaf4 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
@@ -244,7 +244,6 @@ package org.apache.royale.jewel.beads.itemRenderers
if (presentationModel) {
UIBase(itemRenderer).height =
presentationModel.rowHeight;
- UIBase(itemRenderer).percentWidth = 100;
}
setData(itemRenderer, item, index);
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 50ad8c6..35d7cc8 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -43,6 +43,7 @@
&.last
.jewel.item.datagrid
+ width: 100%
j|DataGrid
IDataGridPresentationModel:
ClassReference("org.apache.royale.jewel.beads.models.DataGridPresentationModel")
