r17794 by fschmid - Ensure proper drawing of icons with cairo-1.12.4
scribus-commit
scribus-commit at lists.scribus.net
Tue Oct 9 19:38:13 UTC 2012
Author: fschmid
Date: Tue Oct 9 19:38:13 2012
New Revision: 17794
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17794
Log:
Ensure proper drawing of icons with cairo-1.12.4
Modified:
trunk/Scribus/scribus/ui/arrowchooser.cpp
trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/dasheditor.cpp
trunk/Scribus/scribus/ui/extimageprops.cpp
trunk/Scribus/scribus/ui/gradientpreview.cpp
trunk/Scribus/scribus/ui/paintmanager.cpp
trunk/Scribus/scribus/ui/transparencypalette.cpp
Modified: trunk/Scribus/scribus/ui/arrowchooser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/arrowchooser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/arrowchooser.cpp (original)
+++ trunk/Scribus/scribus/ui/arrowchooser.cpp Tue Oct 9 19:38:13 2012
@@ -40,7 +40,7 @@
ScPainter *painter = new ScPainter(&image, 22, 22);
// painter->clear();
painter->setBrush(qRgb(0, 0, 0));
- painter->setPen(qRgb(0, 0, 0));
+ painter->setPen(qRgb(0, 0, 0), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
painter->setFillMode(1);
painter->translate(3.0, 3.0);
Path.resize(0);
@@ -58,7 +58,6 @@
mm.scale(16.0 / qMax(max.x(), max.y()), 16.0 / qMax(max.x(), max.y()));
Path.map(mm2 * mm);
painter->setupPolygon(&Path);
- painter->setLineWidth(1.0);
painter->drawPolygon();
painter->drawPolyLine();
painter->end();
Modified: trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.cpp (original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.cpp Tue Oct 9 19:38:13 2012
@@ -1255,11 +1255,11 @@
}
ScPainter *painter = new ScPainter(&Ico, 32, 32);
painter->setBrush(qRgb(238, 238, 236));
- painter->setPen(qRgb(137, 139, 134));
- painter->setFillMode(1);
+ painter->setPen(qRgb(137, 139, 134), 2.0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ painter->setFillMode(ScPainter::Solid);
+ painter->setStrokeMode(ScPainter::Solid);
painter->translate(2.0, 2.0);
painter->setupPolygon(&Path);
- painter->setLineWidth(2.0);
painter->drawPolygon();
painter->drawPolyLine();
painter->end();
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Tue Oct 9 19:38:13 2012
@@ -627,8 +627,7 @@
pb.fillRect(0, 0, 48, 12, b);
pb.end();
ScPainter *p = new ScPainter(&pixm, 48, 12);
- p->setPen(Qt::black);
- p->setLineWidth(1);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(2);
p->fill_gradient = gr;
p->setGradient(VGradient::linear, FPoint(0,6), FPoint(48, 6), FPoint(0,0), 1, 0);
Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp (original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp Tue Oct 9 19:38:13 2012
@@ -79,8 +79,7 @@
if (onlyselect)
StopM.append(startX);
}
- p->setPen(Qt::black);
- p->setLineWidth(1);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(0);
p->drawRect(0, 0, pWidth, 10);
p->end();
Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Tue Oct 9 19:38:13 2012
@@ -247,10 +247,9 @@
mm.scale(34.0 / qMax(max.x(), max.y()), 34.0 / qMax(max.x(), max.y()));
Path.map(mm);
p->setupPolygon(&Path);
- p->setPen(Qt::black);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setBrush(Qt::white);
p->setFillMode(0);
- p->setLineWidth(1.0);
p->strokePath();
p->end();
delete p;
Modified: trunk/Scribus/scribus/ui/gradientpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp (original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp Tue Oct 9 19:38:13 2012
@@ -89,8 +89,7 @@
pb.end();
ScPainter *p = new ScPainter(&pixm, width()-20, 37);
// p->clear(Qt::white);
- p->setPen(Qt::black);
- p->setLineWidth(1);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(2);
p->fill_gradient = fill_gradient;
p->setGradient(VGradient::linear, FPoint(0,20), FPoint(width()-20,20), FPoint(0, 0), 1.0, 0.0);
Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Tue Oct 9 19:38:13 2012
@@ -226,8 +226,7 @@
pb.fillRect(0, 0, 48, 12, b);
pb.end();
ScPainter *p = new ScPainter(&pixm, 48, 12);
- p->setPen(Qt::black);
- p->setLineWidth(1);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(2);
p->fill_gradient = gr;
p->setGradient(VGradient::linear, FPoint(0,6), FPoint(48, 6), FPoint(0, 0), 1.0, 0.0);
Modified: trunk/Scribus/scribus/ui/transparencypalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17794&path=/trunk/Scribus/scribus/ui/transparencypalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.cpp (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.cpp Tue Oct 9 19:38:13 2012
@@ -217,8 +217,7 @@
pb.fillRect(0, 0, 48, 12, b);
pb.end();
ScPainter *p = new ScPainter(&pixm, 48, 12);
- p->setPen(Qt::black);
- p->setLineWidth(1);
+ p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setFillMode(2);
p->fill_gradient = gr;
p->setGradient(VGradient::linear, FPoint(0,6), FPoint(48, 6), FPoint(0,0), 1, 0);
More information about the scribus-commit
mailing list