[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/krita
From: Sven Langkamp <sven.langkamp () gmail ! com>
Date: 2010-10-20 21:32:44
Message-ID: 20101020213244.B2E94AC897 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1187967 by langkamp:
simplified code
M +0 -2 plugins/tools/defaulttools/kis_tool_ellipse.cc
M +1 -12 plugins/tools/defaulttools/kis_tool_gradient.cc
M +0 -2 plugins/tools/defaulttools/kis_tool_path.cc
M +0 -2 plugins/tools/defaulttools/kis_tool_rectangle.cc
M +0 -2 plugins/tools/tool_polygon/kis_tool_polygon.cc
M +1 -10 plugins/tools/tool_polyline/kis_tool_polyline.cc
M +0 -2 plugins/tools/tool_star/kis_tool_star.cc
M +6 -0 ui/tool/kis_tool_paint.cc
M +3 -0 ui/tool/kis_tool_paint.h
M +1 -1 ui/tool/kis_tool_shape.cc
--- trunk/koffice/krita/plugins/tools/defaulttools/kis_tool_ellipse.cc #1187966:1187967
@@ -67,8 +67,6 @@
painter.beginTransaction(i18n("Ellipse"));
setupPainter(&painter);
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
painter.paintEllipse(rect);
painter.endTransaction(image()->undoAdapter());
--- trunk/koffice/krita/plugins/tools/defaulttools/kis_tool_gradient.cc #1187966:1187967
@@ -264,20 +264,9 @@
qApp->setOverrideCursor(Qt::BusyCursor);
KisGradientPainter painter(device, currentSelection());
- if (KisPaintLayer* l = dynamic_cast<KisPaintLayer*>(currentNode().data())) {
- painter.setChannelFlags(l->channelFlags());
- if (l->alphaLocked()) {
- painter.setLockAlpha(l->alphaLocked());
- }
- }
-
painter.beginTransaction(i18n("Gradient"));
+ setupPainter(&painter);
- painter.setPaintColor(currentFgColor());
- painter.setGradient(currentGradient());
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
-
KisCanvas2 * canvas = dynamic_cast<KisCanvas2 *>(this->canvas());
KoProgressUpdater * updater = canvas->view()->createProgressUpdater(KoProgressUpdater::Unthreaded);
--- trunk/koffice/krita/plugins/tools/defaulttools/kis_tool_path.cc #1187966:1187967
@@ -188,8 +188,6 @@
painter.beginTransaction(i18n("Path"));
setupPainter(&painter);
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
painter.paintPainterPath(mapedOutline);
painter.endTransaction(image->undoAdapter());
--- trunk/koffice/krita/plugins/tools/defaulttools/kis_tool_rectangle.cc #1187966:1187967
@@ -79,8 +79,6 @@
painter.beginTransaction(i18n("Rectangle"));
setupPainter(&painter);
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
painter.paintRect(rect);
painter.endTransaction(image()->undoAdapter());
--- trunk/koffice/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc #1187966:1187967
@@ -76,8 +76,6 @@
KisPainter painter(device, currentSelection());
painter.beginTransaction(i18n("Polygon"));
setupPainter(&painter);
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
painter.paintPolygon(points);
device->setDirty(painter.takeDirtyRegion());
notifyModified();
--- trunk/koffice/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc #1187966:1187967
@@ -63,16 +63,7 @@
KisPainter painter(device, currentSelection());
painter.beginTransaction(i18n("Polyline"));
- if (KisPaintLayer* l = dynamic_cast<KisPaintLayer*>(currentNode().data())) {
- painter.setChannelFlags(l->channelFlags());
- if (l->alphaLocked()) {
- painter.setLockAlpha(l->alphaLocked());
- }
- }
- painter.setPaintColor(currentFgColor());
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
- painter.setPaintOpPreset(currentPaintOpPreset(), currentImage()); // Painter takes ownership
+ setupPainter(&painter);
QPointF start, end;
QVector<QPointF>::const_iterator it;
--- trunk/koffice/krita/plugins/tools/tool_star/kis_tool_star.cc #1187966:1187967
@@ -137,8 +137,6 @@
KisPainter painter(device, currentSelection());
painter.beginTransaction(i18n("Star"));
setupPainter(&painter);
- painter.setOpacity(m_opacity);
- painter.setCompositeOp(m_compositeOp);
painter.paintPolygon(coord);
--- trunk/koffice/krita/ui/tool/kis_tool_paint.cc #1187966:1187967
@@ -355,6 +355,12 @@
m_pressureSamples = curve.floatTransfer(LEVEL_OF_PRESSURE_RESOLUTION + 1);
}
+void KisToolPaint::setupPainter(KisPainter* painter)
+{
+ KisTool::setupPainter(painter);
+ painter->setOpacity(m_opacity);
+ painter->setCompositeOp(m_compositeOp);
+}
void KisToolPaint::setupPaintAction(KisRecordedPaintAction* action)
{
--- trunk/koffice/krita/ui/tool/kis_tool_paint.h #1187966:1187967
@@ -110,6 +110,9 @@
return QString();
}
+ /// Reimplemented
+ virtual void setupPainter(KisPainter* painter);
+
virtual void setupPaintAction(KisRecordedPaintAction* action);
qreal pressureToCurve(qreal pressure){
--- trunk/koffice/krita/ui/tool/kis_tool_shape.cc #1187966:1187967
@@ -94,7 +94,7 @@
void KisToolShape::setupPainter(KisPainter * painter)
{
- KisTool::setupPainter(painter);
+ KisToolPaint::setupPainter(painter);
painter->setFillStyle(fillStyle());
painter->setStrokeStyle(strokeStyle());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic