Merge pull request #14174 from Snuffleupagus/PushButton-double-border
Prevent double-rendering borders for PushButton-annotations (PR 14083 follow-up)
This commit is contained in:
commit
e4e44121d2
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user