[royale-asjs] branch develop updated: jewel-datagrid: fix datagrid layout when there's no dataprovider or is empty to show empty white columns

[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 1498127  jewel-datagrid: fix datagrid layout when there's no 
dataprovider or is empty to show empty white columns
1498127 is described below

commit 1498127a21b7866f9792267a0739948c13f269c9
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Wed Feb 19 12:24:46 2020 +0100

    jewel-datagrid: fix datagrid layout when there's no dataprovider or is 
empty to show empty white columns
---
 frameworks/projects/Jewel/src/main/resources/defaults.css      |  4 ++++
 .../royale/jewel/beads/controls/tabbar/AssignTabContent.as     |  1 -
 .../royale/org/apache/royale/jewel/beads/views/DataGridView.as | 10 +++-------
 .../projects/Jewel/src/main/sass/components/_datagrid.sass     |  2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css 
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 2e72257..7b8c40b 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -495,6 +495,10 @@ j|VirtualComboBoxPopUp {
 .jewel.datagrid .listarea {
   position: absolute;
   width: auto;
+  overflow: hidden;
+}
+.jewel.datagrid .jewel.list.column {
+  height: inherit;
 }
 .jewel.datagrid .jewel.list.column .jewel.item.datagrid {
   width: 100%;
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/tabbar/AssignTabContent.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/tabbar/AssignTabContent.as
index 0b65227..d07a7cd 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/tabbar/AssignTabContent.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/tabbar/AssignTabContent.as
@@ -23,7 +23,6 @@ package org.apache.royale.jewel.beads.controls.tabbar
        import org.apache.royale.events.Event;
        import org.apache.royale.jewel.TabBar;
        import org.apache.royale.jewel.TabBarContent;
-       import org.apache.royale.core.IDataProviderModel;
        
        [DefaultProperty("content")]
 
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 5767ec1..a801c59 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
@@ -231,14 +231,10 @@ package org.apache.royale.jewel.beads.views
         {   
             COMPILE::JS
             {
-            if(_sharedModel.dataProvider && (_sharedModel.dataProvider.length 
* _presentationModel.rowHeight) < _listArea.height)
+            if(_sharedModel.dataProvider && (_sharedModel.dataProvider.length 
* _presentationModel.rowHeight) > _listArea.height)
             {
-                (list as UIBase).positioner.style.height = "inherit";
-                _listArea.positioner.style.overflow = "hidden";
-            } else
-            {
-                (list as UIBase).positioner.style.height = null;
-                _listArea.positioner.style.overflow = null;
+                (list as UIBase).positioner.style.height = "auto";
+                _listArea.positioner.style.overflow = "auto";
             }
             }
             host.dispatchEvent(new Event("layoutNeeded"));
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass 
b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 35d7cc8..ab30611 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -31,10 +31,12 @@
     .listarea
         position: absolute
         width: auto
+        overflow: hidden
         //top: 38px -> header.height
         //height: datagrid.height - header.height
 
     .jewel.list.column
+        height: inherit
         
         &.first