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

Merge pull request #13593 from calixteman/xfa_rect_border

Browse Source 
XFA - Don't display invisible rectangle borders
This commit is contained in:
calixteman 2021-06-21 12:24:23 +02:00 committed by GitHub
commit 34acf29403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/xfa/template.js
View File

@ -182,7 +182,9 @@ class Arc extends XFAObject {
} else { } else {
style.fill = "transparent"; style.fill = "transparent";
} }
style.strokeWidth = measureToString(Math.round(edge.thickness)); style.strokeWidth = measureToString(
edge.presence === "visible" ? Math.round(edge.thickness) : 0
);
style.stroke = edgeStyle.color; style.stroke = edgeStyle.color;
let arc; let arc;
const attributes = { const attributes = {
@ -2957,16 +2959,18 @@ class Line extends XFAObject {
const edge = this.edge ? this.edge : new Edge({}); const edge = this.edge ? this.edge : new Edge({});
const edgeStyle = edge[$toStyle](); const edgeStyle = edge[$toStyle]();
const style = Object.create(null); const style = Object.create(null);
style.strokeWidth = measureToString(Math.round(edge.thickness)); const thickness =
edge.presence === "visible" ? Math.round(edge.thickness) : 0;
style.strokeWidth = measureToString(thickness);
style.stroke = edgeStyle.color; style.stroke = edgeStyle.color;
let x1, y1, x2, y2; let x1, y1, x2, y2;
let width = "100%"; let width = "100%";
let height = "100%"; let height = "100%";
if (parent.w <= edge.thickness) { if (parent.w <= thickness) {
[x1, y1, x2, y2] = ["50%", 0, "50%", "100%"]; [x1, y1, x2, y2] = ["50%", 0, "50%", "100%"];
width = style.strokeWidth; width = style.strokeWidth;
} else if (parent.h <= edge.thickness) { } else if (parent.h <= thickness) {
[x1, y1, x2, y2] = [0, "50%", "100%", "50%"]; [x1, y1, x2, y2] = [0, "50%", "100%", "50%"];
height = style.strokeWidth; height = style.strokeWidth;
} else { } else {
@ -3807,7 +3811,9 @@ class Rectangle extends XFAObject {
} else { } else {
style.fill = "transparent"; style.fill = "transparent";
} }
style.strokeWidth = measureToString(2 * edge.thickness); style.strokeWidth = measureToString(
edge.presence === "visible" ? 2 * edge.thickness : 0
);
style.stroke = edgeStyle.color; style.stroke = edgeStyle.color;
const corner = this.corner.children.length const corner = this.corner.children.length