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 912c287 try to improve column resizing. Should fix #694
912c287 is described below
commit 912c287ab9e02806860da6f4a16dcf1e1cb79740
Author: Alex Harui <[email protected]>
AuthorDate: Thu Jan 23 14:28:37 2020 -0800
try to improve column resizing. Should fix #694
---
.../AdvancedDataGridColumn.as | 45 ----------------------
.../mx/controls/beads/DataGridColumnResizeBead.as | 4 ++
.../mx/controls/dataGridClasses/DataGridColumn.as | 41 ++++++++++++++++++++
3 files changed, 45 insertions(+), 45 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 88aa2bf..79f0dd0 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
@@ -879,51 +879,6 @@ public class AdvancedDataGridColumn extends DataGridColumn
//----------------------------------
- // minWidth
- //----------------------------------
-
- /**
- * @private
- * Storage for the minWidth property.
- */
- private var _minWidth:Number = 20;
-
- [Bindable("minWidthChanged")]
- [Inspectable(category="General", defaultValue="100")]
-
- /**
- * The minimum width of the column, in pixels.
- * @default 20
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Royale 0.9.3
- */
- public function get minWidth():Number
- {
- return _minWidth;
- }
-
- /**
- * @private
- */
- public function set minWidth(value:Number):void
- {
- _minWidth = value;
-
- /* if (owner)
- {
- owner.invalidateList();
- }
-
- if (_width < value)
- _width = value;
-
- dispatchEvent(new Event("minWidthChanged")); */
- }
-
- //----------------------------------
// resizable
//----------------------------------
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
index 8f0ea82..3920e06 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
@@ -341,6 +341,10 @@ package mx.controls.beads
{
columns[i].width = columns[i].columnWidth;
}
+ if (columns[columnIndex].width + deltaWidth <
columns[columnIndex].minWidth)
+ {
+ deltaWidth = columns[columnIndex].minWidth -
columns[columnIndex].width;
+ }
columns[columnIndex].width += deltaWidth;
columns[columnIndex].columnWidth += deltaWidth;
if (adg.horizontalScrollPolicy == ScrollPolicy.OFF)
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 fd6f4a5..246beaa 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
@@ -398,6 +398,47 @@ public class DataGridColumn extends
org.apache.royale.html.supportClasses.DataGr
// otherwise, just store the size
_width = value;
}
+
+ //----------------------------------
+ // minWidth
+ //----------------------------------
+
+ /**
+ * @private
+ * Storage for the width property.
+ */
+ private var _minWidth:Number = 20;
+
+ [Inspectable(category="General", defaultValue="20")]
+
+ /**
+ * The width of the column, in pixels.
+ * If the DataGrid's <code>horizontalScrollPolicy</code> property
+ * is <code>false</code>, all visible columns must fit in the displayable
+ * area, and the DataGrid will not always honor the width of
+ * the columns if the total width of the columns is too
+ * small or too large for the displayable area.
+ *
+ * @default 100
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function get minWidth():Number
+ {
+ return _minWidth;
+ }
+
+ /**
+ * @private
+ */
+ public function set minWidth(value:Number):void
+ {
+ _minWidth = value;
+ }
+
public var sortDescending:Boolean = false;
