Author: fschmid
Date: Sun Nov 24 10:47:26 2013
New Revision: 18597

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18597
Log:
Viva Importer: handle global object opacity correctly.

Modified:
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=18597&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Sun Nov 24 
10:47:26 2013
@@ -1130,6 +1130,18 @@
                                                                strokeOpacity = 
0;
                                                        else
                                                                strokeOpacity = 
1.0 - (eo.text().toDouble() / 100.0);
+                                               }
+                                               else if (eo.tagName() == 
"vo:baseOpacity")
+                                               {
+                                                       double opa = 0.0;
+                                                       if (eo.text() == 
"transparent")
+                                                               opa = 1;
+                                                       else if (eo.text() == 
"opaque")
+                                                               opa = 0;
+                                                       else
+                                                               opa = 1.0 - 
(eo.text().toDouble() / 100.0);
+                                                       fillOpacity = 1.0 - 
((1.0 - fillOpacity) * opa);
+                                                       strokeOpacity = 1.0 - 
((1.0 - strokeOpacity) * opa);
                                                }
                                                else if (eo.tagName() == 
"vo:cornerRadius")
                                                        cornerRadius = 
parseUnit(eo.text());


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to