[richfaces-svn-commits] JBoss Rich Faces SVN: r2969 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.

[richfaces-svn-commits at lists.jboss.org]

Author: konstantin.mishin
Date: 2007-09-17 14:57:02 -0400 (Mon, 17 Sep 2007)
New Revision: 2969

Modified:
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
Log:
RF-892

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-09-17 17:42:05 UTC (rev 2968)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-09-17 18:57:02 UTC (rev 2969)
@@ -62,6 +62,7 @@
 		this.setHeight(this.defaultHeight);
 		this.setWidth(this.defaultWidth);
 		this.controlCreated = true;
+		this.agjustSeparators();
 	},
 	parseTemplate: function(template) {
 		if(!template) {
@@ -232,8 +233,6 @@
 			this.defaultHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
 		}
 
-		this.agjustSeparators();
-		
 		this.frozenSubstrate = new ClientUI.common.box.Box(this.gridId + ":hs", this.getElement());
 		this.frozenSubstrate.getElement().name = this.getElement().id + "HRFrm";
 		this.frozenSubstrate.setHeight(this.headerRow.getHeight());
@@ -250,18 +249,20 @@
 		return details;
 	},
 	agjustSeparators: function() {
-		var offset = 0;
 		var i=0;
-		var cells = this.headerFrozenRow.getElement().rows[0].cells;
-		var length = cells.length;
+		var fcells = this.headerFrozenRow.getElement().rows[0].cells;
+		var ncells = this.headerRow.getElement().rows[0].cells;
+		var length = fcells.length;
+		var delta = 4;
+		if (ncells[0].offsetWidth == ncells[0].clientWidth) {
+			delta--;
+		}
 		for(var j=0; j<length; i++,j++) {
-			this._columns[i].sep.moveToX(cells[j].offsetLeft + cells[j].offsetWidth - 4);
+			this._columns[i].sep.moveToX(fcells[j].offsetLeft + fcells[j].offsetWidth - delta);
 		}
-		offset = 0;
-		var cells = this.headerRow.getElement().rows[0].cells;
-		var length = cells.length - 1;
+		var length = ncells.length - 1;
 		for(var j=0; j<length; i++,j++) {
-			this._columns[i].sep.moveToX(cells[j].offsetLeft + cells[j].offsetWidth - 4);
+			this._columns[i].sep.moveToX(ncells[j].offsetLeft + ncells[j].offsetWidth - delta);
 		}
 	},
 	updateSize: function() {