Merge branch 'master' of github.com:6pac/SlickGrid

6pac · 6pac · commit d0a9b3a42f4e · 2017-11-12T21:23:49.000+09:30
diff --git a/slick.grid.css b/slick.grid.css
@@ -12,6 +12,10 @@ classes should alter those!
   border-left: 0px !important;
 }
 
+.slick-header.ui-state-default {
+  overflow: inherit;
+}
+
 .slick-header::-webkit-scrollbar,  .slick-headerrow::-webkit-scrollbar, .slick-footerrow::-webkit-scrollbar {
   display: none
 }
diff --git a/slick.grid.js b/slick.grid.js
@@ -502,7 +502,7 @@ if (typeof Slick === "undefined") {
     }
 
     function getHeadersWidth() {
-      var headersWidth = getColumnTotalWidth(true);
+      var headersWidth = getColumnTotalWidth(!options.autoHeight);
       return Math.max(headersWidth, viewportW) + 1000;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ classes should alter those!`
`12`	`12`	`border-left: 0px !important;`
`13`	`13`	`}`
`14`	`14`
	`15`	`+.slick-header.ui-state-default {`
	`16`	`+ overflow: inherit;`
	`17`	`+}`
	`18`	`+`
`15`	`19`	`.slick-header::-webkit-scrollbar, .slick-headerrow::-webkit-scrollbar, .slick-footerrow::-webkit-scrollbar {`
`16`	`20`	`display: none`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ if (typeof Slick === "undefined") {`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`function getHeadersWidth() {`
`505`		`- var headersWidth = getColumnTotalWidth(true);`
	`505`	`+ var headersWidth = getColumnTotalWidth(!options.autoHeight);`
`506`	`506`	`return Math.max(headersWidth, viewportW) + 1000;`
`507`	`507`	`}`
`508`	`508`