This is an automated email from the ASF dual-hosted git repository.
gregdove 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 4762ad1676 Quick fix for supporting the 'sortableColumns=false' option
for mx dataGrids
4762ad1676 is described below
commit 4762ad167648e204496d0742749a9eefcf752743
Author: greg-dove <[email protected]>
AuthorDate: Fri Jul 15 15:35:42 2022 +1200
Quick fix for supporting the 'sortableColumns=false' option for mx dataGrids
---
.../src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as | 1 +
.../MXRoyale/src/main/royale/mx/controls/beads/DataGridSortBead.as | 1 +
2 files changed, 2 insertions(+)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
index 2e629cd8a2..b519f17d67 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
@@ -57,6 +57,7 @@ package mx.controls.beads
*/
private function mouseClickHandler(event:MouseEvent):void
{
+ if (!adg.sortableColumns) return; //bail early
var buttonBar:DataGridButtonBar = ((adg.view as
DataGridView).header as DataGridButtonBar);
// probably down on one button and up on another button
// so the ButtonBar won't change selection
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridSortBead.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridSortBead.as
index d27de15bdb..c67f62e141 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridSortBead.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridSortBead.as
@@ -64,6 +64,7 @@ package mx.controls.beads
*/
private function mouseClickHandler(event:MouseEvent):void
{
+ if (!dg.sortableColumns) return; //bail early
var dgView:DataGridView = dg.view as DataGridView;
var buttonBar:DataGridButtonBar = (dgView.header as
DataGridButtonBar);
// probably down on one button and up on another button
