Upgrade to ExtJS 3.1.1 - Released 02/08/2010

[extjs.git] / src / widgets / list / ColumnResizer.js

diff --git a/src/widgets/list/ColumnResizer.js b/src/widgets/list/ColumnResizer.js
index 45bffe2..e3b1531 100644 (file)
--- a/src/widgets/list/ColumnResizer.js
+++ b/src/widgets/list/ColumnResizer.js
@@ -1,17 +1,17 @@
 /*!
- * Ext JS Library 3.0.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
 /**\r
- * @class Ext.ListView.ColumnResizer\r
+ * @class Ext.list.ColumnResizer\r
  * @extends Ext.util.Observable\r
- * <p>Supporting Class for Ext.ListView.</p>\r
+ * <p>Supporting Class for Ext.list.ListView</p>\r
  * @constructor\r
  * @param {Object} config\r
  */\r
-Ext.ListView.ColumnResizer = Ext.extend(Ext.util.Observable, {\r
+Ext.list.ColumnResizer = Ext.extend(Ext.util.Observable, {\r
     /**\r
      * @cfg {Number} minPct The minimum percentage to allot for any column (defaults to <tt>.05</tt>)\r
      */\r
@@ -19,7 +19,7 @@ Ext.ListView.ColumnResizer = Ext.extend(Ext.util.Observable, {
 \r
     constructor: function(config){\r
         Ext.apply(this, config);\r
-        Ext.ListView.ColumnResizer.superclass.constructor.call(this);\r
+        Ext.list.ColumnResizer.superclass.constructor.call(this);\r
     },\r
     init : function(listView){\r
         this.view = listView;\r
@@ -41,20 +41,20 @@ Ext.ListView.ColumnResizer = Ext.extend(Ext.util.Observable, {
     },\r
 \r
     handleHdMove : function(e, t){\r
-        var hw = 5;\r
-        var x = e.getPageX();\r
-        var hd = e.getTarget('em', 3, true);\r
+        var hw = 5,\r
+            x = e.getPageX(),\r
+            hd = e.getTarget('em', 3, true);\r
         if(hd){\r
-            var r = hd.getRegion();\r
-            var ss = hd.dom.style;\r
-            var pn = hd.dom.parentNode;\r
+            var r = hd.getRegion(),\r
+                ss = hd.dom.style,\r
+                pn = hd.dom.parentNode;\r
 \r
             if(x - r.left <= hw && pn != pn.parentNode.firstChild){\r
                 this.activeHd = Ext.get(pn.previousSibling.firstChild);\r
-                               ss.cursor = Ext.isWebKit ? 'e-resize' : 'col-resize';\r
+                ss.cursor = Ext.isWebKit ? 'e-resize' : 'col-resize';\r
             } else if(r.right - x <= hw && pn != pn.parentNode.lastChild.previousSibling){\r
                 this.activeHd = hd;\r
-                               ss.cursor = Ext.isWebKit ? 'w-resize' : 'col-resize';\r
+                ss.cursor = Ext.isWebKit ? 'w-resize' : 'col-resize';\r
             } else{\r
                 delete this.activeHd;\r
                 ss.cursor = '';\r
@@ -72,8 +72,8 @@ Ext.ListView.ColumnResizer = Ext.extend(Ext.util.Observable, {
         this.proxy = this.view.el.createChild({cls:'x-list-resizer'});\r
         this.proxy.setHeight(this.view.el.getHeight());\r
 \r
-        var x = this.tracker.getXY()[0];\r
-        var w = this.view.innerHd.getWidth();\r
+        var x = this.tracker.getXY()[0],\r
+            w = this.view.innerHd.getWidth();\r
 \r
         this.hdX = this.dragHd.getX();\r
         this.hdIndex = this.view.findHeaderIndex(this.dragHd);\r
@@ -91,33 +91,39 @@ Ext.ListView.ColumnResizer = Ext.extend(Ext.util.Observable, {
     },\r
 \r
     onEnd: function(e){\r
+        /* calculate desired width by measuring proxy and then remove it */\r
         var nw = this.proxy.getWidth();\r
         this.proxy.remove();\r
 \r
-        var index = this.hdIndex;\r
-        var vw = this.view, cs = vw.columns, len = cs.length;\r
-        var w = this.view.innerHd.getWidth(), minPct = this.minPct * 100;\r
-\r
-        var pct = Math.ceil((nw*100) / w);\r
-        var diff = cs[index].width - pct;\r
-        var each = Math.floor(diff / (len-1-index));\r
-        var mod = diff - (each * (len-1-index));\r
+        var index = this.hdIndex,\r
+            vw = this.view,\r
+            cs = vw.columns,\r
+            len = cs.length,\r
+            w = this.view.innerHd.getWidth(),\r
+            minPct = this.minPct * 100,\r
+            pct = Math.ceil((nw * vw.maxWidth) / w),\r
+            diff = (cs[index].width * 100) - pct,\r
+            each = Math.floor(diff / (len-1-index)),\r
+            mod = diff - (each * (len-1-index));\r
 \r
         for(var i = index+1; i < len; i++){\r
-            var cw = cs[i].width + each;\r
-            var ncw = Math.max(minPct, cw);\r
+            var cw = (cs[i].width * 100) + each,\r
+                ncw = Math.max(minPct, cw);\r
             if(cw != ncw){\r
                 mod += cw - ncw;\r
             }\r
-            cs[i].width = ncw;\r
+            cs[i].width = ncw / 100;\r
         }\r
-        cs[index].width = pct;\r
-        cs[index+1].width += mod;\r
+        cs[index].width = pct / 100;\r
+        cs[index+1].width += (mod / 100);\r
         delete this.dragHd;\r
-        this.view.setHdWidths();\r
-        this.view.refresh();\r
+        vw.setHdWidths();\r
+        vw.refresh();\r
         setTimeout(function(){\r
             vw.disableHeaders = false;\r
         }, 100);\r
     }\r
-});
\ No newline at end of file
+});\r
+\r
+// Backwards compatibility alias\r
+Ext.ListView.ColumnResizer = Ext.list.ColumnResizer;
\ No newline at end of file