You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/09/10 02:26:24 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33722 FLEX-33705 Stop DG RTE

Updated Branches:
  refs/heads/develop 3188f0141 -> b05e4c8c6


FLEX-33722 FLEX-33705 Stop DG RTE


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7c22295e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7c22295e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7c22295e

Branch: refs/heads/develop
Commit: 7c22295e5fbeebb202d386503c838bc47741f62b
Parents: 0a8f84d
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Sep 10 10:25:09 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Sep 10 10:25:09 2013 +1000

----------------------------------------------------------------------
 .../spark/src/spark/components/gridClasses/DataGridDragProxy.as | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7c22295e/frameworks/projects/spark/src/spark/components/gridClasses/DataGridDragProxy.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridDragProxy.as b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridDragProxy.as
index 6a23266..18e2505 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridDragProxy.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridDragProxy.as
@@ -147,6 +147,7 @@ public class DataGridDragProxy extends Group
                 IStyleClient(clone).styleName = DataGrid(owner);
                 
                 IDataRenderer(clone).data = data;
+                clone.column = column;
                 clone.visible = true;
                 
                 
@@ -195,10 +196,10 @@ public class DataGridDragProxy extends Group
             o.visible = true;
             measuredHeight = o.y + o.height;
             measuredWidth = totalColumnWidth;
-            
+        
+			o.validateNow();
         }
         
-        o.validateNow();
         invalidateDisplayList();
     }
     


[2/2] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop

Posted by jm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b05e4c8c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b05e4c8c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b05e4c8c

Branch: refs/heads/develop
Commit: b05e4c8c675767194b3d86ada41b7ac90177fcab
Parents: 7c22295 3188f01
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Sep 10 10:25:26 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Sep 10 10:25:26 2013 +1000

----------------------------------------------------------------------
 .../framework/src/mx/collections/ISortField.as  |  30 +++++
 .../framework/src/mx/collections/SortField.as   | 117 +++++++++++++++++-
 .../src/mx/collections/SortFieldCompareTypes.as | 118 ++++++++++++++++++
 .../projects/mx/src/mx/controls/DataGrid.as     |   3 +
 .../controls/dataGridClasses/DataGridColumn.as  |  37 ++++++
 .../spark/src/spark/collections/SortField.as    | 119 ++++++++++++++++++-
 .../spark/collections/SortFieldCompareTypes.as  | 119 +++++++++++++++++++
 .../spark/components/gridClasses/GridColumn.as  |  43 ++++++-
 8 files changed, 582 insertions(+), 4 deletions(-)
----------------------------------------------------------------------