Changeset 14040

Timestamp:

06/17/08 15:36:58 (5 months ago)

Author:

toonetown

Message:

Fixes #6593 - allow the scrollbox to have overflow:auto instead of overflow:scroll (to hide scrollbars when not used) !strict

Location:

dojox/trunk/grid

Files:

• resources/Grid.css (modified) (1 diff)
• resources/nihiloGrid.css (modified) (1 diff)
• resources/soriaGrid.css (modified) (1 diff)
• resources/tundraGrid.css (modified) (1 diff)
• _View.js (modified) (3 diffs)
• _ViewManager.js (modified) (1 diff)

dojox/trunk/grid/resources/Grid.css

@@ -87 +87 @@
 .dojoxGrid-scrollbox {
         position: relative;
-        overflow: scroll;
+        overflow: auto;
         background-color: white;
         width: 100%;

dojox/trunk/grid/resources/nihiloGrid.css

@@ -91 +91 @@
 .nihilo .dojoxGrid-scrollbox {
         position: relative;
-        overflow: scroll;
+        overflow: auto;
         background-color: #fefefe;
         width: 100%;

dojox/trunk/grid/resources/soriaGrid.css

@@ -91 +91 @@
 .soria .dojoxGrid-scrollbox {
         position: relative;
-        overflow: scroll;
+        overflow: auto;
         background-color: #fefefe;
         width: 100%;

dojox/trunk/grid/resources/tundraGrid.css

@@ -80 +80 @@
 .tundra .dojoxGrid-scrollbox {
         position: relative;
-        overflow: scroll;
+        overflow: auto;
         background-color: #fefefe;
         width: 100%;

dojox/trunk/grid/_View.js

@@ -739 +739 @@
 
                 getScrollbarWidth: function(){
-                        return (this.noscroll ? 0 : dojox.html.metrics.getScrollbar().w); // Integer
+                        return (this.noscroll || !this.hasVScrollbar() ? 0 : dojox.html.metrics.getScrollbar().w); // Integer
                 },
 
@@ -851 +851 @@
                 },
 
-                hasScrollbar: function(){
-                        return (this.scrollboxNode.clientHeight != this.scrollboxNode.offsetHeight); // Boolean
-                },
-
+                hasHScrollbar: function(reset){
+                        if(this._hasHScroll == undefined || reset){
+                                this._hasHScroll = (this.scrollboxNode.offsetWidth < this.contentNode.offsetWidth);
+                        }
+                        return this._hasHScroll; // Boolean
+                },
+
+                hasVScrollbar: function(reset){
+                        if(this._hasVScroll == undefined || reset){
+                                this._hasVScroll = (this.scrollboxNode.offsetHeight < this.contentNode.offsetHeight);
+                        }
+                        return this._hasVScroll; // Boolean
+                },
+                
                 adaptHeight: function(){
                         if(!this.grid.autoHeight){
                                 var h = this.domNode.clientHeight;
-                                if(!this.hasScrollbar()){ // no scrollbar is rendered
-                                        h -= dojox.html.metrics.getScrollbar().w;
-                                }
                                 dojox.grid.util.setStyleHeightPx(this.scrollboxNode, h);
                         }
+                        this.hasVScrollbar(true);
                 },
 
@@ -880 +888 @@
                                 this._removingColumn = false;
                         }
-
                         var cn = this.contentNode;
-                        cn.style.width = '';
-                        cn.offsetWidth;
                         cn.style.width = w;
+                        this.hasHScrollbar(true);
                 },
 

dojox/trunk/grid/_ViewManager.js

@@ -263 +263 @@
                 // summary: Returns the first grid view with a scroll bar 
                 for(var i=0, v; (v=this.views[i]); i++){
-                        if(v.hasScrollbar()){
+                        if(v.hasHScrollbar() || v.hasVScrollbar()){
                                 return v;
                         }