You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/08/31 22:26:19 UTC
[royale-asjs] branch develop updated: jewel-presentationmodels:
finish adjustments of PMs
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 31b9608 jewel-presentationmodels: finish adjustments of PMs
31b9608 is described below
commit 31b9608659ed1f5a14bcf0121de977e1fb44a2bb
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Sep 1 00:25:56 2020 +0200
jewel-presentationmodels: finish adjustments of PMs
---
.../Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 2 --
.../jewel/beads/models/DataGridPresentationModel.as | 2 +-
.../apache/royale/jewel/beads/views/DataGridView.as | 18 +++++++++---------
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 5a09f2e..374f26f 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -235,6 +235,7 @@
<component id="ListPresentationModel" class="org.apache.royale.jewel.beads.models.ListPresentationModel"/>
<component id="TabBarPresentationModel" class="org.apache.royale.jewel.beads.models.TabBarPresentationModel"/>
<component id="DataGridColumnListPresentationModel" class="org.apache.royale.jewel.beads.models.DataGridColumnListPresentationModel"/>
+ <component id="DataGridPresentationModel" class="org.apache.royale.jewel.beads.models.DataGridPresentationModel"/>
<component id="Viewport" class="org.apache.royale.jewel.supportClasses.Viewport"/>
<component id="ScrollingViewport" class="org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport"/>
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 2c2d428..79d474b 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -44,8 +44,6 @@ import org.apache.royale.utils.observeElementSize;
import org.apache.royale.jewel.beads.models.WizardModel; WizardModel;
import org.apache.royale.jewel.beads.models.WizardStep; WizardStep;
import org.apache.royale.jewel.beads.models.PopUpModel; PopUpModel;
- import org.apache.royale.jewel.beads.models.ListPresentationModel; ListPresentationModel;
- import org.apache.royale.jewel.beads.models.DataGridPresentationModel; DataGridPresentationModel;
import org.apache.royale.jewel.beads.controllers.PopUpMouseController; PopUpMouseController;
import org.apache.royale.jewel.beads.controllers.SpinnerMouseController; SpinnerMouseController;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DataGridPresentationModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DataGridPresentationModel.as
index 450ed0d..f1859ad 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DataGridPresentationModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DataGridPresentationModel.as
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class DataGridPresentationModel extends ListPresentationModel implements IDataGridPresentationModel
+ public class DataGridPresentationModel extends DataGridColumnListPresentationModel implements IDataGridPresentationModel
{
/**
* constructor.
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 5dbc919..89822da 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
@@ -26,8 +26,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.IChild;
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.ILayoutChild;
+ import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
@@ -40,7 +39,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.html.beads.IDataGridView;
import org.apache.royale.html.beads.LabelFunction;
import org.apache.royale.jewel.DataGrid;
- import org.apache.royale.jewel.beads.models.ListPresentationModel;
+ import org.apache.royale.jewel.beads.models.DataGridColumnListPresentationModel;
import org.apache.royale.jewel.supportClasses.Viewport;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridButtonBar;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
@@ -206,11 +205,6 @@ package org.apache.royale.jewel.beads.views
var list:IDataGridColumnList = new columnClass();
- var pm:ListPresentationModel = list.getBeadByType(IListPresentationModel) as ListPresentationModel;
- pm.rowHeight = _presentationModel.rowHeight;
- pm.variableRowHeight = false;
- pm.align = dataGridColumn.align;
-
list.datagrid = _dg as DataGrid;
list.emphasis = (_dg as IEmphasis).emphasis;
@@ -225,7 +219,7 @@ package org.apache.royale.jewel.beads.views
}
// by default make columns get the 1/n of the maximun space available
- // (list as ILayoutChild).percentWidth = 100 / len;
+ // (list as ILayoutChild).percentWidth = 100 / len;
list.itemRenderer = dataGridColumn.itemRenderer;
list.labelField = dataGridColumn.dataField;
if(dataGridColumn.labelFunction)
@@ -239,6 +233,12 @@ package org.apache.royale.jewel.beads.views
(list as StyledUIBase).tabIndex = -1;
(_listArea as IParent).addElement(list as IChild);
+
+ var pm:DataGridColumnListPresentationModel = list.getBeadByType(IListPresentationModel) as DataGridColumnListPresentationModel;
+ pm.rowHeight = _presentationModel.rowHeight;
+ pm.variableRowHeight = false;
+ pm.align = dataGridColumn.align;
+
columnLists.push(list);
}
}