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/04/12 18:26:44 UTC
[royale-asjs] branch develop updated: jewel-initializers: add
config for variableRowHeight
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 44aaa52 jewel-initializers: add config for variableRowHeight
44aaa52 is described below
commit 44aaa52653a190bb1325d5e222557c773f6fa998
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Apr 12 20:26:39 2020 +0200
jewel-initializers: add config for variableRowHeight
---
.../jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as | 4 +++-
.../itemRenderers/DataGridColumnListItemRendererInitializer.as | 5 +++--
.../jewel/beads/itemRenderers/ListItemRendererInitializer.as | 7 +++++--
.../royale/org/apache/royale/jewel/beads/views/DataGridView.as | 1 +
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as
index 9435d45..5ff9764 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as
@@ -52,7 +52,9 @@ package org.apache.royale.jewel.beads.itemRenderers
override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
{
if (presentationModel) {
- StyledUIBase(ir).minHeight = presentationModel.rowHeight;
+ if(!presentationModel.variableRowHeight)
+ StyledUIBase(ir).height = presentationModel.rowHeight;
+ //StyledUIBase(ir).minHeight = presentationModel.rowHeight;
if(ir is IAlignItemRenderer)
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as
index 698970e..699ace0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as
@@ -48,8 +48,9 @@ package org.apache.royale.jewel.beads.itemRenderers
override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
{
if (presentationModel) {
- // temp
- StyledUIBase(ir).height = presentationModel.rowHeight;
+ if(!presentationModel.variableRowHeight)
+ StyledUIBase(ir).height = presentationModel.rowHeight;
+ //StyledUIBase(ir).height = presentationModel.rowHeight;
if(ir is IAlignItemRenderer)
{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
index bdc78be..c27cc8e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as
@@ -75,8 +75,11 @@ package org.apache.royale.jewel.beads.itemRenderers
override protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
{
if (presentationModel) {
- StyledUIBase(ir).minHeight = presentationModel.rowHeight;
-
+ if(!presentationModel.variableRowHeight)
+ StyledUIBase(ir).height = presentationModel.rowHeight;
+ // else
+ // StyledUIBase(ir).minHeight = presentationModel.rowHeight;
+
if(ir is IAlignItemRenderer)
{
(ir as IAlignItemRenderer).align = presentationModel.align;
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 a84cf4a..b89c96f 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
@@ -151,6 +151,7 @@ package org.apache.royale.jewel.beads.views
var pm:ListPresentationModel = list.getBeadByType(IListPresentationModel) as ListPresentationModel;
pm.rowHeight = _presentationModel.rowHeight;
+ pm.variableRowHeight = false;
pm.align = dataGridColumn.align;
list.datagrid = _dg as DataGrid;