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

List:       kde-commits
Subject:    branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2009-05-28 20:11:30
Message-ID: 1243541490.841379.11935.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 974245 by berger:

Fix: tablet pressure only effective when size is enabled in the option

backport from trunk


 M  +0 -10     brush/kis_brushop.cpp  
 M  +0 -3      brush/kis_brushop.h  
 M  +0 -13     eraser/kis_eraseop.cpp  
 M  +0 -3      eraser/kis_eraseop.h  
 M  +0 -13     pen/kis_penop.cpp  
 M  +0 -3      pen/kis_penop.h  


--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp \
#974244:974245 @@ -141,13 +141,3 @@
     painter()->setPaintColor(origColor);
 
 }
-
-double KisBrushOp::paintLine(const KisPaintInformation &pi1,
-                             const KisPaintInformation &pi2,
-                             double savedDist)
-{
-    KisPaintInformation adjustedInfo1(pi1);
-    KisPaintInformation adjustedInfo2(pi2);
-    return KisPaintOp::paintLine(adjustedInfo1, adjustedInfo2, savedDist);
-}
-
--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h \
#974244:974245 @@ -48,9 +48,6 @@
     virtual ~KisBrushOp();
 
     void paintAt(const KisPaintInformation& info);
-    virtual double paintLine(const KisPaintInformation &pi1,
-                             const KisPaintInformation &pi2,
-                             double savedDist = -1);
 
 private:
 
--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop.cpp \
#974244:974245 @@ -155,16 +155,3 @@
     painter()->setOpacity(origOpacity);
 
 }
-
-double KisEraseOp::paintLine(const KisPaintInformation &pi1,
-                             const KisPaintInformation &pi2,
-                             double savedDist)
-{
-    KisPaintInformation adjustedInfo1(pi1);
-    KisPaintInformation adjustedInfo2(pi2);
-    if (!settings->m_optionsWidget->m_sizeOption->isChecked()) {
-        adjustedInfo1.setPressure(PRESSURE_DEFAULT);
-        adjustedInfo2.setPressure(PRESSURE_DEFAULT);
-    }
-    return KisPaintOp::paintLine(adjustedInfo1, adjustedInfo2, savedDist);
-}
--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop.h \
#974244:974245 @@ -55,9 +55,6 @@
     virtual ~KisEraseOp();
 
     void paintAt(const KisPaintInformation& info);
-    virtual double paintLine(const KisPaintInformation &pi1,
-                             const KisPaintInformation &pi2,
-                             double savedDist = -1);
 
 private:
 
--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop.cpp \
#974244:974245 @@ -152,16 +152,3 @@
     painter()->setOpacity(origOpacity);
     painter()->setPaintColor(origColor);
 }
-
-double KisPenOp::paintLine(const KisPaintInformation &pi1,
-                           const KisPaintInformation &pi2,
-                           double savedDist)
-{
-    KisPaintInformation adjustedInfo1(pi1);
-    KisPaintInformation adjustedInfo2(pi2);
-    if (!settings->m_optionsWidget->m_sizeOption->isChecked()) {
-        adjustedInfo1.setPressure(PRESSURE_DEFAULT);
-        adjustedInfo2.setPressure(PRESSURE_DEFAULT);
-    }
-    return KisPaintOp::paintLine(adjustedInfo1, adjustedInfo2, savedDist);
-}
--- branches/koffice/2.0/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop.h \
#974244:974245 @@ -55,9 +55,6 @@
     virtual ~KisPenOp();
 
     void paintAt(const KisPaintInformation& info);
-    virtual double paintLine(const KisPaintInformation &pi1,
-                             const KisPaintInformation &pi2,
-                             double savedDist = -1);
 
 private:
 


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