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

Prevent double-rendering borders for PushButton-annotations (PR 14083 follow-up)

Browse Source 
With ResetForm-action support added in PR 14083, there's a regression in the `issue12716` test-case. More specifically the border around the "Clear Form"-link is now rendered *twice*, once in the canvas via the appearance-stream and once in the annotationLayer via the border-data.
This looks slightly weird, and was most likely not intended, which is why this patch suggests that we ignore the border in the annotationLayer when an appearance-stream exists.
This commit is contained in:
Jonas Jenwald 2021-10-21 13:31:16 +02:00
parent 7c9e5781fe
commit 044197808a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/display/annotation_layer.js
View File

@ -421,7 +421,7 @@ class AnnotationElement {
} }
class LinkAnnotationElement extends AnnotationElement { class LinkAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters, options = null) {
const isRenderable = !!( const isRenderable = !!(
parameters.data.url || parameters.data.url ||
parameters.data.dest || parameters.data.dest ||
@ -433,7 +433,11 @@ class LinkAnnotationElement extends AnnotationElement {
parameters.data.actions["Mouse Up"] || parameters.data.actions["Mouse Up"] ||
parameters.data.actions["Mouse Down"])) parameters.data.actions["Mouse Down"]))
); );
super(parameters, { isRenderable, createQuadrilaterals: true }); super(parameters, {
isRenderable,
ignoreBorder: !!options?.ignoreBorder,
createQuadrilaterals: true,
});
} }
render() { render() {
@ -1298,6 +1302,10 @@ class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
} }
class PushButtonWidgetAnnotationElement extends LinkAnnotationElement { class PushButtonWidgetAnnotationElement extends LinkAnnotationElement {
constructor(parameters) {
super(parameters, { ignoreBorder: parameters.data.hasAppearance });
}
render() { render() {
// The rendering and functionality of a push button widget annotation is // The rendering and functionality of a push button widget annotation is
// equal to that of a link annotation, but may have more functionality, such // equal to that of a link annotation, but may have more functionality, such