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/06 19:33:55 UTC
[royale-asjs] branch develop updated: jewel-datagrid: some
simplifications on structure
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 9578508 jewel-datagrid: some simplifications on structure
9578508 is described below
commit 9578508483397f513628ca63bf6ebc09bc0f5776
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 6 20:33:43 2020 +0100
jewel-datagrid: some simplifications on structure
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 5 +++--
.../royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as | 3 ---
.../royale/org/apache/royale/jewel/beads/views/DataGridView.as | 4 ----
frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass | 7 ++++---
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 9f3e42f..aad6388 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -506,14 +506,15 @@ j|VirtualComboBoxPopUp {
.jewel.datagrid {
display: flex;
+ flex-direction: column;
position: relative;
}
.jewel.datagrid .jewel.buttonbar.header {
width: 100%;
}
.jewel.datagrid .listarea {
- position: absolute;
- width: auto;
+ width: 100%;
+ height: 100%;
}
.jewel.datagrid .jewel.list.column .jewel.item.datagrid {
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
index 77159d8..b54f678 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/DataGridLayout.as
@@ -123,9 +123,6 @@ package org.apache.royale.jewel.beads.layouts
}
var columnWidths:Array = [];
- if(listArea.y != header.height)
- listArea.y = header.height;
-
for(var i:int=0; i < bbmodel.dataProvider.length; i++)
{
var columnDef:IDataGridColumn = (bbmodel.dataProvider as ArrayList).getItemAt(i) as IDataGridColumn;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
index d968768..ec7ddd5 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
@@ -123,10 +123,6 @@ package org.apache.royale.jewel.beads.views
// columns
var listAreaClass:Class = ValuesManager.valuesImpl.getValue(host, "listAreaClass") as Class;
_listArea = new listAreaClass() as IUIBase;
- (_listArea as ILayoutChild).percentWidth = 100;
- COMPILE::JS {
- _listArea.positioner.style.height = "calc(100% - " + header.height + "px)";
- }
_dg.strandChildren.addElement(_listArea as IChild);
if (_sharedModel.columns)
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 653ce29..7440400 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -22,17 +22,18 @@
// DataGrid variables
.jewel.datagrid
display: flex
+ flex-direction: column
position: relative
.jewel.buttonbar.header
width: 100%
.listarea
- position: absolute
- width: auto
+ width: 100%
+ height: 100%
.jewel.list.column
-
+
&.first
&.middle