Author: jghali
Date: Thu Oct 3 04:25:03 2019
New Revision: 23234
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23234
Log:
A few adjustements related to export of PDF form field background and border
color
Modified:
trunk/Scribus/scribus/pdflib_core.cpp
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23234&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Thu Oct 3 04:25:03 2019
@@ -8853,9 +8853,14 @@
PutDoc(xb[ite->annotation().borderStyle()]);
PutDoc(" >>\n");
PutDoc("/MK << ");
- PutDoc("/BG [ 1 1 1 ] ");
+ if (ite->fillColor() != CommonStrings::None)
+ PutDoc("/BG [ " + SetColor(ite->fillColor(), ite->fillShade())
+ " ] ");
+ else
+ PutDoc("/BG [ 1 1 1 ] "); // Display problem in Adobe Reader if
background is transparent
if (ite->annotation().borderColor() != CommonStrings::None)
- PutDoc("/BC [ "+SetColor(ite->annotation().borderColor(),
100)+" ] ");
+ PutDoc("/BC [ " + SetColor(ite->annotation().borderColor(),
100) + " ] ");
+ else
+ PutDoc("/BC [ ] ");
if (ite->rotation() != 0)
{
int rot = -(static_cast<int>(ite->rotation()) / 90) * 90;
@@ -9156,20 +9161,18 @@
PutDoc("/AP << /N
"+Pdf::toPdf(appearanceObj)+" 0 R >>\n");
break;
}
+
PutDoc("/MK << ");
- if ((ite->annotation().Type() == Annotation::Combobox)
|| (ite->annotation().Type() == Annotation::Listbox))
- {
- PutDoc("/BG [ 1 1 1 ] ");
- if (ite->annotation().borderColor() !=
CommonStrings::None)
- PutDoc("/BC [
"+SetColor(ite->annotation().borderColor(), 100)+" ] ");
- }
+ if (ite->fillColor() != CommonStrings::None)
+ PutDoc("/BG [ " + SetColor(ite->fillColor(),
ite->fillShade()) + " ] ");
+ else if ((ite->annotation().Type() ==
Annotation::Combobox) || (ite->annotation().Type() == Annotation::Listbox))
+ PutDoc("/BG [ 1 1 1 ] "); // Display problem in
Adobe Reader if background is transparent
else
- {
- if (ite->fillColor() != CommonStrings::None)
- PutDoc("/BG [
"+SetColor(ite->fillColor(), ite->fillShade())+" ] ");
- if (ite->annotation().borderColor() !=
CommonStrings::None)
- PutDoc("/BC [
"+SetColor(ite->annotation().borderColor(), 100)+" ] ");
- }
+ PutDoc("/BG [ ] ");
+ if (ite->annotation().borderColor() !=
CommonStrings::None)
+ PutDoc("/BC [ " +
SetColor(ite->annotation().borderColor(), 100) + " ] ");
+ else
+ PutDoc("/BC [ ] ");
PdfId IconOb = 0;
switch (ite->annotation().Type())
{
@@ -9257,6 +9260,7 @@
PutDoc("/R " + Pdf::toPdf(rot) + " ");
}
PutDoc(">>\n");
+
if ((ite->annotation().ActionType() !=
Annotation::Action_None) || (ite->annotation().AAact()))
{
if (ite->annotation().ActionType() ==
Annotation::Action_GoToR_FileRel)
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
