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/12 22:35:26 UTC
[royale-asjs] branch develop updated: fix #621
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 308bb90 fix #621
308bb90 is described below
commit 308bb9034abc20486ff29c294a1aeb0e5bde1fe2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Dec 12 14:35:07 2019 -0800
fix #621
---
frameworks/projects/MXRoyale/src/main/resources/defaults.css | 5 +++++
frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as | 1 +
frameworks/projects/MXRoyale/src/main/royale/mx/controls/List.as | 2 +-
.../MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as | 4 ++--
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 3ba08eb..679ce2f 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -238,6 +238,11 @@ List
IListPresentationModel: ClassReference("org.apache.royale.html.beads.models.ListPresentationModel");
IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
+
+ background-color: #FFFFFF;
+ border: 1px solid #222222;
+ width: 200px;
+ height: 200px;
}
ListItemRenderer
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
index 2e9a53f..b76167b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
@@ -729,6 +729,7 @@ public class DataGrid extends ListBase implements IDataGrid// implements IIMESup
public function DataGrid()
{
super();
+ typeNames = "DataGrid";
}
//--------------------------------------------------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/List.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/List.as
index 238e43a..31b21ef 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/List.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/List.as
@@ -281,7 +281,7 @@ public class List extends ListBase // implements IIMESupport
public function List()
{
super();
-
+ typeNames = "List";
}
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 9d37def..afe220e 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;
+ private var _rowHeight:Number = 0;
/**
* @private
@@ -1124,7 +1124,7 @@ use namespace mx_internal;
*/
public function get rowHeight():Number
{
- return _rowHeight;
+ return (presentationModel as IListPresentationModel).rowHeight;
}
/**