This is an automated email from the ASF dual-hosted git repository.
alinakazi 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 84bf780 ColumnCount moved back to the base class "ListBase" removed
from subclasses
84bf780 is described below
commit 84bf78056dea6eca7ca65d48c4c844c23b7695ef
Author: alinakazi <alinakazi1...@gmail.com>
AuthorDate: Wed Feb 24 15:29:12 2021 +0500
ColumnCount moved back to the base class "ListBase" removed from subclasses
---
.../mx/controls/listClasses/AdvancedListBase.as | 68 +---------------------
.../mx/controls/listClasses/DataGridListBase.as | 65 ---------------------
.../royale/mx/controls/listClasses/ListBase.as | 59 +++++++++++++++++++
3 files changed, 60 insertions(+), 132 deletions(-)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
index 2b0ca5a..1822acb 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
@@ -1799,73 +1799,7 @@ public class AdvancedListBase extends ListBase
implements IFocusManagerComponent
_styleFunction = value;
}
-
- //----------------------------------
- // columnCount
- //----------------------------------
-
- /**
- * @private
- * Storage for the columnCount property.
- */
- private var _columnCount:int = -1;
-
- /**
- * The number of columns to be displayed in a TileList control or items
- * in a HorizontalList control.
- * For the data grids, specifies the number of visible columns.
- *
- * <p><b>Note</b>: Setting this property has no effect on a DataGrid
control,
- * which bases the number of columns on the control width and the
- * individual column widths.</p>
- *
- * @default 4
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- public function get columnCount():int
- {
- return _columnCount;
- }
-
- /**
- * @private
- */
- public function set columnCount(value:int):void
- {
- /* explicitColumnCount = value;
-
- if (_columnCount != value)
- {
- setColumnCount(value);
- columnCountChanged = true;
- invalidateProperties();
-
- invalidateSize();
- itemsSizeChanged = true;
- invalidateDisplayList();
-
- dispatchEvent(new Event("columnCountChanged"));
- } */
- }
-
- /**
- * Internal version for setting columnCount
- * without invalidation or notification.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- /* mx_internal function setColumnCount(value:int):void
- {
- _columnCount = value;
- } */
-
+
//----------------------------------
// data
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
index 33de8c5..88b2e26 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataGridListBase.as
@@ -1840,71 +1840,6 @@ public class DataGridListBase extends ListBase /*
extends UIComponent
}
- //----------------------------------
- // columnCount
- //----------------------------------
-
- /**
- * @private
- * Storage for the columnCount property.
- */
- private var _columnCount:int = -1;
-
- /**
- * The number of columns to be displayed in a TileList control or items
- * in a HorizontalList control.
- * For the data grids, specifies the number of visible columns.
- *
- * <p><b>Note</b>: Setting this property has no effect on a DataGrid
control,
- * which bases the number of columns on the control width and the
- * individual column widths.</p>
- *
- * @default 4
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- public function get columnCount():int
- {
- return _columnCount;
- }
-
- /**
- * @private
- */
- public function set columnCount(value:int):void
- {
- /* explicitColumnCount = value;
-
- if (_columnCount != value)
- {
- setColumnCount(value);
- columnCountChanged = true;
- invalidateProperties();
-
- invalidateSize();
- itemsSizeChanged = true;
- invalidateDisplayList();
-
- dispatchEvent(new Event("columnCountChanged"));
- } */
- }
-
- /**
- * Internal version for setting columnCount
- * without invalidation or notification.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.4
- */
- /* mx_internal function setColumnCount(value:int):void
- {
- _columnCount = value;
- } */
//----------------------------------
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 420a7c0..f57effc 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
@@ -1617,6 +1617,65 @@ use namespace mx_internal;
return " ";
}
+
+ //----------------------------------
+ // columnCount
+ //----------------------------------
+
+ /**
+ * @private
+ * Storage for the columnCount property.
+ */
+ private var _columnCount:int = -1;
+
+ /**
+ * @private
+ */
+ private var columnCountChanged:Boolean = true;
+
+ /**
+ * The number of columns to be displayed in a TileList control or items
+ * in a HorizontalList control.
+ * For the DataGrid it is the number of visible columns.
+ * <b>Note</b>: Setting this property has no effect on a DataGrid control,
+ * which bases the number of columns on the control width and the
+ * individual column widths.
+ *
+ * @default 4
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function get columnCount():int
+ {
+ return _columnCount;
+ }
+
+ /**
+ * @private
+ */
+ public function set columnCount(value:int):void
+ {
+ explicitColumnCount = value;
+
+ if (_columnCount != value)
+ {
+ _columnCount = value;
+ columnCountChanged = true;
+ invalidateProperties();
+
+ invalidateSize();
+ itemsSizeChanged = true;
+ invalidateDisplayList();
+
+ dispatchEvent(new Event("columnCountChanged"));
+ }
+ }
+
+
+
//----------------------------------
// dataTipField
//----------------------------------
