Merge pull request #1181 from CandyFace/FixPointerBugs

Fix canvas bugs
pencil2d · Feb 24, 2019 · 42bf768 · 42bf768
2 parents 9fba8ca + 8b577e8
commit 42bf768
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core_lib/src/interface/scribblearea.cpp b/core_lib/src/interface/scribblearea.cpp
@@ -410,7 +410,7 @@ void ScribbleArea::wheelEvent(QWheelEvent* event)
 void ScribbleArea::tabletEvent(QTabletEvent *e)
 {
     PointerEvent event(e);
-    updateCanvasCursor();
+
 
     if (event.pointerType() == QTabletEvent::Eraser)
     {
@@ -638,8 +638,8 @@ void ScribbleArea::mousePressEvent(QMouseEvent* e)
 void ScribbleArea::mouseMoveEvent(QMouseEvent* e)
 {
     // Workaround for tablet issue (#677 part 2)
-    if (mStrokeManager->isTabletInUse()
-        || (!isMouseInUse() && currentTool()->type() != POLYLINE)) {
+    if (mStrokeManager->isTabletInUse() &&
+        (!isMouseInUse() && currentTool()->type() != POLYLINE)) {
         e->ignore(); return;
     }
 

diff --git a/core_lib/src/tool/brushtool.cpp b/core_lib/src/tool/brushtool.cpp
@@ -182,6 +182,7 @@ void BrushTool::pointerMoveEvent(PointerEvent *)
 void BrushTool::pointerReleaseEvent(PointerEvent *)
 {
     Layer* layer = mEditor->layers()->currentLayer();
+    mEditor->backup(typeName());
 
     qreal distance = QLineF(getCurrentPoint(), mMouseDownPoint).length();
     if (distance < 1)