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

List:       kde-commits
Subject:    koffice/krita/plugins/paintops
From:       Lukáš Tvrdý <lukast.dev () gmail ! com>
Date:       2010-06-26 22:35:45
Message-ID: 20100626223545.3131BAC8DF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1143207 by lukast:

Fix Shift-drag feature in Chalk.

 M  +2 -1      CMakeLists.txt  
 M  +4 -2      chalk/kis_chalk_paintop_settings.cpp  
 M  +0 -10     chalk/kis_chalk_paintop_settings.h  
 M  +1 -6      chalk/kis_chalk_paintop_settings_widget.cpp  
 M  +0 -2      chalk/kis_chalkop_option.cpp  


--- trunk/koffice/krita/plugins/paintops/CMakeLists.txt #1143206:1143207
@@ -17,4 +17,5 @@
 add_subdirectory( particle )
 add_subdirectory( gridbrush )
 add_subdirectory( mypaint)
-add_subdirectory( hatching)
\ No newline at end of file
+add_subdirectory( hatching)
+# add_subdirectory( sketch )
--- trunk/koffice/krita/plugins/paintops/chalk/kis_chalk_paintop_settings.cpp \
#1143206:1143207 @@ -46,7 +46,7 @@
 void KisChalkPaintOpSettings::paintOutline(const QPointF& pos, KisImageWSP image, \
QPainter& painter, KisPaintOpSettings::OutlineMode _mode) const  {
     if (_mode != CURSOR_IS_OUTLINE) return;
-    qreal size = radius() * 2 * + 1;
+    qreal size = getInt(CHALK_RADIUS) * 2 + 1;
     painter.setPen(Qt::black);
     painter.drawEllipse(image->pixelToDocument(QRectF(0, 0, size, size).translated(- \
QPoint(size * 0.5, size * 0.5))).translated(pos));  }
@@ -55,11 +55,13 @@
 QRectF KisChalkPaintOpSettings::paintOutlineRect(const QPointF& pos, KisImageWSP \
image, KisPaintOpSettings::OutlineMode _mode) const  {
     if (_mode != CURSOR_IS_OUTLINE) return QRectF();
-    qreal size = radius() * 2;
+    qreal size = getInt(CHALK_RADIUS) * 2 + 1;
     size += 10;
     return image->pixelToDocument(QRectF(0, 0, size, size).translated(- QPoint(size \
* 0.5, size * 0.5))).translated(pos);  }
 
+
+
 #if defined(HAVE_OPENGL)
 QString KisChalkPaintOpSettings::modelName() const
 {
--- trunk/koffice/krita/plugins/paintops/chalk/kis_chalk_paintop_settings.h \
#1143206:1143207 @@ -53,16 +53,6 @@
     bool isAirbrushing() const;
     int rate() const;
     
-
-    // boiler-plate code
-    int radius() const;
-    bool inkDepletion() const;
-    bool opacity() const;
-    bool saturation() const;
-    
-    KisPressureOpacityOption * opacityOption() const;
-    
-    
 #if defined(HAVE_OPENGL)
     QString modelName() const;
 #endif
--- trunk/koffice/krita/plugins/paintops/chalk/kis_chalk_paintop_settings_widget.cpp \
#1143206:1143207 @@ -33,7 +33,7 @@
 {
     m_chalkOption =  new KisChalkOpOption();
 
-    addPaintOpOption(new KisChalkOpOption());
+    addPaintOpOption(m_chalkOption);
     addPaintOpOption(new KisCurveOptionWidget(new KisPressureOpacityOption()));
     addPaintOpOption(new KisAirbrushOption(false));
     addPaintOpOption(new KisPaintActionTypeOption());
@@ -58,9 +58,4 @@
     if (qAbs(x) > qAbs(y)){
         m_chalkOption->setRadius( m_chalkOption->radius() + qRound(x) );
     }
-    else // vice-versa
-    {
-        // we can do something different
     }
-
-}
--- trunk/koffice/krita/plugins/paintops/chalk/kis_chalkop_option.cpp \
#1143206:1143207 @@ -54,9 +54,7 @@
 
 void KisChalkOpOption::setRadius(int radius) const
 {
-    m_options->radiusSpinBox->blockSignals(true);
     m_options->radiusSpinBox->setValue( radius );
-    m_options->radiusSpinBox->blockSignals(false);
 }
 
 


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