[royale-asjs] branch develop updated: jewel-list: fix in initializers for height depending on PM rowHight and variableRowHeight, some new cases added

[carlosrovira]

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 586b8aa  jewel-list: fix in initializers for height depending on PM 
rowHight and variableRowHeight, some new cases added
586b8aa is described below

commit 586b8aa70295b6828caf47e8139d42b638441341
Author: Carlos Rovira <carlos.rov...@apache.org>
AuthorDate: Mon Oct 26 20:31:04 2020 +0100

    jewel-list: fix in initializers for height depending on PM rowHight and 
variableRowHeight, some new cases added
---
 .../beads/itemRenderers/ListItemRendererInitializer.as    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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 776d01b..1ba5ebe 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
@@ -25,6 +25,7 @@ package org.apache.royale.jewel.beads.itemRenderers
        import org.apache.royale.core.IStrandWithModelView;
        import org.apache.royale.core.StyledMXMLItemRenderer;
        import org.apache.royale.core.StyledUIBase;
+       import org.apache.royale.jewel.beads.models.ListPresentationModel;
        import 
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
 
        /**
@@ -74,8 +75,18 @@ package org.apache.royale.jewel.beads.itemRenderers
         override protected function 
setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
         {
             if (presentationModel) {
-                               if(!presentationModel.variableRowHeight)
-                       StyledUIBase(ir).height = presentationModel.rowHeight;
+                               if(!isNaN(presentationModel.rowHeight) && 
!presentationModel.variableRowHeight)
+                               {
+                       StyledUIBase(ir).height = 
isNaN(presentationModel.rowHeight) ? ListPresentationModel.DEFAULT_ROW_HEIGHT : 
presentationModel.rowHeight;
+                               }
+                               else if(!isNaN(presentationModel.rowHeight) && 
presentationModel.variableRowHeight)
+                               {
+                       StyledUIBase(ir).minHeight = 
isNaN(presentationModel.rowHeight) ? ListPresentationModel.DEFAULT_ROW_HEIGHT : 
presentationModel.rowHeight;
+                               }
+                               else if(!presentationModel.variableRowHeight)
+                               {
+                       StyledUIBase(ir).height = 
ListPresentationModel.DEFAULT_ROW_HEIGHT;
+                               }
                                
                 if(ir is IAlignItemRenderer)
                 {