Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13712 from Snuffleupagus/checkDimensions-bbox

Browse Source 
XFA - Always compute the transformed BBox values in `checkDimensions` (PR 13691 follow-up)
This commit is contained in:
Jonas Jenwald 2021-07-10 13:27:16 +02:00 committed by GitHub
commit 16759bf390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/xfa/layout.js
View File

@ -191,8 +191,7 @@ function getAvailableSpace(node) {
} }
function getTransformedBBox(node) { function getTransformedBBox(node) {
// Take into account rotation and anchor the get the // Take into account rotation and anchor to get the real bounding box.
// real bounding box.
let w = node.w === "" ? NaN : node.w; let w = node.w === "" ? NaN : node.w;
let h = node.h === "" ? NaN : node.h; let h = node.h === "" ? NaN : node.h;
let [centerX, centerY] = [0, 0]; let [centerX, centerY] = [0, 0];
@ -223,8 +222,7 @@ function getTransformedBBox(node) {
break; break;
} }
let x; let x, y;
let y;
switch (node.rotate || 0) { switch (node.rotate || 0) {
case 0: case 0:
[x, y] = [-centerX, -centerY]; [x, y] = [-centerX, -centerY];
@ -268,14 +266,11 @@ function checkDimensions(node, space) {
const ERROR = 2; const ERROR = 2;
const parent = node[$getSubformParent](); const parent = node[$getSubformParent]();
const attempt = (parent[$extra] && parent[$extra].attempt) || 0; const attempt = (parent[$extra] && parent[$extra].attempt) || 0;
let y, w, h;
const [, y, w, h] = getTransformedBBox(node);
switch (parent.layout) { switch (parent.layout) {
case "lr-tb": case "lr-tb":
case "rl-tb": case "rl-tb":
if (node.w !== "" || node.h !== "") {
[, , w, h] = getTransformedBBox(node);
}
if (attempt === 0) { if (attempt === 0) {
// Try to put an element in the line. // Try to put an element in the line.
@ -330,11 +325,9 @@ function checkDimensions(node, space) {
return true; return true;
} }
// If the node has a height then check // If the node has a height then check if it's fine with available height.
// if it's fine with available height. If the node // If the node is breakable then we can return true.
// is breakable then we can return true.
if (node.h !== "" && !node[$isSplittable]()) { if (node.h !== "" && !node[$isSplittable]()) {
[, , , h] = getTransformedBBox(node);
return Math.round(h - space.height) <= ERROR; return Math.round(h - space.height) <= ERROR;
} }
// Else wait and see: this node will be layed out itself // Else wait and see: this node will be layed out itself
@ -354,7 +347,6 @@ function checkDimensions(node, space) {
return true; return true;
} }
[, y, , h] = getTransformedBBox(node);
if (node.h === "" || Math.round(h + y - space.height) <= ERROR) { if (node.h === "" || Math.round(h + y - space.height) <= ERROR) {
return true; return true;
} }
@ -368,7 +360,6 @@ function checkDimensions(node, space) {
} }
if (node.h !== "") { if (node.h !== "") {
[, , , h] = getTransformedBBox(node);
return Math.round(h - space.height) <= ERROR; return Math.round(h - space.height) <= ERROR;
} }
return true; return true;