[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/paintops
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2010-02-28 22:31:56
Message-ID: 1267396316.363989.9635.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097320 by berger:

use correct spacing


 M  +2 -2      defaultpaintops/brush/kis_brushop.cpp  
 M  +1 -1      defaultpaintops/duplicate/kis_duplicateop.cpp  
 M  +1 -1      defaultpaintops/eraser/kis_eraseop.cpp  
 M  +2 -2      defaultpaintops/pen/kis_penop.cpp  
 M  +1 -1      defaultpaintops/smudge/kis_smudgeop.cpp  
 M  +2 -2      filterop/kis_filterop.cpp  


--- trunk/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp #1097319:1097320
@@ -94,7 +94,7 @@
         return 1.0;
 
     double scale = KisPaintOp::scaleForPressure(m_sizeOption.apply(info));
-    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return 1.0;
+    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return spacing(scale);
 
     KisPaintDeviceSP device = painter()->device();
 
@@ -133,5 +133,5 @@
     painter()->setOpacity(origOpacity);
     painter()->setPaintColor(origColor);
 
-    return spacing(info.pressure());
+    return spacing(scale);
 }
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.cpp #1097319:1097320
@@ -306,5 +306,5 @@
 
     painter()->bitBlt(dstRect.x(), dstRect.y(), m_srcdev, sx, sy, sw, sh);
 
-    return spacing(info.pressure());
+    return spacing(scale);
 }
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop.cpp #1097319:1097320
@@ -155,5 +155,5 @@
 
     painter()->setOpacity(origOpacity);
 
-    return spacing(info.pressure());
+    return spacing(scale);
 }
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop.cpp #1097319:1097320
@@ -70,7 +70,7 @@
         return 1.0;
 
     double scale = KisPaintOp::scaleForPressure(m_sizeOption.apply(info));
-    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return 1.0;
+    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return spacing(scale);
 
     KisPaintDeviceSP device = painter()->device();
     QPointF hotSpot = brush->hotSpot(scale, scale);
@@ -132,5 +132,5 @@
     painter()->setOpacity(origOpacity);
     painter()->setPaintColor(origColor);
     
-    return spacing(info.pressure());
+    return spacing(scale);
 }
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop.cpp #1097319:1097320
@@ -186,5 +186,5 @@
     sh = dstRect.height();
 
     painter()->bitBlt(dstRect.x(), dstRect.y(), m_target, sx, sy, sw, sh);
-    return spacing(info.pressure());
+    return spacing(scale);
 }
--- trunk/koffice/krita/plugins/paintops/filterop/kis_filterop.cpp #1097319:1097320
@@ -100,7 +100,7 @@
         return 1.0;
 
     double scale = KisPaintOp::scaleForPressure(m_sizeOption.apply(info));
-    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return 1.0;
+    if ((scale * brush->width()) <= 0.01 || (scale * brush->height()) <= 0.01) return spacing(scale);
 
     QPointF hotSpot = brush->hotSpot(scale, scale);
     QPointF pt = info.pos() - hotSpot;
@@ -169,5 +169,5 @@
     qint32 sh = dstRect.height();
 
     painter()->bitBlt(dstRect.x(), dstRect.y(), m_tmpDevice, sx, sy, sw, sh);
-    return spacing(info.pressure());
+    return spacing(scale);
 }
[prev in list] [next in list] [prev in thread] [next in thread]