This is an automated email from the ASF dual-hosted git repository. yishayw pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 3b57b306847f56deac040dd7538da2c35ffdd970 Author: DESKTOP-RH4S838\Yishay <[email protected]> AuthorDate: Wed Mar 11 15:57:29 2020 +0200 Move function one level up so DataGridColumn enjoys it too --- .../AdvancedDataGridColumn.as | 43 ---------------------- .../mx/controls/dataGridClasses/DataGridColumn.as | 42 +++++++++++++++++++++ 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as index d485244..6fd66d9 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as @@ -1120,49 +1120,6 @@ public class AdvancedDataGridColumn extends DataGridColumn //---------------------------------- - // wordWrap - //---------------------------------- - - /** - * @private - * Storage for the wordWrap property. - */ - private var _wordWrap:*; - - [Inspectable(category="Advanced")] - - /** - * Set to <code>false</code> to wrap the text in a row of this column - * because it does not fit on one line - * If <code>undefined</code>, the AdvancedDataGrid control's <code>wordWrap</code> property - * is used. - * - * @default undefined - * - * @langversion 3.0 - * @playerversion Flash 9 - * @playerversion AIR 1.1 - * @productversion Royale 0.9.3 - */ - public function get wordWrap():* - { - return _wordWrap; - } - - /** - * @private - */ - public function set wordWrap(value:*):void - { - _wordWrap = value; - - /* if (owner) - { - owner.invalidateList(); - } */ - } - - //---------------------------------- // styleFunction //---------------------------------- diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as index 945f5c5..e9509c4 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as @@ -511,6 +511,48 @@ public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGr trace("textAlign not implemented"); } + //---------------------------------- + // wordWrap + //---------------------------------- + + /** + * @private + * Storage for the wordWrap property. + */ + private var _wordWrap:*; + + [Inspectable(category="Advanced")] + + /** + * Set to <code>false</code> to wrap the text in a row of this column + * because it does not fit on one line + * If <code>undefined</code>, the AdvancedDataGrid control's <code>wordWrap</code> property + * is used. + * + * @default undefined + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Royale 0.9.3 + */ + public function get wordWrap():* + { + return _wordWrap; + } + + /** + * @private + */ + public function set wordWrap(value:*):void + { + _wordWrap = value; + + /* if (owner) + { + owner.invalidateList(); + } */ + } public var sortDescending:Boolean = false;
