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/11 22:28:03 UTC
[royale-asjs] branch develop updated: jewel-datagrid: fix rowHeight
not set fue to recent refactor
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 d279b93 jewel-datagrid: fix rowHeight not set fue to recent refactor
d279b93 is described below
commit d279b9382be0aef8a7825e11dde747f4a34a25a5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Mar 11 23:27:54 2020 +0100
jewel-datagrid: fix rowHeight not set fue to recent refactor
---
.../royale/org/apache/royale/jewel/beads/views/DataGridView.as | 10 ++++++----
.../royale/jewel/supportClasses/datagrid/DataGridColumnList.as | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
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 6a75b86..07f9f29 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
@@ -44,6 +44,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridPresentationModel;
+ import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
import org.apache.royale.utils.IEmphasis;
import org.apache.royale.utils.loadBeadFromValuesManager;
@@ -147,6 +148,11 @@ package org.apache.royale.jewel.beads.views
var dataGridColumn:IDataGridColumn = _sharedModel.columns[i] as IDataGridColumn;
var list:IDataGridColumnList = new columnClass();
+
+ var pm:ListPresentationModel = list.getBeadByType(IListPresentationModel) as ListPresentationModel;
+ pm.rowHeight = _presentationModel.rowHeight;
+ pm.align = dataGridColumn.align;
+
list.datagrid = _dg as DataGrid;
list.emphasis = (_dg as IEmphasis).emphasis;
@@ -167,10 +173,6 @@ package org.apache.royale.jewel.beads.views
list.addEventListener('rollOverIndexChanged', handleColumnListRollOverChange);
list.addEventListener('selectionChanged', handleColumnListSelectionChange);
- var pm:ListPresentationModel = new ListPresentationModel();
- pm.rowHeight = _presentationModel.rowHeight;
- pm.align = dataGridColumn.align;
- list.addBead(pm as IBead);
(_listArea as IParent).addElement(list as IChild);
_lists.push(list);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumnList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumnList.as
index e2d6e36..c790f52 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumnList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumnList.as
@@ -59,6 +59,8 @@ package org.apache.royale.jewel.supportClasses.datagrid
{
super();
typeNames = "jewel list column";
+ // rowHeight need to be set to a default value to avoid potential different column heights
+ rowHeight = 34;
}
/**