pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-02-10 18:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[pdf] Fix UI annot props

Browse Source
This commit is contained in:
Nikita Khromov
2026-02-05 17:04:26 +07:00
committed by Ilya Kirillov
parent df50670960
commit 652b48547d
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pdf/src/annotations/base.js
View File

@ -444,7 +444,7 @@
let nComplexType = null;
if (AscPDF.BORDER_TYPES.solid == nBorderStyle) {
if (AscPDF.BORDER_TYPES.solid == nBorderStyle || undefined == nBorderStyle) {
if (AscPDF.BORDER_EFFECT_STYLES.Cloud == nBorderEffectStyle) {
if (1 == nBorderEffectIntensity) {
nComplexType = AscPDF.ANNOT_COMPLEX_BORDER_TYPES.cloud1;

24
pdf/src/document.js
View File

@ -9613,15 +9613,26 @@ var CPresentation = CPresentation || function(){};
function CreateAscAnnotPropFromObj(annot) {
let oProps = new Asc.asc_CAnnotProperty();
let nType = annot.GetType();
oProps.asc_putType(annot.GetType());
// fill
let oFillColor = annot.GetFillColor();
let oFillRGB = annot.GetRGBColor(oFillColor);
oFillRGB["r"] = oFillRGB.r;
oFillRGB["g"] = oFillRGB.g;
oFillRGB["b"] = oFillRGB.b;
oProps.asc_putFill(oFillRGB);
switch (nType) {
case AscPDF.ANNOTATIONS_TYPES.FreeText:
case AscPDF.ANNOTATIONS_TYPES.Square:
case AscPDF.ANNOTATIONS_TYPES.Circle:
case AscPDF.ANNOTATIONS_TYPES.Polygon:
case AscPDF.ANNOTATIONS_TYPES.Redact: {
let oFillColor = annot.GetFillColor();
let oFillRGB = oFillColor ? annot.GetRGBColor(oFillColor) : undefined;
oFillRGB["r"] = oFillRGB.r;
oFillRGB["g"] = oFillRGB.g;
oFillRGB["b"] = oFillRGB.b;
oProps.asc_putFill(oFillRGB);
break;
}
}
// stroke
let oStrokeColor = annot.GetStrokeColor();
@ -9663,6 +9674,7 @@ var CPresentation = CPresentation || function(){};
}
case AscPDF.ANNOTATIONS_TYPES.Polygon:
case AscPDF.ANNOTATIONS_TYPES.Square:
case AscPDF.ANNOTATIONS_TYPES.Link:
case AscPDF.ANNOTATIONS_TYPES.Circle: {
oAnnotProps = new Asc.asc_CClosedAnnotProperty();
oAnnotProps.asc_putBorderStyle(annot.GetComplexBorderType());