X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/7a654f8d43fdb43d78b63d90528bed6e86b608cc..f562e4c6e5fac7bcb445985b99acbea4d706e6f0:/src/grid/plugin/HeaderResizer.js?ds=sidebyside diff --git a/src/grid/plugin/HeaderResizer.js b/src/grid/plugin/HeaderResizer.js index 0b7b7df2..c76ef7bf 100644 --- a/src/grid/plugin/HeaderResizer.js +++ b/src/grid/plugin/HeaderResizer.js @@ -1,18 +1,29 @@ +/* + +This file is part of Ext JS 4 + +Copyright (c) 2011 Sencha Inc + +Contact: http://www.sencha.com/contact + +GNU General Public License Usage +This file may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file. Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html. + +If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact. + +*/ /** * @class Ext.grid.plugin.HeaderResizer * @extends Ext.util.Observable - * + * * Plugin to add header resizing functionality to a HeaderContainer. * Always resizing header to the left of the splitter you are resizing. - * - * Todo: Consider RTL support, columns would always calculate to the right of - * the splitter instead of to the left. */ Ext.define('Ext.grid.plugin.HeaderResizer', { extend: 'Ext.util.Observable', requires: ['Ext.dd.DragTracker', 'Ext.util.Region'], alias: 'plugin.gridheaderresizer', - + disabled: false, /** @@ -83,9 +94,10 @@ Ext.define('Ext.grid.plugin.HeaderResizer', { if (headerEl){ overHeader = Ext.getCmp(headerEl.id); - // On left edge, we are resizing the previous non-hidden, base level column. + // On left edge, go back to the previous non-hidden header. if (overHeader.isOnLeftEdge(e)) { - resizeHeader = overHeader.previousNode('gridcolumn:not([hidden]):not([isGroupHeader])'); + resizeHeader = overHeader.previousNode('gridcolumn:not([hidden])'); + } // Else, if on the right edge, we're resizing the column we are over else if (overHeader.isOnRightEdge(e)) { @@ -99,14 +111,15 @@ Ext.define('Ext.grid.plugin.HeaderResizer', { // We *are* resizing if (resizeHeader) { // If we're attempting to resize a group header, that cannot be resized, - // so find its last base level column header; Group headers are sized + // so find its last visible leaf header; Group headers are sized // by the size of their child headers. if (resizeHeader.isGroupHeader) { - resizeHeader = resizeHeader.getVisibleGridColumns(); - resizeHeader = resizeHeader[resizeHeader.length - 1]; + resizeHeader = resizeHeader.down(':not([isGroupHeader]):not([hidden]):last'); } - if (resizeHeader && !resizeHeader.fixed) { + // Check if the header is resizable. Continue checking the old "fixed" property, bug also + // check whether the resizablwe property is set to false. + if (resizeHeader && !(resizeHeader.fixed || (resizeHeader.resizable === false) || this.disabled)) { this.activeHd = resizeHeader; overHeader.el.dom.style.cursor = this.eResizeCursor; } @@ -236,42 +249,36 @@ Ext.define('Ext.grid.plugin.HeaderResizer', { delete dragHd.flex; } + this.headerCt.suspendLayout = true; + dragHd.setWidth(this.origWidth + offset[0], false); + + // In the case of forceFit, change the following Header width. + // Then apply the two width changes by laying out the owning HeaderContainer // If HeaderContainer is configured forceFit, inhibit upstream layout notification, so that // we can also shrink the following Header by an equal amount, and *then* inform the upstream layout. if (this.headerCt.forceFit) { nextHd = dragHd.nextNode('gridcolumn:not([hidden]):not([isGroupHeader])'); if (nextHd) { - this.headerCt.componentLayout.layoutBusy = true; + delete nextHd.flex; + nextHd.setWidth(nextHd.getWidth() - offset[0], false); } } - - // Non-flexed Headers may never be squeezed in the event of a shortfall so - // always set the minWidth to their current width. - dragHd.minWidth = this.origWidth + offset[0]; - dragHd.setWidth(dragHd.minWidth); - - // In the case of forceFit, change the following Header width. - // Then apply the two width changes by laying out the owning HeaderContainer - if (nextHd) { - delete nextHd.flex; - nextHd.setWidth(nextHd.getWidth() - offset[0]); - this.headerCt.componentLayout.layoutBusy = false; - this.headerCt.doComponentLayout(); - } + this.headerCt.suspendLayout = false; + this.headerCt.doComponentLayout(this.headerCt.getFullWidth()); } }, - + disable: function() { this.disabled = true; if (this.tracker) { this.tracker.disable(); } }, - + enable: function() { this.disabled = false; if (this.tracker) { this.tracker.enable(); } } -}); \ No newline at end of file +});