This is an automated email from the ASF dual-hosted git repository. piotrz pushed a commit to branch features/issue_472_label_function in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/features/issue_472_label_function by this push: new 1b87ac2 Results of labelFunction shouldn't override data 1b87ac2 is described below commit 1b87ac2823104cecf7c587b8e56c130c034f8baa Author: Piotr Zarzycki <piotrzarzyck...@gmail.com> AuthorDate: Tue Oct 29 10:25:31 2019 +0100 Results of labelFunction shouldn't override data (reference #472 ) --- .../AdvancedDataGridItemRenderer.as | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as index 573568d..1b0c77b 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridItemRenderer.as @@ -136,14 +136,7 @@ public class AdvancedDataGridItemRenderer extends StringItemRenderer var adgModel:DataGridICollectionViewModel = owner.getBeadByType(DataGridICollectionViewModel) as DataGridICollectionViewModel; var column:DataGridColumn = adgModel.columns[treeListData.columnIndex]; - if (column.labelFunction) - { - super.data = column.labelFunction(value, column); - } - else - { - super.data = value; - } + super.data = value; var indentSpace:String = " "; var extraSpace:String = " "; @@ -169,7 +162,14 @@ public class AdvancedDataGridItemRenderer extends StringItemRenderer element.style.backgroundColor = CSSUtils.attributeFromColor(backgroundColor); } - this.text = indent + this.text; + if (column.labelFunction) + { + this.text = column.labelFunction(value, column); + } + else + { + this.text = indent + this.text; + } } /**