FLEX-35280 FLEX-35260 Recent changes to FLEX-35267 made it so that the y value in GridHeaderViewLayout.getHeaderIndexAt() started to be considered, when before it was simply ignored. But one caller of this function, GridColumnHeaderGroup.eventToHeaderLocations(), simply used '0' for that argument, instead of the real value, knowing that (before these changes) it wasn't being considered. Now the real value is used.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/60ccf24c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/60ccf24c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/60ccf24c Branch: refs/heads/master Commit: 60ccf24cbd641fcac30e27215156e65d4cb0e923 Parents: 7d3073b Author: Mihai Chira <mih...@apache.org> Authored: Wed Apr 12 13:34:54 2017 +0200 Committer: Mihai Chira <mih...@apache.org> Committed: Wed Apr 12 13:34:54 2017 +0200 ---------------------------------------------------------------------- .../projects/spark/src/spark/components/GridColumnHeaderGroup.as | 2 +- .../spark/src/spark/components/gridClasses/GridColumnHeaderView.as | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/60ccf24c/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as index 02f3aac..3d51fd8 100644 --- a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as +++ b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as @@ -1050,7 +1050,7 @@ public class GridColumnHeaderGroup extends Group implements IDataGridElement const separatorIndex:int = viewLayout.getSeparatorIndexAt(viewXY.x, 0); headerCP.rowIndex = (separatorIndex != -1) ? separatorIndex + gdv.viewColumnIndex : -1; - headerCP.columnIndex = (separatorIndex == -1) ? viewLayout.getHeaderIndexAt(viewXY.x, 0) + gdv.viewColumnIndex : -1; + headerCP.columnIndex = (separatorIndex == -1) ? viewLayout.getHeaderIndexAt(viewXY.x, viewXY.y) + gdv.viewColumnIndex : -1; headerXY.x = viewXY.x + gdv.viewOriginX; headerXY.y = viewXY.y; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/60ccf24c/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as index a836462..aecb7c2 100644 --- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as +++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as @@ -120,7 +120,6 @@ public class GridColumnHeaderView extends Group origin.x -= width; origin.y += verticalScrollPosition; - var headerViewContainsGlobalCoordinates:Boolean = (stageX >= origin.x) && (stageY >= origin.y) && (stageX < (origin.x + width)) && (stageY < (origin.y + height));
