You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/12/13 06:04:14 UTC
[royale-asjs] branch develop updated: go back to uninitialized
rowHeight
This is an automated email from the ASF dual-hosted git repository.
aharui 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 ccbd603 go back to uninitialized rowHeight
ccbd603 is described below
commit ccbd6036d1c80fb7e5aa13565f5630308a73390a
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Dec 12 22:03:54 2019 -0800
go back to uninitialized rowHeight
---
.../src/main/royale/mx/controls/beads/AdvancedDataGridView.as | 6 +++++-
.../MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
index 5d0bd15..4127995 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridView.as
@@ -22,6 +22,7 @@ package mx.controls.beads
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
+ import org.apache.royale.core.IListPresentationModel;
import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
@@ -63,7 +64,10 @@ package mx.controls.beads
super.handleInitComplete(event);
var host:AdvancedDataGrid = _strand as AdvancedDataGrid;
- header.height = host.rowHeight;
+ if (!isNaN(host.rowHeight))
+ header.height = host.rowHeight;
+ else
+ header.height = (host.presentationModel as IListPresentationModel).rowHeight;
IEventDispatcher(host).addEventListener("columnsInvalid", handleColumnsInvalid);
handleColumnsInvalid(null);
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index afe220e..9d37def 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -1101,7 +1101,7 @@ use namespace mx_internal;
* @private
* Storage for the rowHeight property.
*/
- private var _rowHeight:Number = 0;
+ private var _rowHeight:Number;
/**
* @private
@@ -1124,7 +1124,7 @@ use namespace mx_internal;
*/
public function get rowHeight():Number
{
- return (presentationModel as IListPresentationModel).rowHeight;
+ return _rowHeight;
}
/**