[royale-asjs] branch develop updated: jeqel-tabbar: fix height in renderers

[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 f8aedbd  jeqel-tabbar: fix height in renderers
f8aedbd is described below

commit f8aedbd63c71f6972d106623fd4f6ffbdd3ef46d
Author: Carlos Rovira <carlos.rov...@apache.org>
AuthorDate: Wed Oct 28 00:31:05 2020 +0100

    jeqel-tabbar: fix height in renderers
---
 .../royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as | 6 +++---
 .../jewel/beads/itemRenderers/TableItemRendererInitializer.as       | 6 +++---
 2 files changed, 6 insertions(+), 6 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 1ba5ebe..ccb00a0 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
@@ -77,15 +77,15 @@ package org.apache.royale.jewel.beads.itemRenderers
             if (presentationModel) {
                                if(!isNaN(presentationModel.rowHeight) && 
!presentationModel.variableRowHeight)
                                {
-                       StyledUIBase(ir).height = 
isNaN(presentationModel.rowHeight) ? ListPresentationModel.DEFAULT_ROW_HEIGHT : 
presentationModel.rowHeight;
+                       StyledUIBase(ir).height = presentationModel.rowHeight;
                                }
                                else if(!isNaN(presentationModel.rowHeight) && 
presentationModel.variableRowHeight)
                                {
-                       StyledUIBase(ir).minHeight = 
isNaN(presentationModel.rowHeight) ? ListPresentationModel.DEFAULT_ROW_HEIGHT : 
presentationModel.rowHeight;
+                       StyledUIBase(ir).minHeight = 
presentationModel.rowHeight;
                                }
                                else if(!presentationModel.variableRowHeight)
                                {
-                       StyledUIBase(ir).height = 
ListPresentationModel.DEFAULT_ROW_HEIGHT;
+                       StyledUIBase(ir).height = 
isNaN(presentationModel.rowHeight) ? NaN : 
ListPresentationModel.DEFAULT_ROW_HEIGHT;
                                }
                                
                 if(ir is IAlignItemRenderer)
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
index b2270a7..79beb44 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as
@@ -65,9 +65,9 @@ package org.apache.royale.jewel.beads.itemRenderers
             if (tir && ownerView)
                 tir.itemRendererOwnerView = ownerView;
 
-                       if (presentationModel) {
-                               StyledUIBase(ir).height = 
presentationModel.rowHeight;
-                       }
+                       // if (presentationModel) {
+                       //      StyledUIBase(ir).height = 
presentationModel.rowHeight;
+                       // }
                }
                // public static const DEFAULT_PADDING:Number = 8;
        }