flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1453607 - /flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
Date Wed, 06 Mar 2013 23:02:11 GMT
Author: cframpton
Date: Wed Mar  6 23:02:11 2013
New Revision: 1453607

URL: http://svn.apache.org/r1453607
Log:
Revert last change which shouldn't have been submitted.

Modified:
    flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as

Modified: flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as?rev=1453607&r1=1453606&r2=1453607&view=diff
==============================================================================
--- flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
(original)
+++ flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
Wed Mar  6 23:02:11 2013
@@ -34,7 +34,6 @@ import spark.components.Grid;
 import spark.components.GridColumnHeaderGroup;
 import spark.components.Group;
 import spark.components.supportClasses.GroupBase;
-import spark.core.NavigationUnit;
 import spark.layouts.supportClasses.LayoutBase;
 
 use namespace mx_internal;
@@ -381,11 +380,6 @@ public class GridHeaderViewLayout extend
         var visibleLeft:Number = 0;
         var visibleRight:Number = 0;
         
-        const dataGrid:DataGrid = grid.dataGrid;
-        const vsbVisible:Boolean =
-            (dataGrid && dataGrid.scroller && 
-             dataGrid.scroller.verticalScrollBar && dataGrid.scroller.verticalScrollBar.visible);
-        
         // This isn't quite as simple as: 
         //     for each (var columnIndex:int in visibleColumnIndices)
         // since the GridColumnHeaderGroup may be wider than the grid because it
@@ -430,19 +424,9 @@ public class GridHeaderViewLayout extend
 			var rendererX:Number = gridViewLayout.gridDimensionsView.getCellX(0, headerViewColumnIndex);
             var rendererWidth:Number = grid.getColumnWidth(columnIndex);
             
-            // If this is the last visible column and there is a visible vertical scroll
bar then
-            // adjust the width of the last visible column header so it includes the small
space 
-            // on top of the vertical scroll bar.
-
-            // ToDo: This needs more work. I'm not sure what the correct behavior should
be.  With
-            // the adjustment below the width of the last visible renderer seems to include
most of 
-            // the space over the sb but not all of it.  What is the correct width?
-            // The default header renderer will truncate the text if it doesn't fit in the
width.
-            // If we're scrolling horizontally to the right, and there are more columns to
the right 
-            // should the header be truncated or clipped if it doesn't all fit in the width?
-            if (isLastColumn && vsbVisible)
+			if (isLastColumn)
                 rendererWidth = horizontalScrollPosition + unscaledWidth - rendererX - 1;
// TODO: this is a temporary hack
-            
+			
             renderer.setLayoutBoundsSize(rendererWidth, rendererHeight);
             renderer.setLayoutBoundsPosition(rendererX, rendererY);
             
@@ -1055,4 +1039,5 @@ public class GridHeaderViewLayout extend
         gridColumnHeaderGroup.visibleSortIndicatorIndices = indices;
     }
 }
-}
\ No newline at end of file
+}
+



Mime
View raw message