Merge branch 'issue1359' into develop. Issue #1359.
This commit is contained in:
commit
24a6cf7c25
|
@ -2119,6 +2119,7 @@
|
||||||
bbox[i] = this.CHTMLbboxFor(i); bbox[i].x = bbox[i].y = 0;
|
bbox[i] = this.CHTMLbboxFor(i); bbox[i].x = bbox[i].y = 0;
|
||||||
if (this.data[i]) bbox[i].stretch = this.data[i].CHTMLcanStretch("Horizontal");
|
if (this.data[i]) bbox[i].stretch = this.data[i].CHTMLcanStretch("Horizontal");
|
||||||
scale = (i === this.base ? 1 : bbox[i].rscale);
|
scale = (i === this.base ? 1 : bbox[i].rscale);
|
||||||
|
if (i !== this.base) {delete bbox[i].L; delete bbox[i].R} // these are overriden by CSS
|
||||||
W = Math.max(W,scale*(bbox[i].w + (bbox[i].L||0) + (bbox[i].R||0)));
|
W = Math.max(W,scale*(bbox[i].w + (bbox[i].L||0) + (bbox[i].R||0)));
|
||||||
if (!bbox[i].stretch && W > w) w = W;
|
if (!bbox[i].stretch && W > w) w = W;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user