X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/6a7e4474cba9d8be4b2ec445e10f1691f7277c50..b37ceabb82336ee82757cd32efe353cfab8ec267:/src/widgets/grid/GridView.js diff --git a/src/widgets/grid/GridView.js b/src/widgets/grid/GridView.js index eabb4876..83429985 100644 --- a/src/widgets/grid/GridView.js +++ b/src/widgets/grid/GridView.js @@ -1,5 +1,5 @@ /*! - * Ext JS Library 3.2.0 + * Ext JS Library 3.2.2 * Copyright(c) 2006-2010 Ext JS, Inc. * licensing@extjs.com * http://www.extjs.com/license @@ -1272,12 +1272,13 @@ viewConfig: { var width = 0; var w; for (i = 0; i < colCount; i++){ - if(!cm.isHidden(i) && !cm.isFixed(i) && i !== omitColumn){ + if(!cm.isFixed(i) && i !== omitColumn){ w = cm.getColumnWidth(i); - cols.push(i); - extraCol = i; - cols.push(w); - width += w; + cols.push(i, w); + if(!cm.isHidden(i)){ + extraCol = i; + width += w; + } } } var frac = (aw - cm.getTotalWidth())/width; @@ -1957,7 +1958,7 @@ Ext.grid.GridView.SplitDragZone = Ext.extend(Ext.dd.DDProxy, { if(t && this.allowHeaderDrag(e)){ var xy = this.view.fly(t).getXY(), x = xy[0], - y = xy[1]; + y = xy[1], exy = e.getXY(), ex = exy[0], w = t.offsetWidth, adjust = false;