From 899fc29eefd9e36a503c1f47a7d0aca5a433da82 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 2 Aug 2022 13:50:40 +0200 Subject: [PATCH] Always set a border-radius for RadioButton annotations (issue 15262) --- src/display/annotation_layer.js | 3 +++ test/pdfs/.gitignore | 1 + test/pdfs/issue15262.pdf | Bin 0 -> 14788 bytes test/test_manifest.json | 7 +++++++ 4 files changed, 11 insertions(+) create mode 100644 test/pdfs/issue15262.pdf diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js index 7e3b4cfa8..d78c1801f 100644 --- a/src/display/annotation_layer.js +++ b/src/display/annotation_layer.js @@ -222,6 +222,9 @@ class AnnotationElement { if (horizontalRadius > 0 || verticalRadius > 0) { const radius = `calc(${horizontalRadius}px * var(--scale-factor)) / calc(${verticalRadius}px * var(--scale-factor))`; container.style.borderRadius = radius; + } else if (this instanceof RadioButtonWidgetAnnotationElement) { + const radius = `calc(${width}px * var(--scale-factor)) / calc(${height}px * var(--scale-factor))`; + container.style.borderRadius = radius; } switch (data.borderStyle.style) { diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore index 670715765..1b81cc0b2 100644 --- a/test/pdfs/.gitignore +++ b/test/pdfs/.gitignore @@ -481,6 +481,7 @@ !issue11442_reduced.pdf !issue11549_reduced.pdf !issue8097_reduced.pdf +!issue15262.pdf !bug1743245.pdf !quadpoints.pdf !transparent.pdf diff --git a/test/pdfs/issue15262.pdf b/test/pdfs/issue15262.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c261d6675cf3a702d1aac42308a9154ee7dde954 GIT binary patch literal 14788 zcmeHucUV)));H3ni-01Cp(_F@5J)f}Er9f1M1+t;2rU>wSE2i1FbE6-Y6HMv zprNNT7N}!wXFzn6lXD>wuqa1HI@_V=MjB3|DlFCVOt0jnIvYNnK3ym8D;MX0X+eh^ zITbRDyltnUDWDJd&{U(r0ayKWodOe$bTgxY%ip@2i0X1!fLVyguOlIfxlQj3@uH zwGiFRLH_)!W9en*8_kEEQ^E`Hn&#Acd>9gC3(JzP|aCm|2E%G+? z(fOnH8#R+}x|G)MuWS^V7G8dKsM^dzb{3lo)Rhr^cIPNViL%;6C*B7k)VOvDLeq>) zFu9v?u5s}KB-zkY*w-|8E!XIc|61oY5g|cARr51Q`#X9;Lj@Zv%`cN@!yxZ`7oKov z(brl)H8e`^DFdohHuSs=dbX!IG+{Piq4KQY=Kkw~ns zRB3z@+j##()Vr<>r~ZYO9+r`%ln{4^ZgY2#ZZ8jSNnR>q{Gukc-YciXY_^W5?S)k8 zFSZrkDs`p)pUZ`;aS_L*HTS(IW`ycSd5H~kiAygiM{m?#FAJhwnQE1fFsz&LML76# zPbf3M>p=JDdJjyX5`y01F$_|}H~sP4#Cv4sht*s8OUgMM83s&45?V^6$8Py@w}f7W zv)k!4RhKk zTquzVK#%QT{=aQo5Swfk(&@R!!9c1cE zo6YsitPL$hvelV7Z6@if8CrB#ThcGmlEvsPUL<3heoB2gW6Wa;)AgZl```vI_54Py z@`^FchIQK0VJ+eXM;oxTR3GM!J3dj?=a90#~ua=SH8=P#-d{ z{rsh$Xy7QRWMpyu`fBJi#}OZL@cnE08zbSeDbUqLG&ERrNJ}wRNvIvkavo9sU^wwq z3={P>9f<4^lEQ$I4(o*Zp$15$9gPBm{R7n^CH-5qKqW}31^!o>CBjG#p9y2xI*D*Q z<`v+_a@{z#Q^@FnjANFTOSNND00qTD&u{^F@WtjD*IUMMVtMXOmNJ_fyqtFngD72t z?|40e>9DNc4XTJ&l3Cz%um*)xrm#S6^4Up*l^NTs@DxwBOB=N1kDqw=aC*pp4O5BX zHnzwYc?Fg7IDE;k{V{SfXx14td9Z=MI^H{Ad}u&7Ej!P?yDzqHE|Ze!h~)wGA|smY zj`5CORv-Cn2B3yO^=Jq59CP7Vz`mY5CQJF7B8PcTGQ8)mVQjO~5eijEQOx{$vJ)-= zW6;m=3zKG?E>D+HlRwd%e@NEKd|`{W?@@YO7`alRCyvrFmot!v66~G0oQ-sm>k{o~Et4!nyldgT&zUpd7ezKFUe5xMX~d%1&Y3-_jfBUSU?>n>%eU zcsz8Op?yex|INM?@~mKyz#;D~B1Ml>U{4ym7VB{uM-As3q`IIkusY z6&H0AXr~`i)iYTYV5GEkD;Y9RUoBFgfadp-VKDAk>~y5%ilh~We~~kpsG6oxkJml& zJo?gT*sTBsTbfD-Fw7jQF_#f*y8i@RcTg2En>&6Pu2!Bd`rsv=;&oF=7yqqN6Ay`H zq7uJpMfg7Y; z66(~z`hzq&+(Jz#Oj31Mg+LN;qMk$O!;MFdWsJZ6vJ|6Ar7@%NHctkfTs`|nY63~&mc06K==>bdoSE0=aOoBg zO5}((a;1Cagzbku*tn*IZV=h`MTcF>F5`}{NUq`8!G#gyW> zBHLq0A1uXvq4-D@1O0>g-3PKHWIZq5AuC|Km2s}Z5=Uz;vWl<2w0yp71=2Xj%s)FZ z0o+GThE^Rd-%I(x|AF$6l>DiDAW#rV_elSh?zwbL$G#E7(7dEa)CB5@8mur2mK5EB zn5y5ndjGx>;1jD_S%*i-rLT?zI&?JydR}MFOvgIlz#@66!ubrn)|2OsbRQ5g&b#`8 z4yu8Qy3IIP>+=|H_@%?J@yvSd2l{a|{)28!KW|j?XHz#f80T^ZeoWSfa(~4Ef0wR) z=mGY(WAW@K7+pQ@vA-#DN1Ij^C4U`8I4^g-YI^u?r1Z34tpO(H=-8*tj`L3git#Wd z3Ncet3awmUF#+d5&GY&5WY8Gr1FC|U^Z*|22p09h{b!6*sH&i<&!aCC^06%YXGqz=W?Ix zOXo1h8fVd4o=nf+GrFh;vc@@R+!SAXbj7zejme1q2J(~E1a}L6_@(J}j5(%CJo1Tk zqDca;s^|@UuC0f*VsRI_%3XPprkt@DeHsP&K1*Mu*usmu6)}jB%d1Vt-+0!PC`Ylm zAIEt3I;)UJK70$a(Z8K}$|1zoXZY>MQ!z&B$yX}dWp2aa0X_>?k#wy5Armtog%DaU zZTnA0Oqz~+zJIRuK8Tze>b2oiapL@lSRGl_c{R4ZKmz{*kR;&0K?0LNlKN|qUhIGr zXo-CXINftLoic04->Ba|xKpVhoVJh=N4`9(Wi9K$<#wUwsJ0)u&GlJd7b{V!6tcH7 zet6$(&UvvCQ9p!mbK1n$ETWo0UI@cgfOy;RGbw5?aT_RDQ`kgx7{?KrRo1ffDlg|L z-N?Ptn%e>Q&L=-*$6xL29+nJC%{3VpbZ=-T(6;t#Y46oH zwam(EfRE&MgPXnr7U@Gi%K<*?2dv1_Gu5g0LI?5>(1HE}2P#Pd=Pw-&&FA%W{_-ro zBPMTdhYi1csUH(!*3XQPUV3>Cu<+})f$ED) z|E6oLVhN$UIzywL9kVp@rK0!H*H00`Cvi!uH;D))y%Zm+!(?ZlL2v9eZi)Y|aerGm ze>rYq)H^zVU4|A*tj=&$+yxfJ?HF-BJz&OEgM+dH4_v#X9G~0ec!+DgW#w(n8A>`1 z`g3K46FkH437?ljs-}mrb!WB5Dqy zVIUAgg}(}}QX|;5R4?$10)OTZ6UE_i+X1cePp$Qr9$$>OohrILHhl6XZ+=n~4%rfB z$DGtBnlLgF?~1ugbL0@S3oWP^T*^N|LFrONS!5EUeu(k2nMOYO*d#D+^Qn{~$nqo0 z!y7f-bCzJy6a-us8^~S0fDiR~u(ng2T5*!=Qm!2dpF3iReOV2i~(C2~sVs zUrqPy&e3ttmd?BI_(MC=4N`X!dp1I0Z1HIK-$4GMp#qwKw?+{ac4$oS1p5mPc=zuE z{x%=qVM36eSVjwv!CmlFCdG&3ARrR*Aea~kVhEOy0l{U!5+^|r84w5o{1fGGsK4=0 zB87@b@ulB9B*Y*RhG4J^7$gIcItc>*;<1bJPdt9g_AV}e{Ukru!8h7J@%h#Ro?wW_ zJIH+(-5*#0z)b)w?H_yl_OyR~u$_6*(vnfeqg{8T_>8igt1Av8 zgF;C_pePBL7+k^{E+#1jL5sm5Fp!u83WTx-V^A;*2KH_C|JZgH2;cdhadIJ|oY2@` ze4$urkTgh2%o;2W6O%++W5nPWNSD$u4Cn$J4YkHVQ9t?aYP*Xs33eG>0v_Xv#uDUy zPN50b8lZ%7Cc2Uo(f8^61KF9I(X4MqU}Sg{AC8ovwceDFnC%e)3+w%Y5`df&06Z{XZ z-Dv!6`G0WzEkwHs{s-4?H2${yKe+xDqTK}l3NE_e&KW6vBFpDaa=rF&{v@Ek-QyiQ zM}=g90-!t5CVk*fqZqK`A?gFQQI1#_0CXqTq7T$jBAG|dSOO7;bs=SXl}TR(19Q@^ z63ODR!4o{qfyOwjy9E&GMl$%ml}T+>UCg07F$;YQIk`X3>Jo5H#Gl09F8&oY(!&`~ z_(lHx>QD3*KppL$eF1d{7%aiu0;sR3O2E51yO@)@{}Vk>$Cc=Sb0Q6JC&{D_)J55l z$`Gk<7Y5Ea5`!~N7w`ay@547B5?s+lLjo47kH-^9F6cM9Zz*gN04N8%jhr0gkF=HK zzs`vN@VOxpu-}fgS}5kaf_9@k1G3oqMGYGVyG2$$S^h}@U3wbOLHone{jZureed2I zRy*f+5yBqZ_hNhd&Dv;c@tocI6$eySw<@a7x2m#&C_j@O%KhBqO21eyQ<B>-H?U8<&M{p;rqCmXfZAO)B zo^*>XS}NuW@o-h zbtJdO081p|oNQbG-zHoCA3h67(A`MO1*k|0qS%lm(+ML-`T+H@E_hc0dS_vgu71X0 zc2?&1K#VErlmr${{4FjZfT1ScMLIpYy^!3Mw;*|HSc20|kIGm#92%>ys<_t~jh_+; zmEH-IO8o9eEi@_4)6l@3`Y5Fy?HSsAtcq%VR0_&e zY)Iw6JF$>nN1}=jGFiL`UC7jXdAgHg2{b(gd&u!RD)|shHCfvxr)%!m+zNcfeQs{> zUG+-xXR^r4BAbPUM-n4f0h-MCUHtVeYWE6A&@&jZL&q8srQ@k|8H(E4G&JOI~ z2v0dra~)UBr`c8qn%@o;d;NitOr8@)b3CS$kaX%|(H-e2&1KFc&+J&CAiaYh7bq{5 zN#3(dsh+$v0q<|3i!}CoaKa{8F%z_aOEP)Q84Kgjhq?FU$1cGvo8M%&<>`%X46xnR zYqQ%Y|3Roq;RNu>8)lnIIbjX|&*WsS#GX^<)|j|r7^%Cm1$rt~s?QoZ)eVgE#2=S5 zj1WBW@oo%t07yxwIOYR;eAd~_n>en0@wK0mU^)HP9?=2F^!j>5pJT61U0o}_U8|cj z^s?*b^G7KP8}xX`(~~B$biN)O#V^*%%R0r#B8n;N7AMSaKU*gQEz}&XS$%nVHOKRW z^kE{Zre}^ja!Yt^C~M_9w)F+ly8g+aL+|+I$nHg^G*rNKM~6o2*&X z6nOgRd&{G%pFKTnPCSe8%I3J%+L)_ZXf!h0E7DEvTFPNyzin{P2ivD3dHQul1-f`& zaUV^I_#)Y2IX&5UCz<|3#&>>0U&LZ>&_L#)??#3;2HN+ptr(2Rb!8eCCWha{j9U>h zYn-mMe=#E`Pa_u^-gnZ9Imz!73%L&qd4qyv2+dQ#(J^2061G+acn6tm9*tPqQKBDD z36BGLqt&Uy6jk+CoLM3QuGR0KS9RvOw7Z_9Van`V4{dCbhG7&$+>l_e8u@1UCn(5%6^rIb4Q!5>MQER%?zB8*K&Oy$RAT1Ad0oJd|`@n(m z%Ax>cmfNA#O@&PqO`}a3O;t^1tf3g>A|LX4=NZTiziwo|V!!HI1TjHU%S$^a`e^Ic z7$t$%Oyd)P`Nqoi(}I>l@AzvoN{$!BfYfD>3b?E9et&-4Dkf^7hZ!rgr7n0;jkug)J0;8C)MeP95vK)>WHv z8U;G+6k)5v+gNA%r0)f+c{OoiAi{nEEd(`)FHMMyKPpw_upEB|RS7}IYb0nrSD4_P zKu+*;Tpe$@QGzKj?xp>B{3Eq}+zV`Y-vZpQkDgUNIk{#J41&d2CZ`hOFeQw?e-P92==x$legS za%>y0Ewi0{H5nOkwbMGX`AYaRj&@N;(M++}xWPCY(PFcjhYbbq3q=a0Oe4()@2M2Z z7D^O;EG#!my>|uE_+Wo|^jqRv?uU(5s9$8SimP&Rll{2%Tx&RPuB^>*V78`C zAHXiTf0@pyN@5^$zeG z)9TGD-GsOpRAI8=d7M{L>Y><|(T+o?dQ?zJ0Lq8?P>@N`-2U2H`4ag@Ru1)pw7Ilq zO;I6F)kN{2pJ+9?ymuK59<9}OR@W7r(TYFApzffJNKsZ(KhuAmsAMM`tKqI;b3^IIEx}an z^ju6XL++)U(+PKUWaFrF1#=xWtExL()7?fqWYliu;5BP+^0wwZT~!hSOYpl0dJP&aYORe2jQcK@MjSgY=+%N#LJ;pXBuy~XcXQu7Te5?9f`Ad~$3%1Jm z@~yp_AGCdGV?OCq&{iyy#%r%GsaneIn7vFaz3i&AB$#}wNJHA}pz(wJ3o5A@@670X z#PemXheu8u9E$kV65Enr*;*N0Il1Jy6nvzQu|J4DG9}Xf$Q)Eqax;h1F-|(w;i3Z$ zpKzArfrIMF?z8<~_g_3JeBkKi`F_!2wtKm4`Lye*>lgP+wR}F!_q3~CjwidD2o(*y z#r9^;Ro)Z1)U(_(Ww$gP3f*U4R^T~UIJK4Wq}ZlpGWfjb+#!3UeQ@tqMUlgxvZeF8 zvZbb_{-xK_%8q?K?Vs?|wN+rp(UE-)Y2L%@TFtj#GEy@+z0(|Y7(l>d)^y0S_L*2}*C}^6Pd~3IUphbk4)>jFcggR%-u+N;uArk(xv-*0tSG&h zqd2^Tti-is`kvLj-uoK&8y>(O6g?Dtm{fYOG^}i2nP=I2xo!Dyg;~X`N9vCnDo<6G zR*6^TKIVOVyPCcFS`A%IV9j=|SM5@rbKOk6P5o$tWy9M>)5h*5y{4DV8qKXODlLsq z6rR+!%C#|VX5Kj z5#^ER?+xC+9Yv3R9CI1l7!RCaoQRt|Hkm&KnR@&|%m+5XG2-m%@mq#uhP2B-P%Q^BN4l5x9Z zO_S2{KNGQ%Qh#fr?=qBuBzJVj3O5Im&Li)*cmKd_Rtt^LQDABWFjP&lU#g=$YuiHa zRF2O3b+kuzAWc~g zRIi%Vo!#!#S1c>(3N(~1!_r&~d@KO>#1WQlDw;$xtwYUE-u4rjbZ6d$s%?;P^;^F4 zBOLk#C(6~ILAfE$)@COAKErw^@5!ws6U?5+ck8$r zdEB>e49%`zdzYIY?PDDkd7LXx(M$SCy_v$Yqy^Z`IGr=)i&MBqs~4Vh;LG-%o!MT% z?~084+rUHq3&86tFp={zJpN242cl#ve@2hMU-A!4K^)#r?IXX+3JePDOh}htp%`b? zvDqf#Z(SOTy)@$L^Qa+m2F?~%#i5Ykc33uuQW4S|&ll%6aJ$a1)SlUWBdD)2yXAUf zqw!)+Hu(N)5JfMw%`%cK^$NK~SChQQ>s|A1O z<^TICM1L3Tl;w-$?JdIbQ%?gHwnMM#mnky`1^OkVA9V}$Q;!UuIreG%#x=x^VuX{9 ziD%aYt4Q-rMYNe)ytgKOVk@gln<>@ofcA_y+|B*g980eA4ERV~NzeTgA)OOE7YHEZ zkWfYoJvSp>s3>mm?EAsdX8CAXCRy)nt0uq15+Hwm@+g1~H}SOIR3URDmP^QI>%obK z_LjC63y=zo?x$EfnlW?;NFx zPxJq{$JD_7^)aiTVFL-N-4O#~)HAzA(t*5{wJD=8l)rB^y)k((~PXUFORc%TG9p$%|PJB$6Mzo=$mj zG!wtt55M2IZPlF^KxT3OgtLzUY<4OtJM%uyF)+k@X*JQo(%JHMJ%?@8(W3#0m2RRc z`3w|1)HgJkIiiQ7AHQfxxKhzqT(sCx2z zXoKF#A`gK?&K00%7y_zidEI>Ch2ppr->+=Xqh%Jr+(w zPZi_|Nij4}nINl2(%s*N(lAYJdq_6u9lw`lT(Dp8tLsacnA(w$gagHCGh!v@D%~!I zn2?TUomG&M*bBG+;2s3|FW6HU5^lbr9o(A5(;Q06JR@GRbQ>_g+Tsjcd$$w)tS9 ziaPhr$Q;{ZluToN*b9N6JBK&#^j(Q?CcX_fe=kcCyO~}%|_DOq_hvO6|nKJ6!ao=AQNYHF#w;4#+;? zQs%09)TZLimMKDU;TlfippiZY#<*jG`mp#h?}kz7rt@>MK}JP)=Z`eAS9!-{U}mqh z?55N^@a&hLFxa>kR7mn{t_y$K_vm52+F7{S7}|6v1&PBcz0PaCLMd1;j~~ITnLM6Y&H97(z14_joDrjIucbA_0|< zf*}>8z*3}BeUg%J5JW{gUkXv?PxLr=>#bE>H6cvlo)WLFD)>QW=`0b`)E{22&3&(+cD5~ zP(bO$`p0B?4Rm~4061gbsPKY##|V`f4+EcwAEg1jgY%G7T96BO-`KY1Hlw$KdW3u! zTt1L0q=bewSKXIVLoy_f>O?5znLK}5ILiWsavs_K7cgpHl4;c=C%m%9WRXrI5r`fH X>;*