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

List:       kde-commits
Subject:    [calligra] krita/plugins/tools/defaulttools: Fix formating in
From:       Torio Mlshi <mlshi () lavabit ! com>
Date:       2011-10-31 20:29:01
Message-ID: 20111031202901.43157A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 2e77322f44cb0a8a98c9c4e69b59cd5be97321ce by Torio Mlshi.
Committed on 31/10/2011 at 21:22.
Pushed by mlshi into branch 'master'.

Fix formating in previous commit

And clear m_strokeId after ending stroke.

M  +3    -1    krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc
M  +8    -4    krita/plugins/tools/defaulttools/kis_tool_move.cc

http://commits.kde.org/calligra/2e77322f44cb0a8a98c9c4e69b59cd5be97321ce

diff --git a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc \
b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc index f5c0393..97ba480 \
                100644
--- a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -89,8 +89,10 @@ void KisToolColorPicker::pickColor(const QPointF& pos)
         }
 
         if (!currentNode())
+        {
             return;
-        
+        }
+
         KisPaintDeviceSP dev = currentNode()->paintDevice();
         if (!dev) return;
 
diff --git a/krita/plugins/tools/defaulttools/kis_tool_move.cc \
b/krita/plugins/tools/defaulttools/kis_tool_move.cc index 986c7bc..94d9a68 100644
--- a/krita/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/krita/plugins/tools/defaulttools/kis_tool_move.cc
@@ -188,8 +188,7 @@ void KisToolMove::mousePressEvent(KoPointerEvent *event)
 
         if(!node) {
             node = currentNode();
-            if (!node)
-            {
+            if (!node) {
                 m_strokeId.clear();
                 return;
             }
@@ -243,8 +242,10 @@ void KisToolMove::mouseMoveEvent(KoPointerEvent *event)
 {
     if(MOVE_CONDITION(event, KisTool::PAINT_MODE)) {
         if (!m_strokeId)
+        {
             return;
-        
+        }
+
         QPoint pos = convertToPixelCoord(event).toPoint();
         if ((event->modifiers() & Qt::AltModifier) ||
             (event->modifiers() & Qt::ControlModifier)) {
@@ -267,8 +268,10 @@ void KisToolMove::mouseReleaseEvent(KoPointerEvent *event)
 {
     if(RELEASE_CONDITION(event, KisTool::PAINT_MODE, Qt::LeftButton)) {
         if (!m_strokeId)
+        {
             return;
-        
+        }
+
         setMode(KisTool::HOVER_MODE);
 
         QPoint pos = convertToPixelCoord(event).toPoint();
@@ -276,6 +279,7 @@ void KisToolMove::mouseReleaseEvent(KoPointerEvent *event)
 
         KisImageWSP image = currentImage();
         image->endStroke(m_strokeId);
+        m_strokeId.clear();
 
         currentImage()->setModified();
     }


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