Commit 65e04393 authored by Alain Dumesny's avatar Alain Dumesny Committed by GitHub
Browse files

Merge branch 'develop' into 776_dist_remove

parents 83dc57d3 ff31cb7b
...@@ -1033,10 +1033,14 @@ ...@@ -1033,10 +1033,14 @@
return; return;
} }
var height = this.grid.getGridHeight(); var height = this.grid.getGridHeight();
var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight(); // check for css min height. Each row is cellHeight + verticalMargin, until last one which has no margin below
var cssMinHeight = parseInt(this.container.css('min-height'));
if (cssMinHeight > 0) {
var minHeight = (cssMinHeight + this.opts.verticalMargin) / (this.cellHeight() + this.opts.verticalMargin);
if (height < minHeight) { if (height < minHeight) {
height = minHeight; height = minHeight;
} }
}
this.container.attr('data-gs-current-height', height); this.container.attr('data-gs-current-height', height);
if (!this.opts.cellHeight) { if (!this.opts.cellHeight) {
return ; return ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment